Updated to latest phy++ API

Author: cschreib

src/egg-2skymaker.cpp

@@ -176,7 +176,7 @@ int phypp_main(int argc, char* argv[]) {
 
     if (count(sky_param == "WAVELENGTH") == 0) {
         sky_param.push_back("WAVELENGTH");
-        sky_value.push_back(strn(cat.lambda[b]));
+        sky_value.push_back(to_string(cat.lambda[b]));
 
     }
 
@@ -312,7 +312,7 @@ int phypp_main(int argc, char* argv[]) {
         tpar.push_back("IMAGE_NAME");
         tval.push_back(img_dir+img_name+"-sci.fits");
         tpar.push_back("IMAGE_SIZE");
-        tval.push_back(strn(sx)+","+strn(sy));
+        tval.push_back(to_string(sx)+","+to_string(sy));
         tpar.push_back("IMAGE_HEADER");
         tval.push_back(hdr_file);
 
@@ -404,8 +404,8 @@ int phypp_main(int argc, char* argv[]) {
             tx[idi[idis]] = ttx[idis]; ty[idi[idis]] = tty[idis];
 
             // Write the catalog for this section
-            std::string six = align_right(strn(ix+1), strn(nsx).size(), '0');
-            std::string siy = align_right(strn(iy+1), strn(nsy).size(), '0');
+            std::string six = align_right(to_string(ix+1), to_string(nsx).size(), '0');
+            std::string siy = align_right(to_string(iy+1), to_string(nsy).size(), '0');
 
             auto spl = file::split_extension(out_file);
             write_catalog(spl.first+"-"+six+"-"+siy+spl.second, idi, nx, ny);

src/egg-gencat.cpp

@@ -181,8 +181,8 @@ int phypp_main(int argc, char* argv[]) {
             });
 
             // Print
-            vec1s srlam = strna(rlam)+" um, ";
-            vec1s swidth = strna(width);
+            vec1s srlam = to_string_vector(rlam)+" um, ";
+            vec1s swidth = to_string_vector(width);
             vec1s item = " - "+align_left(fils, max(length(fils)))+
                 "  ref-lam = "+align_left(srlam, max(length(srlam)))+
                 "FWHM = "+swidth+" um";
@@ -1643,7 +1643,7 @@ if (!no_flux) {
 
     if (save_sed) {
         if (verbose) {
-            note("writing "+strn(nsed)+" SEDs to disk...");
+            note("writing ", nsed, " SEDs to disk...");
 
             auto pg = progress_start(nsed);
             do {

src/egg-getsed.cpp

@@ -20,7 +20,7 @@ int phypp_main(int argc, char* argv[]) {
             cmp_str = component+"-";
         }
 
-        out = file::remove_extension(seds)+"-"+cmp_str+strn(id)+(ascii ? ".cat" : ".fits");
+        out = file::remove_extension(seds)+"-"+cmp_str+to_string(id)+(ascii ? ".cat" : ".fits");
     } else {
         file::mkdir(file::get_directory(out));
     }
@@ -78,7 +78,7 @@ int phypp_main(int argc, char* argv[]) {
 
         std::ifstream file(seds);
 
-        // Read bulge        
+        // Read bulge
         uint_t start = tstart_bulge[id];
         uint_t nbyte = tnbyte_bulge[id]/2;
         uint_t npt = nbyte/sizeof(float);
@@ -103,7 +103,8 @@ int phypp_main(int argc, char* argv[]) {
     }
 
     if (ascii) {
-        ascii::write_table_hdr(out, 18, ftable(lambda, strna_sci(flux)));
+        ascii::write_table_hdr(out, 18, {"lambda[um]", "flux[uJy]"},
+            lambda, format::scientific(flux));
     } else {
         fits::write_table(out, ftable(lambda, flux));
     }
@@ -128,7 +129,7 @@ void print_help() {
         }
     };
 
-    print("egg-getsed v1.0rc1");
+    print("egg-getsed v1.0");
     print("usage: egg-getsed [options]\n");
 
     print("List of options:");