Minor doc clarification and fix for aster2asp

INSTALLGUIDE.rst

@@ -213,7 +213,11 @@ the processing time should go down. Both ``gdalinfo`` and
 Fetching pre-compiled ASP with conda
 ------------------------------------
 
-ASP's official releases can be downloaded with ``conda``, for Linux and OSX with the Intel processor. See :numref:`precompiled_binaries` for how other platforms may be handled.
+ASP's official releases can be downloaded with ``conda``, for Linux and OSX with
+the Intel processor. 
+
+ASP conda packages do not exist for ARM64 Mac (M1/M2). See
+:numref:`precompiled_binaries` for how other platforms may be handled.
 
 The latest conda release is version 3.3.0, published on August 16, 2023. See
 :numref:`news` for what changed since then.  The newer functionality

src/asp/Tools/aster2asp.cc

@@ -304,7 +304,7 @@ void apply_radiometric_corrections(Options const& opt,
   DiskImageView<float> input_img(input_image);
 
   // Sanity check
-  if (input_img.cols() != int(corr.size()) ) 
+  if (input_img.cols() != int(corr.size())) 
     vw_throw( ArgumentErr() << "Expecting as many corrections in " << corr_table
 	      << " as image columns in " << input_image << "\n" );
 
@@ -323,9 +323,8 @@ void apply_radiometric_corrections(Options const& opt,
   vw::cartography::GeoReference georef;
   bool has_georef = read_georeference(georef, input_image);
   if (has_georef)
-    vw_throw( ArgumentErr() << "ASTER L1A images are not supposed to be georeferenced.\n" );
+    vw_throw(ArgumentErr() << "ASTER L1A images are not supposed to be georeferenced.\n");
 
-
   vw_out() << "Writing: " << out_image << std::endl;
   vw::cartography::block_write_gdal_image(out_image,
 			      radio_correct(input_img, corr, has_nodata, nodata),
@@ -641,7 +640,7 @@ void gen_xml(double min_height, double max_height, std::int64_t num_samples,
 
   if (lattice_mat.empty() || sight_mat.empty()     ||
       lattice_mat.size()     != sight_mat.size()   ||
-      lattice_mat[0].size() != sight_mat[0].size() ) {
+      lattice_mat[0].size() != sight_mat[0].size()) {
     vw_throw( ArgumentErr() << "Inconsistent lattice point and sight vector information.\n");
   }
 
@@ -661,15 +660,15 @@ void gen_xml(double min_height, double max_height, std::int64_t num_samples,
                        sat_pos_file, sight_vec_file,  
                        longitude_file, latitude_file, lattice_file,  
                        // Outputs
-		       world_sight_mat, 
+                       world_sight_mat, 
                        llh_scale, llh_offset,  
                        pixel_scale, pixel_offset,  
                        normalized_llh,  
                        normalized_pixels);
 
   // Find the RPC coefficients
   asp::RPCModel::CoeffVec line_num, line_den, samp_num, samp_den;
-  std::string output_prefix = ""; 
+  std::string output_prefix = "";
   asp::gen_rpc(// Inputs
                penalty_weight, output_prefix,
                normalized_llh, normalized_pixels,  
@@ -745,6 +744,14 @@ int main( int argc, char *argv[] ) {
               	<< out_back_cam  		<< std::endl;
 #endif
 
+    // Oddly, writing the xml files first, with output prefix "run", results in
+    // images later wiping the xml camera files. So write the images before the
+    // xml files.
+    apply_radiometric_corrections(opt, nadir_image, nadir_corr_table, out_nadir_image);
+    apply_radiometric_corrections(opt, back_image,  back_corr_table,  out_back_image);
+
+    vw_out() << "Computing the camera models.\n"; 
+
     gen_xml(opt.min_height, opt.max_height, opt.num_samples, opt.penalty_weight,
 	    nadir_image, nadir_sat_pos, nadir_sight_vec, nadir_longitude, nadir_latitude,  
 	    nadir_lattice_point, out_nadir_cam);
@@ -753,9 +760,6 @@ int main( int argc, char *argv[] ) {
 	    back_image, back_sat_pos, back_sight_vec, back_longitude, back_latitude,  
 	    back_lattice_point, out_back_cam);
 
-    apply_radiometric_corrections(opt, nadir_image, nadir_corr_table, out_nadir_image);
-    apply_radiometric_corrections(opt, back_image,  back_corr_table,  out_back_image);
-
   } ASP_STANDARD_CATCHES;
 
   return 0;