Permalink
Browse files

Move the Photometry/reconstruct software to the PhotometryTk package …

…and out of Vision Workbench/Stereo Pipeline
  • Loading branch information...
1 parent d46deb0 commit 00ca141b0a519db5c54e67aab8212e49ef448978 @oleg-alexandrov oleg-alexandrov committed May 31, 2012
View
@@ -57,4 +57,3 @@ ENABLE_APP_RMAX2CAHVOR=no
ENABLE_APP_RMAXADJUST=no
ENABLE_APP_BUNDLEVIS=yes
ENABLE_APP_ISISADJUST=yes
-ENABLE_APP_RECONSTRUCT=yes
View
@@ -242,7 +242,6 @@ AX_PKG(VW_STEREO, [VW_CAMERA], [-lvwStereo], [vw/Stereo/C
AX_PKG(VW_CARTOGRAPHY, [VW_CAMERA], [-lvwCartography], [vw/Cartography/GeoReference.h], [], [], [], [PROTOBUF])
AX_PKG(VW_MOSAIC, [VW_CARTOGRAPHY], [-lvwMosaic], [vw/Mosaic/ImageComposite.h])
AX_PKG(VW_INTEREST_POINT, [VW], [-lvwInterestPoint],[vw/InterestPoint/InterestData.h])
-AX_PKG(VW_PHOTOMETRY, [VW VW_CARTOGRAPHY], [-lvwPhotometry])
AX_PKG(VW_BUNDLEADJUSTMENT, [VW_INTEREST_POINT VW_CARTOGRAPHY VW_STEREO], [-lvwBundleAdjustment], [vw/BundleAdjustment/AdjustBase.h])
AM_CONDITIONAL(HAVE_PKG_VW_BUNDLEADJUSTMENT, [test "$HAVE_PKG_VW_BUNDLEADJUSTMENT" = "yes"])
@@ -407,7 +406,6 @@ AX_APP(ORTHOPROJECT, [src/asp/Tools], yes, [SESSIONS])
AX_APP(PLATEORTHOPROJECT,[src/asp/Tools], no, [VW_PLATE CORE SESSIONS ISISIO])
AX_APP(POINT2DEM, [src/asp/Tools], yes, [CORE])
AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH VW CORE])
-AX_APP(RECONSTRUCT, [src/asp/Tools], no, [VW VW_PHOTOMETRY VW_CARTOGRAPHY ])
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])
@@ -442,7 +440,6 @@ AM_CONDITIONAL(MAKE_APP_ORTHOPROJECT, [test "$MAKE_APP_ORTHOPROJECT" = "yes"])
AM_CONDITIONAL(MAKE_APP_PLATEORTHOPROJECT, [test "$MAKE_APP_PLATEORTHOPROJECT" = "yes"])
AM_CONDITIONAL(MAKE_APP_POINT2DEM, [test "$MAKE_APP_POINT2DEM" = "yes"])
AM_CONDITIONAL(MAKE_APP_POINT2MESH, [test "$MAKE_APP_POINT2MESH" = "yes"])
-AM_CONDITIONAL(MAKE_APP_RECONSTRUCT, [test "$MAKE_APP_RECONSTRUCT" = "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"])
@@ -104,12 +104,6 @@ if MAKE_APP_RESULTS
results_LDADD = $(APP_RESULTS_LIBS)
endif
-if MAKE_APP_RECONSTRUCT
- bin_PROGRAMS += reconstruct
- reconstruct_SOURCES = reconstruct.cc reconstruct_aux.cc
- reconstruct_LDADD = $(APP_RECONSTRUCT_LIBS) $(APP_ORTHOPROJECT_LIBS)
-endif
-
if MAKE_APP_ALIGNDEM
bin_PROGRAMS += aligndem
aligndem_SOURCES = aligndem.cc
@@ -1,41 +0,0 @@
-# Files/directories
-DRG_DIR DIM_input_2560mpp
-DEM_DIR DEM_tiles_sub64
-SUN_POSITION_FILE meta/sunpos.txt
-SPACECRAFT_POSITION_FILE meta/spacecraftpos.txt
-
-# Constants
-TILE_SIZE 4.0
-SIMULATION_BOX -180:180:-180:180
-REFLECTANCE_TYPE 2
-SHADOW_THRESH 40
-SHADOW_REMOVAL_TYPE 1
-TR_CONST 1.0
-PHASE_COEFF_A1 1.4
-PHASE_COEFF_A2 0.5
-MAX_NUM_ITER 0
-NO_DEM_DATA_VAL -32767
-
-# Actions
-USE_WEIGHTS 1
-USE_NORMALIZED_WEIGHTS 0
-POST_SCALE_ALBEDO 0
-COMPUTE_ERRORS 0
-
-# Parameters controlling the flow. Normally
-# these are specified via command-line options,
-# but can be overrriden below.
-INITIAL_SETUP 0
-SAVE_WEIGHTS 0
-DEM_INIT_TYPE 0
-EXPOSURE_INIT_TYPE 0
-ALBEDO_INIT_TYPE 0
-UPDATE_EXPOSURE 0
-UPDATE_ALBEDO 0
-UPDATE_HEIGHT 0
-
-# Potentially obsolete parameters.
-EXTRACT_DRG_FROM_CUBES 0
-SLOPE_TYPE 1
-SAVE_REFLECTANCE 0
-
Oops, something went wrong.

0 comments on commit 00ca141

Please sign in to comment.