Permalink
Browse files

all: Drop RMAX software

This software was used only for one project, the mapping of Marscape
via the RMAX helicopter. Neither the RMAX hardware or Marscape exist
anymore. We still have the dataset file ... but if anyone was
interested, it could be processed with our generic PinholeSession.
  • Loading branch information...
1 parent db65ce1 commit a4a73580a024fb5afde59de5b60d51fa3a868223 Zack Moratto committed with Zachary Moratto Apr 10, 2013
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-### IRG Specific Convenience Paths
-
-IRG_ARCH_RAW="`uname -m`_`uname -s`_gcc`gcc -dumpversion | cut -f-2 -d .`"
-IRG_ARCH=`echo $IRG_ARCH_RAW | awk '{ print tolower( $0 ) }'`
-IRGPKG_DIR=/irg/packages/$IRG_ARCH
-
-ENABLE_DEBUG=no
-ENABLE_OPTIMIZE=yes
-ENABLE_CUSTOM_ARCH_NAME=$IRG_ARCH
-
-PREFIX=$HOME/local
-
-VTO_PKGS=/u/vto/projects/packages
-NASA_PKGS=/nasa/pd
-VTO_NOBACKUP=/nobackup1a/vto/packages/$IRG_ARCH
-
-VW_DIR=/u/vto/projects/VisionWorkbench/build/$IRG_ARCH
-OUR_QT_DIR=$VTO_NOBACKUP/qt-x11-opensource-src-4.4.1
-PATH="$OUR_QT_DIR/bin:$PATH"
-
-HAVE_PKG_VW_CORE=$VW_DIR
-HAVE_PKG_VW_MATH=$VW_DIR
-HAVE_PKG_VW_IMAGE=$VW_DIR
-HAVE_PKG_VW_FILEIO=$VW_DIR
-HAVE_PKG_VW_STEREO=$VW_DIR
-HAVE_PKG_VW_CAMERA=$VW_DIR
-HAVE_PKG_VW_CARTOGRAPHY=$VW_DIR
-HAVE_PKG_VW_INTEREST_POINT=$VW_DIR
-
-HAVE_PKG_BOOST=$NASA_PKGS/boost/1.34.1
-HAVE_PKG_OPENSCENEGRAPH=$VTO_PKGS/src/OpenSceneGraph-2.2.0/
-HAVE_PKG_QT_INCLUDE=$OUR_QT_DIR
-HAVE_PKG_QT_CORE=$OUR_QT_DIR
-HAVE_PKG_QT_GUI=$OUR_QT_DIR
-HAVE_PKG_QT_SQL=$OUR_QT_DIR
-HAVE_PKG_ISIS=/u/vto/projects/isis3/isis/
-
-HAVE_PKG_GDAL=$VTO_PKGS/$IRG_ARCH/gdal-1.5.0
-HAVE_PKG_SPICE=$VTO_PKGS/src/cspice
-HAVE_PKG_GEOS=$VTO_PKGS/$IRG_ARCH/geos-3.0.0
-HAVE_PKG_XERCESC=$VTO_PKGS/$IRG_ARCH/xerces-c-src_2_8_0
-
-PKG_QWT_LDFLAGS="-L/u/vto/projects/packages/ia64_linux_gcc4.1/qwt-5.1.1/lib -lqwt"
-PKG_GSL_LDFLAGS="-L/u/vto/projects/packages/ia64_linux_gcc4.1/gsl-1.11/lib -lgsl -lgslcblas"
-PKG_SUPERLU_LDFLAGS="-L/u/vto/projects/packages/src/SuperLU_3.0 -lsuperlu_3.0"
-
-# Lapack still needs to be found the old-fashioned way
-PKG_PATHS="$VTO_PKGS/$IRG_ARCH/VisionWorkbench-LAPACK-1.0.0"
View
@@ -1,59 +0,0 @@
-#! /bin/sh
-
-### IRG Specific Convenience Paths
-
-IRG_ARCH_RAW="`uname -m`_`uname -s`_gcc`gcc -dumpversion | cut -f-2 -d .`"
-IRG_ARCH=`echo $IRG_ARCH_RAW | awk '{ print tolower( $0 ) }'`
-IRGPKG_DIR=/irg/packages/$IRG_ARCH
-
-### Configure Options
-#
-# These options allow you modify the basic behavior of the build environment.
-ENABLE_DEBUG=no
-ENABLE_OPTIMIZE=yes
-
-# This is where stereo will be installed.
-PREFIX=$HOME/local
-
-# Set this to where you installed vw
-VW_INSTALL=$PREFIX
-
-# need this for qmake
-QT_PATH=$IRGPKG_DIR/qt-4/bin
-
-# Use this if it should run on every irg machine
-HAVE_PKG_BOOST=$IRGPKG_DIR/boost
-HAVE_PKG_GEOS=$IRGPKG_DIR/geos
-HAVE_PKG_GSL=$IRGPKG_DIR/gsl
-HAVE_PKG_ISIS=$IRGPKG_DIR/isis3/isis
-HAVE_PKG_OPENSCENEGRAPH=$IRGPKG_DIR/OpenSceneGraph
-HAVE_PKG_QT=$IRGPKG_DIR/qt-4
-HAVE_PKG_QT_CORE=$IRGPKG_DIR/qt-4
-HAVE_PKG_QT_GUI=$IRGPKG_DIR/qt-4
-HAVE_PKG_QT_INCLUDE=$IRGPKG_DIR/qt-4
-HAVE_PKG_QT_SQL=$IRGPKG_DIR/qt-4
-HAVE_PKG_QWT=$IRGPKG_DIR/qwt
-HAVE_PKG_SPICE=$IRGPKG_DIR/cspice
-HAVE_PKG_SUPERLU=$IRGPKG_DIR/superlu
-HAVE_PKG_VW_CORE=$VW_INSTALL
-HAVE_PKG_VW_MATH=$VW_INSTALL
-HAVE_PKG_VW_IMAGE=$VW_INSTALL
-HAVE_PKG_VW_FILEIO=$VW_INSTALL
-HAVE_PKG_VW_CAMERA=$VW_INSTALL
-HAVE_PKG_VW_CARTOGRAPHY=$VW_INSTALL
-HAVE_PKG_VW_INTEREST_POINT=$VW_INSTALL
-HAVE_PKG_VW_STEREO=$VW_INSTALL
-
-### Apps I want
-
-ENABLE_APP_STEREO=yes
-ENABLE_APP_ORTHOPROJECT=yes
-ENABLE_APP_BUNDLEADJUST=yes
-ENABLE_APP_ORBITVIZ=yes
-ENABLE_APP_DISPARITYDEBUG=yes
-ENABLE_APP_POINT2MESH=yes
-ENABLE_APP_POINT2DEM=yes
-ENABLE_APP_RMAX2CAHVOR=no
-ENABLE_APP_RMAXADJUST=no
-ENABLE_APP_BUNDLEVIS=yes
-ENABLE_APP_ISISADJUST=yes
View
@@ -420,8 +420,6 @@ AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH CORE])
AX_APP(POINT2LAS, [src/asp/Tools], no, [BOOST LASZIP LIBLAS CORE])
AX_APP(DEM_GEOID, [src/asp/Tools], no, [GEOID CORE])
AX_APP(RESULTS, [src/asp/Tools], no, [CORE ISISIO])
-AX_APP(RMAX2CAHVOR, [src/asp/Tools], no, [SESSIONS])
-AX_APP(RMAXADJUST, [src/asp/Tools], no, [VW_BUNDLEADJUSTMENT SESSIONS])
AX_APP(RPCMAPPROJECT, [src/asp/Tools], yes, [CORE SESSIONS GDAL])
AX_APP(STEREO, [src/asp/Tools], yes, [SESSIONS])
@@ -456,8 +454,6 @@ AM_CONDITIONAL(MAKE_APP_POINT2MESH, [test "$MAKE_APP_POINT2MESH" = "yes"])
AM_CONDITIONAL(MAKE_APP_POINT2LAS, [test "$MAKE_APP_POINT2LAS" = "yes"])
AM_CONDITIONAL(MAKE_APP_DEM_GEOID, [test "$MAKE_APP_DEM_GEOID" = "yes"])
AM_CONDITIONAL(MAKE_APP_RESULTS, [test "$MAKE_APP_RESULTS" = "yes"])
-AM_CONDITIONAL(MAKE_APP_RMAX2CAHVOR, [test "$MAKE_APP_RMAX2CAHVOR" = "yes"])
-AM_CONDITIONAL(MAKE_APP_RMAXADJUST, [test "$MAKE_APP_RMAXADJUST" = "yes"])
AM_CONDITIONAL(MAKE_APP_RPCMAPPROJECT, [test "$MAKE_APP_RPCMAPPROJECT" = "yes"])
AM_CONDITIONAL(MAKE_APP_STEREO, [test "$MAKE_APP_STEREO" = "yes"])
AM_CONDITIONAL(MAKE_APP_STEREOGUI, [test "$MAKE_APP_STEREOGUI" = "yes"])
@@ -503,7 +499,6 @@ AC_CONFIG_FILES([ \
src/asp/Sessions/Makefile \
src/asp/Sessions/ISIS/Makefile \
src/asp/Sessions/Pinhole/Makefile \
- src/asp/Sessions/RMAX/Makefile \
src/asp/Sessions/DG/Makefile \
src/asp/Sessions/RPC/Makefile \
src/asp/Sessions/tests/Makefile \
View
@@ -26,7 +26,6 @@
#include <asp/Sessions/ISIS/StereoSessionIsis.h>
#endif
-#include <asp/Sessions/RMAX/StereoSessionRmax.h>
#include <asp/Sessions/Pinhole/StereoSessionPinhole.h>
#include <asp/Sessions/DG/StereoSessionDG.h>
#include <asp/Sessions/RPC/StereoSessionRPC.h>
@@ -25,8 +25,8 @@ if MAKE_MODULE_SESSIONS
include_HEADERS = StereoSession.h
libaspSessions_la_SOURCES = StereoSession.cc \
- Pinhole/StereoSessionPinhole.cc RMAX/RMAX.cc \
- RMAX/StereoSessionRmax.cc DG/StereoSessionDG.cc \
+ Pinhole/StereoSessionPinhole.cc \
+ DG/StereoSessionDG.cc \
DG/XMLBase.cc DG/XML.cc RPC/StereoSessionRPC.cc \
RPC/RPCStereoModel.cc RPC/RPCModel.cc \
RPC/RPCMapTransform.cc
@@ -35,7 +35,7 @@ libaspSessions_la_LIBADD = @MODULE_SESSIONS_LIBS@
lib_LTLIBRARIES = libaspSessions.la
-SUBDIRS = . Pinhole RMAX DG tests
+SUBDIRS = . Pinhole DG tests
if HAVE_PKG_ISIS
SUBDIRS += ISIS
@@ -1,34 +0,0 @@
-# __BEGIN_LICENSE__
-# Copyright (c) 2009-2012, United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration. All
-# rights reserved.
-#
-# The NGT platform is licensed under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# __END_LICENSE__
-
-
-#########################################################################
-# sources
-#########################################################################
-
-include_HEADERS = RMAX.h StereoSessionRmax.h
-
-#########################################################################
-# general
-#########################################################################
-
-AM_CPPFLAGS = @ASP_CPPFLAGS@
-AM_LDFLAGS = @ASP_LDFLAGS@ -version-info @LIBTOOL_VERSION@
-
-includedir = $(prefix)/include/asp/Sessions/RMAX
-
-include $(top_srcdir)/config/rules.mak
@@ -1,138 +0,0 @@
-// __BEGIN_LICENSE__
-// Copyright (c) 2009-2012, United States Government as represented by the
-// Administrator of the National Aeronautics and Space Administration. All
-// rights reserved.
-//
-// The NGT platform is licensed under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance with the
-// License. You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// __END_LICENSE__
-
-
-/// \file RMAX.cc
-///
-
-#include <asp/Sessions/RMAX/RMAX.h>
-
-#include <vw/Core.h>
-#include <vw/FileIO/DiskImageResourcePNG.h>
-
-#define RMAX_GLOBAL_EASTING (582680)
-#define RMAX_GLOBAL_NORTHING (4141480)
-
-using namespace vw;
-using namespace vw::camera;
-
-void read_image_info( std::string const& filename, ImageInfo& info ) {
- vw_out(DebugMessage,"asp") << "Reading image info from " << filename << std::endl;;
- DiskImageResourcePNG png( filename );
- info.filename = filename;
- for( unsigned i=0; i<png.num_comments(); ++i ) {
- std::string const& key = png.get_comment(i).key;
- std::istringstream value( png.get_comment(i).text );
- if( key == "easting" ) value >> info.easting;
- else if( key == "northing" ) value >> info.northing;
- else if( key == "heading" ) value >> info.heading;
- else if( key == "pitch" ) value >> info.pitch;
- else if( key == "roll" ) value >> info.roll;
- else if( key == "height" ) value >> info.height;
- // Note: The key name says it's in radians, but it's clearly actually in degrees!
- else if( key == "tilt angle in radians" ) value >> info.tilt;
- else if( key == "which camera" ) {
- switch( png.get_comment(i).text[0] ) {
- case 'l': info.camera = ImageInfo::LEFT; break;
- case 'r': info.camera = ImageInfo::RIGHT; break;
- case 'c': info.camera = ImageInfo::COLOR; break;
- }
- }
- //else std::cout << "Unkown key: " << key << std::endl;
- }
-}
-
-camera::CAHVORModel rmax_image_camera_model( ImageInfo const& info,
- Vector3 const& position_correction,
- Vector3 const& pose_correction) {
- // Bundle Adjustment
- double r = info.roll + pose_correction[0];
- double p = info.pitch + pose_correction[1];
- double y = info.heading + pose_correction[2];
-
- camera::CAHVORModel base;
- if( info.camera == ImageInfo::RIGHT ) {
- base.C = Vector3( 0.495334, -0.003158, -0.004600 );
- base.A = Vector3( 0.006871, -0.000863, 0.999976 );
- base.H = Vector3( 1095.653400, 8.513659, 321.246801 );
- base.V = Vector3( -7.076027, 1093.871625, 251.343361 );
- base.O = Vector3( 0.004817, 0.000619, 0.999988 );
- base.R = Vector3( 0.000000, -0.235833, 0.180509 );
- }
- else {
- base.C = Vector3( -0.495334, 0.003158, 0.004600 );
- base.A = Vector3( -0.000000, 0.000000, 1.000000 );
- base.H = Vector3( 1095.186165, -0.000000, 324.865834 );
- base.V = Vector3( 0.000000, 1095.678491, 250.561559 );
- base.O = Vector3( 0.000012, -0.002199, 0.999998 );
- base.R = Vector3( 0.000000, -0.230915, 0.128078 );
- }
- double cr=cos(r*M_PI/180), sr=sin(r*M_PI/180);
- double cp=cos(p*M_PI/180), sp=sin(p*M_PI/180);
- double cy=cos(y*M_PI/180), sy=sin(y*M_PI/180);
- Matrix3x3 roll, pitch, yaw, flip;
- roll(0,0)=cr; roll(0,1)=0; roll(0,2)=-sr;
- roll(1,0)=0; roll(1,1)=1; roll(1,2)=0;
- roll(2,0)=sr; roll(2,1)=0; roll(2,2)=cr;
- pitch(0,0)=1; pitch(0,1)=0; pitch(0,2)=0;
- // XXX Pitch might have the wrong sign here....
- pitch(1,0)=0; pitch(1,1)=cp; pitch(1,2)=-sp;
- pitch(2,0)=0; pitch(2,1)=sp; pitch(2,2)=cp;
- yaw(0,0)=cy; yaw(0,1)=-sy; yaw(0,2)=0;
- yaw(1,0)=sy; yaw(1,1)=cy; yaw(1,2)=0;
- yaw(2,0)=0; yaw(2,1)=0; yaw(2,2)=1;
- flip(0,0)=1; flip(0,1)=0; flip(0,2)=0;
- flip(1,0)=0; flip(1,1)=-1; flip(1,2)=0;
- flip(2,0)=0; flip(2,1)=0; flip(2,2)=-1;
- Matrix3x3 ori = flip*yaw*pitch*roll;
- Vector3 pos( info.easting, info.northing, info.height );
-
- // Bundle Adjustment
- pos += position_correction;
-
- camera::CAHVORModel cahvor;
- cahvor.C = pos - Vector3(RMAX_GLOBAL_EASTING,RMAX_GLOBAL_NORTHING,0) + ori*base.C;
- cahvor.A = ori*base.A;
- cahvor.H = ori*base.H;
- cahvor.V = ori*base.V;
- cahvor.O = ori*base.O;
- cahvor.R = base.R;
- return cahvor;
-}
-
-vw::camera::CAHVORModel rmax_image_camera_model( ImageInfo const& info ) {
- return rmax_image_camera_model(info, Vector3(), Vector3());
-}
-
-vw::camera::CAHVORModel rmax_image_camera_model( std::string const& filename ) {
- ImageInfo info;
- read_image_info( filename, info );
- return rmax_image_camera_model( info );
-}
-
-bool may_overlap( ImageInfo const& i1, ImageInfo const& i2 ) {
- const double diameter = 6; // approximate diameter in meters
- return hypot( i2.easting-i1.easting, i2.northing-i1.northing ) < diameter;
-}
-
-bool may_overlap( std::string const& file1, std::string const& file2 ) {
- ImageInfo i1, i2;
- read_image_info(file1,i1);
- read_image_info(file2,i2);
- return may_overlap(i1,i2);
-}
-
@@ -1,54 +0,0 @@
-// __BEGIN_LICENSE__
-// Copyright (c) 2009-2012, United States Government as represented by the
-// Administrator of the National Aeronautics and Space Administration. All
-// rights reserved.
-//
-// The NGT platform is licensed under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance with the
-// License. You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// __END_LICENSE__
-
-
-/// \file RMAX.h
-///
-
-#ifndef RMAX_H__
-#define RMAX_H__
-
-
-#include <string>
-#include <vw/Camera/CAHVORModel.h>
-
-struct ImageInfo {
- std::string filename;
- double easting, northing;
- double heading, pitch, roll;
- double height, tilt;
- enum {
- LEFT=1, RIGHT=2, COLOR=3
- } camera;
-};
-
-void read_image_info( std::string const& filename, ImageInfo& info );
-
-vw::camera::CAHVORModel rmax_image_camera_model( ImageInfo const& info,
- vw::Vector3 const& position_correction,
- vw::Vector3 const& pose_correction);
-
-vw::camera::CAHVORModel rmax_image_camera_model( ImageInfo const& info );
-
-vw::camera::CAHVORModel rmax_image_camera_model( std::string const& filename );
-
-bool may_overlap( ImageInfo const& i1, ImageInfo const& i2 );
-bool may_overlap( std::string const& file1, std::string const& file2 );
-
-// -----
-
-#endif // __RMAX_H__
Oops, something went wrong.

0 comments on commit a4a7358

Please sign in to comment.