[gnuastro-commits] master 15c05ea: Wrong option name fixed in NoiseChisel

[Mohammad Akhlaghi]

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

    Wrong option name fixed in NoiseChisel
    
    Initially, I had set the name of the new `--convolvedname' option to
    `--convolved'. Later during its development, I changed it to its final name
    to be similar to the other file name options. But in a few places (that
    were not significant to the build), the old name remained. With this
    commit, they are now also set to the final name.
---
 bin/noisechisel/args.h |  2 +-
 bin/noisechisel/ui.c   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/noisechisel/args.h b/bin/noisechisel/args.h
index e44efbd..aee682f 100644
--- a/bin/noisechisel/args.h
+++ b/bin/noisechisel/args.h
@@ -60,7 +60,7 @@ struct argp_option program_options[] =
       GAL_OPTIONS_NOT_SET
     },
     {
-      "convolved",
+      "convolvedname",
       UI_KEY_CONVOLVED,
       "STR",
       0,
diff --git a/bin/noisechisel/ui.c b/bin/noisechisel/ui.c
index fb9c423..ba68215 100644
--- a/bin/noisechisel/ui.c
+++ b/bin/noisechisel/ui.c
@@ -218,8 +218,9 @@ ui_read_check_only_options(struct noisechiselparams *p)
      mandatory. */
   if(p->convolvedname && p->convolvedhdu==NULL)
     error(EXIT_FAILURE, 0, "no value given to `--convolvedhdu'. When the "
-          "`--convolved' option is called to specify a convolved image and "
-          "avoid convolution, it is mandatory to also specify a HDU for it");
+          "`--convolvedname' option is called (to specify a convolved image "
+          "and avoid convolution) it is mandatory to also specify a HDU "
+          "for it");
 
   /* Make sure the connectivities have the correct values. */
   if(p->erodengb!=4 && p->erodengb!=8)
@@ -605,9 +606,10 @@ ui_preparations(struct noisechiselparams *p)
 
       /* Make sure the convolved image is the same size as the input. */
       if( gal_data_dsize_is_different(p->input, p->conv) )
-        error(EXIT_FAILURE, 0, "%s (hdu %s) which was given to `--convolved' "
-              "is not the same size as the input: %s (hdu: %s)",
-              p->convolvedname, p->convolvedhdu, p->inputname, p->cp.hdu);
+        error(EXIT_FAILURE, 0, "%s (hdu %s), given to `--convolvedname' "
+              "and `--convolvehdu', is not the same size as NoiseChisel's "
+              "input: %s (hdu: %s)", p->convolvedname, p->convolvedhdu,
+              p->inputname, p->cp.hdu);
     }
   else
     ui_prepare_kernel(p);