[gnuastro-commits] master c3fc33a: Only program names for FITS image keyword titles

[Mohammad Akhlaghi]

branch: master
commit c3fc33a75686f6be426ad39bfc65d654a720673a
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    Only program names for FITS image keyword titles
    
    Until now, the title of the set of FITS image keywords releated to a
    special program was set with the `PROGRAM_STRING' macro. This macro has the
    format of "ProgramName (GNU Astronomy Utilities) X.Y.ZZZ". However, in FITS
    images, we have a special `GNUASTRO' keyword that has the version number as
    value. So the extra information was redundant/repeated.
    
    With this commit, all the cases where an image is written to a FITS file,
    the string is changed to `PROGRAM_NAME' which is just the name of the
    program.
---
 bin/arithmetic/arithmetic.c    |  2 +-
 bin/convertt/convertt.c        |  2 +-
 bin/convolve/convolve.c        | 14 +++++++-------
 bin/crop/crop.c                |  4 ++--
 bin/mknoise/mknoise.c          |  2 +-
 bin/mkprof/mkprof.c            |  6 +++---
 bin/noisechisel/clumps.c       |  6 +++---
 bin/noisechisel/detection.c    | 18 +++++++++---------
 bin/noisechisel/noisechisel.c  | 12 ++++++------
 bin/noisechisel/segmentation.c |  8 ++++----
 bin/noisechisel/sky.c          |  6 +++---
 bin/noisechisel/threshold.c    | 16 ++++++++--------
 bin/statistics/sky.c           | 20 ++++++++++----------
 bin/statistics/statistics.c    |  6 +++---
 bin/warp/warp.c                |  2 +-
 15 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/bin/arithmetic/arithmetic.c b/bin/arithmetic/arithmetic.c
index a82e256..622af73 100644
--- a/bin/arithmetic/arithmetic.c
+++ b/bin/arithmetic/arithmetic.c
@@ -377,7 +377,7 @@ reversepolish(struct arithmeticparams *p)
       /* Put a copy of the WCS structure from the reference image, it
          will be freed while freeing d1. */
       d1->wcs=p->refdata.wcs;
-      gal_fits_img_write(d1, p->cp.output, NULL, PROGRAM_STRING);
+      gal_fits_img_write(d1, p->cp.output, NULL, PROGRAM_NAME);
       if(!p->cp.quiet)
         printf(" - Output written to %s\n", p->cp.output);
     }
diff --git a/bin/convertt/convertt.c b/bin/convertt/convertt.c
index 8f057ad..729811a 100644
--- a/bin/convertt/convertt.c
+++ b/bin/convertt/convertt.c
@@ -179,7 +179,7 @@ save_with_gnuastro_lib(struct converttparams *p)
     /* FITS: a FITS file can have many extensions (channels). */
     case OUT_FORMAT_FITS:
       for(channel=p->chll; channel!=NULL; channel=channel->next)
-        gal_fits_img_write(channel, p->cp.output, NULL, PROGRAM_STRING);
+        gal_fits_img_write(channel, p->cp.output, NULL, PROGRAM_NAME);
       break;
 
     /* Plain text: only one channel is acceptable. */
diff --git a/bin/convolve/convolve.c b/bin/convolve/convolve.c
index 323a725..f99fa7f 100644
--- a/bin/convolve/convolve.c
+++ b/bin/convolve/convolve.c
@@ -647,13 +647,13 @@ convolve_frequency(struct convolveparams *p)
       /* Save the padded input image. */
       complextoreal(p->pimg, p->ps0*p->ps1, COMPLEX_TO_REAL_REAL, &tmp);
       data->array=tmp; data->name="input padded";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       free(tmp); data->name=NULL;
 
       /* Save the padded kernel image. */
       complextoreal(p->pker, p->ps0*p->ps1, COMPLEX_TO_REAL_REAL, &tmp);
       data->array=tmp; data->name="kernel padded";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       free(tmp); data->name=NULL;
     }
 
@@ -671,12 +671,12 @@ convolve_frequency(struct convolveparams *p)
     {
       complextoreal(p->pimg, p->ps0*p->ps1, COMPLEX_TO_REAL_SPEC, &tmp);
       data->array=tmp; data->name="input transformed";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       free(tmp); data->name=NULL;
 
       complextoreal(p->pker, p->ps0*p->ps1, COMPLEX_TO_REAL_SPEC, &tmp);
       data->array=tmp; data->name="kernel transformed";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       free(tmp); data->name=NULL;
     }
 
@@ -698,7 +698,7 @@ convolve_frequency(struct convolveparams *p)
     {
       complextoreal(p->pimg, p->ps0*p->ps1, COMPLEX_TO_REAL_SPEC, &tmp);
       data->array=tmp; data->name=p->makekernel ? "Divided" : "Multiplied";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       free(tmp); data->name=NULL;
     }
 
@@ -714,7 +714,7 @@ convolve_frequency(struct convolveparams *p)
   if(p->checkfreqsteps)
     {
       data->array=p->rpad; data->name="padded output";
-      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(data, p->freqstepsname, NULL, PROGRAM_NAME);
       data->name=NULL; data->array=NULL;
     }
 
@@ -794,6 +794,6 @@ convolve(struct convolveparams *p)
     convolve_frequency(p);
 
   /* Save the output (which is in p->input) array. */
-  gal_fits_img_write_to_type(p->input, cp->output, NULL, PROGRAM_STRING,
+  gal_fits_img_write_to_type(p->input, cp->output, NULL, PROGRAM_NAME,
                              cp->type);
 }
diff --git a/bin/crop/crop.c b/bin/crop/crop.c
index db1dc3a..ad91458 100644
--- a/bin/crop/crop.c
+++ b/bin/crop/crop.c
@@ -222,7 +222,7 @@ crop_mode_img(void *inparam)
           crp->centerfilled=onecrop_center_filled(crp);
 
           /* Add the final headers and close output FITS image: */
-          gal_fits_key_write_version(crp->outfits, NULL, PROGRAM_STRING);
+          gal_fits_key_write_version(crp->outfits, NULL, PROGRAM_NAME);
           status=0;
           if( fits_close_file(crp->outfits, &status) )
             gal_fits_io_error(status, "CFITSIO could not close "
@@ -325,7 +325,7 @@ crop_mode_wcs(void *inparam)
           crp->centerfilled=onecrop_center_filled(crp);
 
           /* Write all the dependency versions and close the file. */
-          gal_fits_key_write_version(crp->outfits, NULL, PROGRAM_STRING);
+          gal_fits_key_write_version(crp->outfits, NULL, PROGRAM_NAME);
           status=0;
           if( fits_close_file(crp->outfits, &status) )
             gal_fits_io_error(status, "CFITSIO could not close the "
diff --git a/bin/mknoise/mknoise.c b/bin/mknoise/mknoise.c
index f91c265..82505ae 100644
--- a/bin/mknoise/mknoise.c
+++ b/bin/mknoise/mknoise.c
@@ -97,7 +97,7 @@ convertsaveoutput(struct mknoiseparams *p)
 
   /* Save the output: */
   p->input=gal_data_copy_to_new_type_free(p->input, p->cp.type);
-  gal_fits_img_write(p->input, p->cp.output, headers, PROGRAM_STRING);
+  gal_fits_img_write(p->input, p->cp.output, headers, PROGRAM_NAME);
 }
 
 
diff --git a/bin/mkprof/mkprof.c b/bin/mkprof/mkprof.c
index 2821bd6..ea1f6ab 100644
--- a/bin/mkprof/mkprof.c
+++ b/bin/mkprof/mkprof.c
@@ -146,7 +146,7 @@ saveindividual(struct mkonthread *mkp)
   /* Write the array to file (a separately built PSF doesn't need WCS
      coordinates). */
   if(ibq->ispsf && p->psfinimg==0)
-    gal_fits_img_write(ibq->image, filename, NULL, PROGRAM_STRING);
+    gal_fits_img_write(ibq->image, filename, NULL, PROGRAM_NAME);
   else
     {
       /* Allocate space for the corrected crpix and fill it in. Both
@@ -158,7 +158,7 @@ saveindividual(struct mkonthread *mkp)
       /* Write the image. */
       gal_fits_img_write_corr_wcs_str(ibq->image, filename, p->wcsheader,
                                       p->wcsnkeyrec, crpix, NULL,
-                                      PROGRAM_STRING);
+                                      PROGRAM_NAME);
     }
   ibq->indivcreated=1;
 
@@ -568,7 +568,7 @@ mkprof_write(struct mkprofparams *p)
          on, will put it in `out' to also free it while freeing `out'. */
       out->wcs=p->wcs;
       gal_fits_img_write_to_type(out, p->mergedimgname, NULL,
-                                 PROGRAM_STRING, p->cp.type);
+                                 PROGRAM_NAME, p->cp.type);
       p->wcs=NULL;
 
       /* Clean up */
diff --git a/bin/noisechisel/clumps.c b/bin/noisechisel/clumps.c
index 298f6f9..104c862 100644
--- a/bin/noisechisel/clumps.c
+++ b/bin/noisechisel/clumps.c
@@ -96,7 +96,7 @@ clumps_oversegment(struct clumps_thread_params *cltprm)
     error(EXIT_FAILURE, 0, "in the debugging mode of `clumps_oversegment' "
           "only one thread must be used");
   crop=gal_data_copy(tile);
-  gal_fits_img_write(crop, filename, NULL, PROGRAM_STRING);
+  gal_fits_img_write(crop, filename, NULL, PROGRAM_NAME);
   gal_data_free(crop);
   printf("blank: %u\nriver: %u\ntmpcheck: %u\ninit: %u\nmaxlab: %u\n",
          (int32_t)GAL_BLANK_INT32, (int32_t)CLUMPS_RIVER,
@@ -348,7 +348,7 @@ clumps_oversegment(struct clumps_thread_params *cltprm)
             crop=gal_data_copy(tile);
             crf=(cr=crop->array)+crop->size;
             do if(*cr==CLUMPS_RIVER) *cr=0; while(++cr<crf);
-            gal_fits_img_write(crop, filename, NULL, PROGRAM_STRING);
+            gal_fits_img_write(crop, filename, NULL, PROGRAM_NAME);
             gal_data_free(crop);
           }
         **********************************************/
@@ -1263,7 +1263,7 @@ clumps_true_find_sn_thresh(struct noisechiselparams *p)
              demo, set all Sky regions to blank and all clump macro values
              to zero. */
           gal_fits_img_write(p->clabel, p->segmentationname, NULL,
-                             PROGRAM_STRING);
+                             PROGRAM_NAME);
 
           /* Increment the step counter. */
           ++clprm.step;
diff --git a/bin/noisechisel/detection.c b/bin/noisechisel/detection.c
index aea3be4..e293107 100644
--- a/bin/noisechisel/detection.c
+++ b/bin/noisechisel/detection.c
@@ -70,7 +70,7 @@ detection_initial(struct noisechiselparams *p)
   if(p->detectionname)
     {
       p->binary->name="THRESHOLDED";
-      gal_fits_img_write(p->binary, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->binary, p->detectionname, NULL, PROGRAM_NAME);
       p->binary->name=NULL;
     }
 
@@ -88,7 +88,7 @@ detection_initial(struct noisechiselparams *p)
   if(p->detectionname)
     {
       p->binary->name="ERODED";
-      gal_fits_img_write(p->binary, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->binary, p->detectionname, NULL, PROGRAM_NAME);
       p->binary->name=NULL;
     }
 
@@ -115,7 +115,7 @@ detection_initial(struct noisechiselparams *p)
   if(p->detectionname)
     {
       p->olabel->name="OPENED_AND_LABELED";
-      gal_fits_img_write(p->olabel, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->olabel, p->detectionname, NULL, PROGRAM_NAME);
       p->olabel->name=NULL;
     }
 
@@ -291,7 +291,7 @@ detection_pseudo_find(struct noisechiselparams *p, 
gal_data_t *workbin,
   if(p->detectionname)
     {
       workbin->name = s0d1 ? "DTHRESH-ON-DET" : "DTHRESH-ON-SKY";
-      gal_fits_img_write(workbin, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(workbin, p->detectionname, NULL, PROGRAM_NAME);
       workbin->name=NULL;
     }
 
@@ -346,7 +346,7 @@ detection_pseudo_find(struct noisechiselparams *p, 
gal_data_t *workbin,
             }
 
           /* Write the temporary array into the check image. */
-          gal_fits_img_write(bin, p->detectionname, NULL, PROGRAM_STRING);
+          gal_fits_img_write(bin, p->detectionname, NULL, PROGRAM_NAME);
 
           /* Increment the step counter. */
           ++fho_prm.step;
@@ -547,7 +547,7 @@ detection_sn(struct noisechiselparams *p, gal_data_t 
*worklab, size_t num,
           while(++plab<plabend);
         }
       worklab->name=extname;
-      gal_fits_img_write(worklab, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(worklab, p->detectionname, NULL, PROGRAM_NAME);
       worklab->name=NULL;
     }
 
@@ -661,7 +661,7 @@ detection_pseudo_remove_low_sn(struct noisechiselparams *p,
     {
       workbin->name="TRUE-PSEUDOS";
       gal_fits_img_write(workbin, p->detectionname, NULL,
-                         PROGRAM_STRING);
+                         PROGRAM_NAME);
       workbin->name=NULL;
     }
 
@@ -814,7 +814,7 @@ detection_final_remove_small_sn(struct noisechiselparams 
*p, size_t num)
     {
       p->olabel->name="DETECTION-FINAL";
       gal_fits_img_write(p->olabel, p->detectionname, NULL,
-                         PROGRAM_STRING);
+                         PROGRAM_NAME);
       p->olabel->name=NULL;
     }
 
@@ -1004,7 +1004,7 @@ detection(struct noisechiselparams *p)
         {
           p->olabel->name="DETECTION-FINAL";
           gal_fits_img_write(p->olabel, p->detectionname, NULL,
-                             PROGRAM_STRING);
+                             PROGRAM_NAME);
           p->olabel->name=NULL;
         }
     }
diff --git a/bin/noisechisel/noisechisel.c b/bin/noisechisel/noisechisel.c
index e17d25c..eb9c222 100644
--- a/bin/noisechisel/noisechisel.c
+++ b/bin/noisechisel/noisechisel.c
@@ -68,8 +68,8 @@ noisechisel_convolve(struct noisechiselparams *p)
   if(!p->cp.quiet) gal_timing_report(&t1, "Convolved with kernel.", 1);
   if(p->detectionname)
     {
-      gal_fits_img_write(p->input, p->detectionname, NULL, PROGRAM_STRING);
-      gal_fits_img_write(p->conv, p->detectionname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->input, p->detectionname, NULL, PROGRAM_NAME);
+      gal_fits_img_write(p->conv, p->detectionname, NULL, PROGRAM_NAME);
     }
 }
 
@@ -205,7 +205,7 @@ noisechisel_output(struct noisechiselparams *p)
                         0, "Minimum S/N of true pseudo-detections", 0,
                         "ratio");
   p->olabel->name = p->onlydetection ? "DETECTIONS" : "OBJECTS";
-  gal_fits_img_write(p->olabel, p->cp.output, keys, PROGRAM_STRING);
+  gal_fits_img_write(p->olabel, p->cp.output, keys, PROGRAM_NAME);
   p->olabel->name=NULL;
   keys=NULL;
 
@@ -223,7 +223,7 @@ noisechisel_output(struct noisechiselparams *p)
       gal_fits_key_list_add(&keys, GAL_TYPE_FLOAT32, "CLUMPSN", 0,
                             &p->clumpsnthresh, 0, "Minimum S/N of true clumps",
                             0, "ratio");
-      gal_fits_img_write(p->clabel, p->cp.output, keys, PROGRAM_STRING);
+      gal_fits_img_write(p->clabel, p->cp.output, keys, PROGRAM_NAME);
       p->clabel->name=NULL;
       keys=NULL;
     }
@@ -233,7 +233,7 @@ noisechisel_output(struct noisechiselparams *p)
   if(p->sky->name) free(p->sky->name);
   p->sky->name="SKY";
   gal_tile_full_values_write(p->sky, &p->cp.tl, p->cp.output,
-                             NULL, PROGRAM_STRING);
+                             NULL, PROGRAM_NAME);
   p->sky->name=NULL;
 
 
@@ -249,7 +249,7 @@ noisechisel_output(struct noisechiselparams *p)
                         "Median raw tile standard deviation", 0,
                         p->input->unit);
   gal_tile_full_values_write(p->std, &p->cp.tl, p->cp.output, keys,
-                             PROGRAM_STRING);
+                             PROGRAM_NAME);
   p->std->name=NULL;
 }
 
diff --git a/bin/noisechisel/segmentation.c b/bin/noisechisel/segmentation.c
index 6c25980..eb3e706 100644
--- a/bin/noisechisel/segmentation.c
+++ b/bin/noisechisel/segmentation.c
@@ -767,7 +767,7 @@ segmentation_detections(struct noisechiselparams *p)
              default values are hard to view, so we'll make a copy of the
              demo, set all Sky regions to blank and all clump macro values
              to zero. */
-          gal_fits_img_write(demo, p->segmentationname, NULL, PROGRAM_STRING);
+          gal_fits_img_write(demo, p->segmentationname, NULL, PROGRAM_NAME);
 
           /* If the user wanted to check the clump S/N values, then break
              out of the loop, we don't need the rest of the process any
@@ -847,11 +847,11 @@ segmentation(struct noisechiselparams *p)
      inputs. */
   if(p->segmentationname)
     {
-      gal_fits_img_write(p->input, p->segmentationname, NULL, PROGRAM_STRING);
-      gal_fits_img_write(p->conv, p->segmentationname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->input, p->segmentationname, NULL, PROGRAM_NAME);
+      gal_fits_img_write(p->conv, p->segmentationname, NULL, PROGRAM_NAME);
       p->olabel->name="DETECTION_LABELS";
       gal_fits_img_write(p->olabel, p->segmentationname, NULL,
-                         PROGRAM_STRING);
+                         PROGRAM_NAME);
       p->olabel->name=NULL;
     }
 
diff --git a/bin/noisechisel/sky.c b/bin/noisechisel/sky.c
index efb5961..5cc9340 100644
--- a/bin/noisechisel/sky.c
+++ b/bin/noisechisel/sky.c
@@ -157,7 +157,7 @@ sky_and_std(struct noisechiselparams *p, char *checkname)
   if(checkname && !tl->oneelempertile)
     {
       p->binary->name="DETECTED";
-      gal_fits_img_write(p->binary, checkname, NULL, PROGRAM_STRING);
+      gal_fits_img_write(p->binary, checkname, NULL, PROGRAM_NAME);
       p->binary->name=NULL;
     }
 
@@ -174,8 +174,8 @@ sky_and_std(struct noisechiselparams *p, char *checkname)
                        cp->numthreads);
   if(checkname)
     {
-      gal_tile_full_values_write(p->sky, tl, checkname, NULL, PROGRAM_STRING);
-      gal_tile_full_values_write(p->std, tl, checkname, NULL, PROGRAM_STRING);
+      gal_tile_full_values_write(p->sky, tl, checkname, NULL, PROGRAM_NAME);
+      gal_tile_full_values_write(p->std, tl, checkname, NULL, PROGRAM_NAME);
     }
 
   /* Get the basic information about the standard deviation
diff --git a/bin/noisechisel/threshold.c b/bin/noisechisel/threshold.c
index 9c27c60..1604942 100644
--- a/bin/noisechisel/threshold.c
+++ b/bin/noisechisel/threshold.c
@@ -272,8 +272,8 @@ threshold_interp_smooth(struct noisechiselparams *p, 
gal_data_t **first,
     {
       (*first)->name="THRESH1_INTERP";
       (*second)->name="THRESH2_INTERP";
-      gal_tile_full_values_write(*first, tl, filename, NULL, PROGRAM_STRING);
-      gal_tile_full_values_write(*second, tl, filename, NULL, PROGRAM_STRING);
+      gal_tile_full_values_write(*first, tl, filename, NULL, PROGRAM_NAME);
+      gal_tile_full_values_write(*second, tl, filename, NULL, PROGRAM_NAME);
       (*first)->name = (*second)->name = NULL;
     }
 
@@ -298,9 +298,9 @@ threshold_interp_smooth(struct noisechiselparams *p, 
gal_data_t **first,
           (*first)->name="THRESH1_SMOOTH";
           (*second)->name="THRESH2_SMOOTH";
           gal_tile_full_values_write(*first, tl, filename, NULL,
-                                     PROGRAM_STRING);
+                                     PROGRAM_NAME);
           gal_tile_full_values_write(*second, tl, filename, NULL,
-                                     PROGRAM_STRING);
+                                     PROGRAM_NAME);
           (*first)->name = (*second)->name = NULL;
         }
     }
@@ -457,7 +457,7 @@ threshold_quantile_find_apply(struct noisechiselparams *p)
      the full input when `oneelempertile' isn't requested. */
   if(p->qthreshname && !tl->oneelempertile)
     gal_fits_img_write(p->conv ? p->conv : p->input, p->qthreshname, NULL,
-                       PROGRAM_STRING);
+                       PROGRAM_NAME);
 
 
   /* Allocate space for the quantile threshold values. */
@@ -490,9 +490,9 @@ threshold_quantile_find_apply(struct noisechiselparams *p)
       qprm.erode_th->name="QTHRESH_ERODE";
       qprm.noerode_th->name="QTHRESH_NOERODE";
       gal_tile_full_values_write(qprm.erode_th, tl, p->qthreshname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
       gal_tile_full_values_write(qprm.noerode_th, tl, p->qthreshname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
       qprm.erode_th->name = qprm.noerode_th->name = NULL;
     }
 
@@ -509,7 +509,7 @@ threshold_quantile_find_apply(struct noisechiselparams *p)
 
   /* Write the binary image if check is requested. */
   if(p->qthreshname && !tl->oneelempertile)
-    gal_fits_img_write(p->binary, p->qthreshname, NULL, PROGRAM_STRING);
+    gal_fits_img_write(p->binary, p->qthreshname, NULL, PROGRAM_NAME);
 
 
   /* Clean up and report duration if necessary. */
diff --git a/bin/statistics/sky.c b/bin/statistics/sky.c
index fc20a17..f68678c 100644
--- a/bin/statistics/sky.c
+++ b/bin/statistics/sky.c
@@ -151,7 +151,7 @@ sky(struct statisticsparams *p)
 
   /* When checking steps, the input image is the first extension. */
   if(p->checksky)
-    gal_fits_img_write(p->input, p->checkskyname, NULL, PROGRAM_STRING);
+    gal_fits_img_write(p->input, p->checkskyname, NULL, PROGRAM_NAME);
 
 
   /* Convolve the image (if desired). */
@@ -162,7 +162,7 @@ sky(struct statisticsparams *p)
                                         cp->numthreads, 1, tl->workoverch);
       if(p->checksky)
         gal_fits_img_write(p->convolved, p->checkskyname, NULL,
-                           PROGRAM_STRING);
+                           PROGRAM_NAME);
       if(!cp->quiet)
         gal_timing_report(&t1, "Input convolved with kernel.", 1);
     }
@@ -193,9 +193,9 @@ sky(struct statisticsparams *p)
   if(p->checksky)
     {
       gal_tile_full_values_write(p->sky_t, tl, p->checkskyname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
       gal_tile_full_values_write(p->std_t, tl, p->checkskyname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
     }
 
 
@@ -214,9 +214,9 @@ sky(struct statisticsparams *p)
   if(p->checksky)
     {
       gal_tile_full_values_write(p->sky_t, tl, p->checkskyname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
       gal_tile_full_values_write(p->std_t, tl, p->checkskyname, NULL,
-                                 PROGRAM_STRING);
+                                 PROGRAM_NAME);
     }
 
 
@@ -238,9 +238,9 @@ sky(struct statisticsparams *p)
       if(p->checksky)
         {
           gal_tile_full_values_write(p->sky_t, tl, p->checkskyname, NULL,
-                                     PROGRAM_STRING);
+                                     PROGRAM_NAME);
           gal_tile_full_values_write(p->std_t, tl, p->checkskyname, NULL,
-                                     PROGRAM_STRING);
+                                     PROGRAM_NAME);
         }
     }
 
@@ -250,8 +250,8 @@ sky(struct statisticsparams *p)
                                         ( p->cp.output
                                           ? p->cp.output
                                           : p->inputname ), "_sky.fits");
-  gal_tile_full_values_write(p->sky_t, tl, outname, NULL, PROGRAM_STRING);
-  gal_tile_full_values_write(p->std_t, tl, outname, NULL, PROGRAM_STRING);
+  gal_tile_full_values_write(p->sky_t, tl, outname, NULL, PROGRAM_NAME);
+  gal_tile_full_values_write(p->std_t, tl, outname, NULL, PROGRAM_NAME);
   if(!cp->quiet)
     printf("  - Written to `%s'.\n", outname);
 
diff --git a/bin/statistics/statistics.c b/bin/statistics/statistics.c
index 9333fe8..7b27985 100644
--- a/bin/statistics/statistics.c
+++ b/bin/statistics/statistics.c
@@ -254,7 +254,7 @@ statistics_interpolate_and_write(struct statisticsparams *p,
     }
 
   /* Write the values. */
-  gal_tile_full_values_write(values, &cp->tl, output, NULL, PROGRAM_STRING);
+  gal_tile_full_values_write(values, &cp->tl, output, NULL, PROGRAM_NAME);
 }
 
 
@@ -557,7 +557,7 @@ write_output_table(struct statisticsparams *p, gal_data_t 
*table,
   gal_list_str_add(&comments, tmp, 0);
 
   if(strcmp(fix, "fits"))  /* The intro info will be in FITS files anyway.*/
-    gal_table_comments_add_intro(&comments, PROGRAM_STRING, &p->rawtime);
+    gal_table_comments_add_intro(&comments, PROGRAM_NAME, &p->rawtime);
 
 
   /* Write the table. */
@@ -704,7 +704,7 @@ print_input_info(struct statisticsparams *p)
   char *str, *name, *col=NULL;
 
   /* Print the program name and version. */
-  printf("%s\n", PROGRAM_STRING);
+  printf("%s\n", PROGRAM_NAME);
 
   /* Print the input information, if the input was a table, we also need to
      give the column information. When the column has a name, it will be
diff --git a/bin/warp/warp.c b/bin/warp/warp.c
index 23fa4ee..b22e63f 100644
--- a/bin/warp/warp.c
+++ b/bin/warp/warp.c
@@ -469,7 +469,7 @@ correct_wcs_save_output(struct warpparams *p)
   /* Save the output into the proper type and write it. */
   if(p->cp.type!=p->output->type)
     p->output=gal_data_copy_to_new_type_free(p->output, p->cp.type);
-  gal_fits_img_write(p->output, p->cp.output, headers, PROGRAM_STRING);
+  gal_fits_img_write(p->output, p->cp.output, headers, PROGRAM_NAME);
 }