[gnuastro-commits] master c238a9d8: MakeCatalog: --std and --sigclip-mean-sb-delta working for clumps

[Mohammad Akhlaghi]

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

    MakeCatalog: --std and --sigclip-mean-sb-delta working for clumps
    
    Until now, these two options would produce errors when MakeCatalog was run
    with the --clumpscat option (to generate a clump catalog).
    
    With this commit, their respective checks have been added to the
    MakeCatalog source, so they can be properly accounted for and the final
    catalog can be created.
    
    This bug was reported by Raul Infante-Sainz.
    
    This fixes bug #64146.
---
 NEWS                         | 3 +++
 bin/mkcatalog/columns.c      | 5 +++++
 bin/mkcatalog/ui.c           | 1 +
 doc/announce-acknowledge.txt | 1 +
 4 files changed, 10 insertions(+)

diff --git a/NEWS b/NEWS
index d4a98199..e52073f5 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ See the end of the file for license conditions.
 ** Bugs fixed
   bug #64138: Arithmetic's mknoise-poisson only using first pixel value.
               Reported by Irene Pintos Castro.
+  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 f1086e15..86e8915d 100644
--- a/bin/mkcatalog/columns.c
+++ b/bin/mkcatalog/columns.c
@@ -3318,6 +3318,11 @@ columns_fill(struct mkcatalog_passparams *pp)
             ((float *)colarr)[cind] = MKC_SB(ci[ CCOL_SIGCLIPMEAN ], 1);
             break;
 
+          case UI_KEY_SIGCLIPMEANSBDELTA:
+            ((float *)colarr)[cind] = SCLIP_SBERR(ci[ CCOL_SIGCLIPMEAN ],
+                                                  ci[ CCOL_SIGCLIPSTD ]);
+            break;
+
           case UI_KEY_SIGCLIPSTDSB:
             ((float *)colarr)[cind] = MKC_SB(ci[ CCOL_SIGCLIPSTD ], 1);
             break;
diff --git a/bin/mkcatalog/ui.c b/bin/mkcatalog/ui.c
index b08c47c0..33a574dd 100644
--- a/bin/mkcatalog/ui.c
+++ b/bin/mkcatalog/ui.c
@@ -1111,6 +1111,7 @@ ui_necessary_inputs(struct mkcatalogparams *p, int 
*values, int *sky,
           case CCOL_NUM:              *values        = 1;          break;
           case CCOL_NUMXY:            *values        = 1;          break;
           case CCOL_SUM:              *values        = 1;          break;
+          case CCOL_SUMP2:            *values        = 1;          break;
           case CCOL_SUM_VAR:          *values = *std = 1;          break;
           case CCOL_SUM_VAR_NUM:      *values = *std = 1;          break;
           case CCOL_MEDIAN:           *values        = 1;          break;
diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index f31500d7..1224e75c 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -1,6 +1,7 @@
 Alphabetically ordered list to acknowledge in the next release.
 
 Irene Pintos Castro
+Raul Infante-Sainz