[gnuastro-commits] master 62c413ba: MakeCatalog: dashes replaced with underscore in some column names

[Mohammad Akhlaghi]

branch: master
commit 62c413ba9fe8b6c49e80b9d0994e5af6086aa81e
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    MakeCatalog: dashes replaced with underscore in some column names
    
    Until now, the names of some of the MakeCatalog measurement columns used a
    dash ('-') instead of an underscore ('_')! However, all the other
    multi-word column names contain an underscore. Also, the column name of
    '--sigclip-mean-sb-delta' didn't match the option name!
    
    With this commit, the problematic column names have been corrected in the
    output table.
    
    This bug was reported by Raul Infante-Sainz.
    
    This fixes bug #64146.
---
 NEWS                    | 18 ++++++++++++++++++
 bin/mkcatalog/columns.c | 14 +++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index e52073f5..0f23ee0c 100644
--- a/NEWS
+++ b/NEWS
@@ -12,9 +12,27 @@ See the end of the file for license conditions.
 
 ** Changed features
 
+  MakeCatalog:
+  - The dash in the column names of the following measurement names has
+    been replced by underscore to conform with the general stardard of
+    using underscores between words in column names (reported by Raul
+    Infante-Sainz). Also, in the case of '--sigclip-mean-sb-delta' the
+    column name didn't correspond to the option name.
+    --------------------------------------------------------------
+    Option                  Column name            Old column name
+    --------------------------------------------------------------
+    --sigclip-mean          SIGCLIP_MEAN           SIGCLIP-MEAN
+    --sigclip-median        SIGCLIP_MEDIAN         SIGCLIP-MEDIAN
+    --sigclip-number        SIGCLIP_NUMBER         SIGCLIP-NUMBER
+    --sigclip-std           SIGCLIP_STD            SIGCLIP-STD
+    --sigclip-mean-sb       SIGCLIP_MEAN_SB        SIGCLIP-MEAN-SB
+    --sigclip-mean-sb-delta SIGCLIP_MEAN_SB_DELTA  SIGCLIP-MEAN-SB-ERR
+
 ** Bugs fixed
   bug #64138: Arithmetic's mknoise-poisson only using first pixel value.
               Reported by Irene Pintos Castro.
+  bug #64146: SIGCLIP column names contain dashes instead of
+              underlines. Reported by Raul Infante-Sainz.
   bug #64148: MakeCatalog crash when using the options '--std' and/or
               'sigclip-mean-sb-delta' for clumps catalog. Reported by Raul
               Infante-Sainz.
diff --git a/bin/mkcatalog/columns.c b/bin/mkcatalog/columns.c
index 86e8915d..d6a576da 100644
--- a/bin/mkcatalog/columns.c
+++ b/bin/mkcatalog/columns.c
@@ -1331,7 +1331,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPNUMBER:
-          name           = "SIGCLIP-NUMBER";
+          name           = "SIGCLIP_NUMBER";
           unit           = "counter";
           ocomment       = "Number of pixels in Sigma-clipped object";
           ccomment       = "Number of pixels in Sigma-clipped clump.";
@@ -1347,7 +1347,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPMEDIAN:
-          name           = "SIGCLIP-MEDIAN";
+          name           = "SIGCLIP_MEDIAN";
           unit           = MKCATALOG_NO_UNIT;
           ocomment       = "Sigma-clipped median of object pixels.";
           ccomment       = "Sigma-clipped median of clump pixels.";
@@ -1363,7 +1363,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPMEAN:
-          name           = "SIGCLIP-MEAN";
+          name           = "SIGCLIP_MEAN";
           unit           = MKCATALOG_NO_UNIT;
           ocomment       = "Sigma-clipped mean of object pixels.";
           ccomment       = "Sigma-clipped mean of clump pixels.";
@@ -1379,7 +1379,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPSTD:
-          name           = "SIGCLIP-STD";
+          name           = "SIGCLIP_STD";
           unit           = MKCATALOG_NO_UNIT;
           ocomment       = "Sigma-clipped standard deviation of object "
                             "pixels.";
@@ -1397,7 +1397,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPMEANSB:
-          name           = "SIGCLIP-MEAN-SB";
+          name           = "SIGCLIP_MEAN_SB";
           unit           = "mag/arcsec^2";
           ocomment       = "Surface brightness (over one pixel) of "
                            "sig-clip mean of pixels.";
@@ -1414,7 +1414,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPMEANSBDELTA:
-          name           = "SIGCLIP-MEAN-SB-ERR";
+          name           = "SIGCLIP_MEAN_SB_DELTA";
           unit           = "mag/arcsec^2";
           ocomment       = "Error in SB (over one pixel) of "
                            "sig-clip mean of pixels.";
@@ -1432,7 +1432,7 @@ columns_define_alloc(struct mkcatalogparams *p)
           break;
 
         case UI_KEY_SIGCLIPSTDSB:
-          name           = "SIGCLIP-STD-SB";
+          name           = "SIGCLIP_STD_SB";
           unit           = "mag/arcsec^2";
           ocomment       = "Surface brightness of sigma-clipped "
                            "standard deviation.";