[gnuastro-commits] master 0eaf0dc 091/113: Imported recent work in master, conflicts fixed

[Mohammad Akhlaghi]

branch: master
commit 0eaf0dc3f736e7bf04bc6eecb31286019421f76e
Merge: 1f9d941 13b05cf
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Imported recent work in master, conflicts fixed
    
    There were two conflicts:
    
    1) There was a small conflict in the `EXTRA_DIST' files of
    `tests/Makefile.am': to include the new `statistics/stdin-input.txt', while
    keeping the 3d branch's `mkprof/3d-cat.txt'.
    
    2) Changing of dimensionality checking in `bin/mkprof/ui.c'.
---
 NEWS                         |   3 +-
 THANKS                       |   1 +
 bin/mkprof/ui.c              | 147 ++++++++++++++++++++++++-------------------
 bin/statistics/ui.c          |   2 +-
 configure.ac                 |   4 ++
 developer-build              |  46 +++++++++-----
 doc/announce-acknowledge.txt |   2 +
 doc/gnuastro.texi            | 130 ++++++++++++++++++++++++--------------
 lib/options.c                |  16 +++--
 tests/Makefile.am            |   2 +-
 10 files changed, 216 insertions(+), 137 deletions(-)

diff --git a/NEWS b/NEWS
index 1d59fe6..cb24499 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
    - Standard input (for example from pipes) is now available to feed input
      to all programs that accept plain text input (ConvertType, Match,
      MakeProfiles, Statistics, Table).
+   - Updated acknowledgement statement (output of `--cite' option).
 
   Arithmetic:
     --onedasimage: write output as an image if it has one dimension, not table.
@@ -127,7 +128,7 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
   bug #54579: NoiseChisel pseudo-detection failure when dataset is negative.
   bug #54782: Segment's check image not removing sky clumps some tiles.
   bug #54810: Arithmetic crash when previously named operand renamed.
-
+  bug #55025: MakeCatalog's `--prepforconv' option being ignored.
 
 
 
diff --git a/THANKS b/THANKS
index 6a6ea2a..a0b6ef3 100644
--- a/THANKS
+++ b/THANKS
@@ -41,6 +41,7 @@ support in Gnuastro. The list is ordered alphabetically (by 
family name).
     Lee Kelvin                           l.s.kelvin@ljmu.ac.uk
     Brandon Kelly                        b.k.kelly@2017.ljmu.ac.uk
     Mohammad-Reza Khellat                moha.khe@gmail.com
+    Johan Knapen                         jhk@iac.es
     Geoffry Krouchi                      geoffrey.krouchi@etu.univ-lyon1.fr
     Floriane Leclercq                    floriane.leclercq@univ-lyon1.fr
     Alan Lefor                           alefor@astr.tohoku.ac.jp
diff --git a/bin/mkprof/ui.c b/bin/mkprof/ui.c
index 2ffaab6..f5da30e 100644
--- a/bin/mkprof/ui.c
+++ b/bin/mkprof/ui.c
@@ -1312,7 +1312,6 @@ static void
 ui_prepare_canvas(struct mkprofparams *p)
 {
   float *f, *ff;
-  gal_data_t *keysll;
   long width[3]={1,1,1};
   int status=0, setshift=0;
   double truncr, semiaxes[3], euler_deg[3];
@@ -1322,52 +1321,13 @@ ui_prepare_canvas(struct mkprofparams *p)
      image to build the profiles over. */
   if(p->backname)
     {
-      /* Make sure the kernel option is not called. */
-      if(p->kernel)
-        error(EXIT_FAILURE, 0, "the `--kernel' and `--background' options "
-              "cannot be called together");
-
-      /* Small sanity check. */
-      if(p->backhdu==NULL)
-        error(EXIT_FAILURE, 0, "no hdu specified for the background image "
-              "%s. Please run again `--backhdu' option", p->backname);
-
       /* Read in the background image and its coordinates, note that when
          no merged image is desired, we just need the WCS information of
          the background image and the number of its dimensions. So
          `ndim==0' and what `dsize' points to is irrelevant. */
-      if(p->nomerged)
-        {
-          /* Get the number of the background image's dimensions. */
-          keysll=gal_data_array_calloc(1);
-          keysll->name="NAXIS";   keysll->type=GAL_TYPE_SIZE_T;
-          gal_fits_key_read(p->backname, p->backhdu, keysll, 0, 0);
-          p->ndim = *(size_t *)(keysll->array);
-          keysll->name=NULL;
-          gal_data_array_free(keysll, 1, 1);
-
-          /* Read the WCS structure of the background image. */
-          p->wcs=gal_wcs_read(p->backname, p->backhdu, 0, 0, &p->nwcs);
-        }
-      else
+      p->wcs=gal_wcs_read(p->backname, p->backhdu, 0, 0, &p->nwcs);
+      if(p->nomerged==0)
         {
-          /* Read the image. */
-          p->out=gal_array_read_one_ch_to_type(p->backname, p->backhdu,
-                                               NULL, GAL_TYPE_FLOAT32,
-                                               p->cp.minmapsize);
-          p->out->wcs=gal_wcs_read(p->backname, p->backhdu, 0, 0,
-                                   &p->out->nwcs);
-
-          /* Put the WCS structure and number of dimensions in the
-             MakeProfiles's main structure for generality. The WCS
-             structure will be put back in the end when writing. */
-          p->wcs=p->out->wcs;
-          p->nwcs=p->out->nwcs;
-          p->ndim=p->out->ndim;
-          p->out->wcs=NULL;
-          p->out->nwcs=0;
-
-
           /* If p->dsize was given as an option, free it. */
           if( p->dsize ) free(p->dsize);
 
@@ -1381,14 +1341,6 @@ ui_prepare_canvas(struct mkprofparams *p)
             {ff=(f=p->out->array)+p->out->size; do *f++=0.0f; while(f<ff);}
         }
 
-
-      /* Currently, things are only implemented for 2D. */
-      if(p->ndim!=2 && p->ndim!=3)
-        error(EXIT_FAILURE, 0, "%s (hdu %s) has %zu dimensions. Currently "
-              "only a 2 or 3 dimensional background image is acceptable",
-              p->backname, p->backhdu, p->ndim);
-
-
       /* When a background image is specified, oversample must be 1 and
          there is no shifts. */
       p->oversample=1;
@@ -1398,16 +1350,6 @@ ui_prepare_canvas(struct mkprofparams *p)
     }
   else
     {
-      /* Get the number of dimensions. */
-      ndim_counter=0;
-      for(i=0;p->dsize[i]!=GAL_BLANK_SIZE_T;++i) ++ndim_counter;
-      p->ndim=ndim_counter;
-
-      /* Currently, things are only implemented for 2D or 3D. */
-      if(p->ndim!=2 && p->ndim!=3)
-        error(EXIT_FAILURE, 0, "%zu numbers given to `--naxis', only 2 or 3 "
-              "values may be given", p->ndim);
-
       /* If any of the shift elements are zero, the others should be too!*/
       if(p->shift && p->shift[0] && p->shift[1])
         {
@@ -1667,8 +1609,90 @@ ui_make_log(struct mkprofparams *p)
 
 
 static void
+ui_read_ndim(struct mkprofparams *p)
+{
+  gal_data_t *keysll;
+  size_t i, ndim_counter;
+
+  if(p->kernel)
+    {
+      /* The kernel's dimensionality is fixed. */
+      p->ndim=p->kernel->flag;
+
+      /* Make sure the kernel and background are not given together. */
+      if(p->backname)
+        error(EXIT_FAILURE, 0, "the `--kernel' and `--background' options "
+              "cannot be called together");
+    }
+  else
+    {
+      /* Packground image is given. */
+      if(p->backname)
+        {
+          /* Small sanity check. */
+          if(p->backhdu==NULL)
+            error(EXIT_FAILURE, 0, "no hdu specified for the background "
+                  "image %s. Please run again `--backhdu' option",
+                  p->backname);
+
+          /* If `--nomerged' is given, we don't actually need to load the
+             image, we just need its WCS later. */
+          if(p->nomerged)
+            {
+              /* Get the number of the background image's dimensions. */
+              keysll=gal_data_array_calloc(1);
+              keysll->name="NAXIS";   keysll->type=GAL_TYPE_SIZE_T;
+              gal_fits_key_read(p->backname, p->backhdu, keysll, 0, 0);
+              p->ndim = *(size_t *)(keysll->array);
+              keysll->name=NULL;
+              gal_data_array_free(keysll, 1, 1);
+            }
+          else
+            {
+              /* Read the image. */
+              p->out=gal_array_read_one_ch_to_type(p->backname, p->backhdu,
+                                                   NULL, GAL_TYPE_FLOAT32,
+                                                   p->cp.minmapsize);
+              p->ndim=p->out->ndim;
+            }
+
+          /* Make sure the dimensionality is supported. */
+          if(p->ndim!=2 && p->ndim!=3)
+            error(EXIT_FAILURE, 0, "%s (hdu %s) has %zu dimensions. Currently "
+                  "only 2 or 3 dimensional outputs can be produced",
+                  p->backname, p->backhdu, p->ndim);
+        }
+      else
+        {
+          /* Get the number of dimensions from the user's options. */
+          ndim_counter=0;
+          for(i=0;p->dsize[i]!=GAL_BLANK_SIZE_T;++i) ++ndim_counter;
+          p->ndim=ndim_counter;
+
+          /* Make sure the dimensionality is supported. */
+          if(p->ndim!=2 && p->ndim!=3)
+            error(EXIT_FAILURE, 0, "%zu values given to `--mergedsize'. "
+                  "Currently only 2 or 3 dimensional outputs can be produced",
+                  p->ndim);
+        }
+    }
+}
+
+
+
+
+
+static void
 ui_preparations(struct mkprofparams *p)
 {
+  /* Set the output dimensionality (necessary to know which columns to
+     use). */
+  ui_read_ndim(p);
+
+  /* Read in all the columns (necessary for `--prepforconf' when we want to
+     build the profiles). */
+  ui_prepare_columns(p);
+
   /* If the kernel option was given, some parameters need to be
      over-written: */
   if(p->kernel)
@@ -1686,9 +1710,6 @@ ui_preparations(struct mkprofparams *p)
   else
     ui_prepare_canvas(p);
 
-  /* Read in all the columns. */
-  ui_prepare_columns(p);
-
   /* Read the (possible) RA/Dec inputs into X and Y for the builder.*/
   if(p->wcs)
     ui_finalize_coordinates(p);
diff --git a/bin/statistics/ui.c b/bin/statistics/ui.c
index 3cedec1..295753e 100644
--- a/bin/statistics/ui.c
+++ b/bin/statistics/ui.c
@@ -757,7 +757,7 @@ ui_read_columns(struct statisticsparams *p)
   /* If the input was from standard input, we can actually write this into
      it (for future reporting). */
   if(p->inputname==NULL)
-    gal_checkset_allocate_copy("Standard input", &p->inputname);
+    gal_checkset_allocate_copy("statistics", &p->inputname);
 
   /* Put the columns into the proper gal_data_t. */
   size=cols->size;
diff --git a/configure.ac b/configure.ac
index f8e9530..b2ca04e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,6 +274,10 @@ AC_SEARCH_LIBS([gsl_integration_qng], [gsl], [],
 # doesn't exist on the system, then CFITSIO won't link with it and there is
 # no problem for Gnuastro either. So there is no need to stop the configure
 # script if libcurl isn't found.
+#
+# For static builds, libcurl depends on linking with zlib. So we'll need to
+# also search for that.
+AC_SEARCH_LIBS([deflateInit_], [z], [], [])
 AC_SEARCH_LIBS([curl_global_init], [curl], [], [])
 AC_SEARCH_LIBS([ffopen], [cfitsio], [],
                [missing_mandatory=yes; has_cfitsio=no])
diff --git a/developer-build b/developer-build
index 220ea47..3253c77 100755
--- a/developer-build
+++ b/developer-build
@@ -154,7 +154,7 @@ Options:
                           libraries.
                           Current status: $debug_status
 
- -v, --valgrind           Build with `--enable-check-with-valgrind'.
+ -v, --valgrind           Build with '--enable-check-with-valgrind'.
                           Current status: $valgrind_status
 
  -j, --jobs INT           Number of threads to use in 'make'.
@@ -316,15 +316,6 @@ fi
 
 
 
-# If reconfiguration was requested, do it.
-if [ $reconf = 1 ]; then
-    autoreconf -f
-fi
-
-
-
-
-
 # Keep the address of this source directory (where this script is being run
 # from) which we will need later.
 srcdir=$(pwd)
@@ -347,7 +338,7 @@ fi
 
 
 
-# Make the build directory in tmpfs (if it doesn't already exist).
+# Make the build directory (if it doesn't already exist).
 if [ ! -d $build_dir ]; then
     mkdir $build_dir
 fi
@@ -356,6 +347,15 @@ fi
 
 
 
+# If reconfiguration was requested, do it.
+if [ $reconf = 1 ]; then
+    autoreconf -f
+fi
+
+
+
+
+
 # Make a symbolic link to the tmpfs build directory for users to easily
 # access the built files and also follow the progress. We are first
 # deleting any existing symbolic link and remaking it since the possible
@@ -448,16 +448,28 @@ fi
 
 # Upload the tarball to the requested server.
 if [ x$upload = x1 ]; then
-
     # Get the base package name, and use it to make a generic tarball
     # name. Note that with the `--upload' option, `--dist' is also
     # activated, so the tarball is already built and ready by this
     # step.
-    base=$(ls *.tar.lz | sed -e's/-/ /' | awk '{print $1}')
-    mv *.tar.lz $base"-latest.tar.lz"
-
-    # Copy the files to the given URL (must include folders).
-    scp $base"-latest.tar.lz" $base.pdf $url
+    tarball=$(ls *.tar.lz)
+    base=$(echo $tarball | sed -e's/-/ /' | awk '{print $1}')
+
+    # File names:
+    pdf=$base.pdf
+    latest=$base"-latest.tar.lz"
+
+    # Copy the files to the subdirectories of the given URL (must include
+    # folders).
+    scp $tarball $url/src
+    scp $pdf     $url/pdf
+
+    # Make the symbolic links on the server.
+    server=$(echo "$url" | sed -e's/:/ /' | awk '{print $1}')
+    sdir=$(echo "$url" | sed -e's/:/ /' | awk '{print $2}')
+    ssh $server 'cd '"$sdir"' && rm -f '$latest' && ln -s src/'$tarball 
$latest ' && exit'
+    echo; echo "On $url:"
+    echo "   $latest -> src/$tarball"
 fi
 
 
diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index 815b582..cffd52c 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -1,7 +1,9 @@
 Alphabetically ordered list to acknowledge in the next release.
 
+Fernando Buitrago
 Pierre-Alain Duc
 Gaspar Galaz
+Johan Knapen
 Mamta Pommier
 Michael Stein
 Ignacio Trujillo
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index ed25a44..04dc62b 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -1688,24 +1688,44 @@ character, enabling you to use multiple lines to write 
your commands.
 @node Acknowledgments,  , Conventions, Introduction
 @section Acknowledgments
 
-The list of Gnuastro authors is available at the start of this book and the
-@file{AUTHORS} file in the source code. Here the authors wish to gratefully
-acknowledge the help and support they received from other people and
-institutions who had an indirect (not committed in the version controlled
-history) role in Gnuastro. The plain text file @file{THANKS} which is
-distributed along with the source code also contains this list.
-
-The Japanese Ministry of Science and Technology (MEXT) scholarship for
-Mohammad Akhlaghi's Masters and PhD period in Tohoku University
-Astronomical Institute had an instrumental role in the long term learning
-and planning that made the idea of Gnuastro possible. The very critical
-view points of Professor Takashi Ichikawa (Mohammad's adviser) were also
-instrumental in the initial ideas and creation of Gnuastro. The European
-Research Council (ERC) advanced grant 339659-MUSICOS (Principal
-investigator: Roland Bacon) was vital in the growth and expansion of
-Gnuastro, enabling a thorough re-write of the core functionality of all
-libraries and programs, turning Gnuastro into the large collection of
-generic programs and libraries it is today.
+Gnuastro would not have been possible without scholarships and grants from
+several funding institutions. We thus ask that if you used Gnuastro in any
+of your papers/reports, please add the proper citation and acknowledge this
+instrumental support. For details of which papers to cite (may be different
+for different programs) and get the acknowledgement statement to include in
+your paper, please run the relevant programs with the common
+@option{--cite} option like the example commands below (for more on
+@option{--cite}, please see @ref{Operating mode options}).
+
+@example
+$ astnoisechisel --cite
+$ astmkcatalog --cite
+@end example
+
+Here, we'll acknowledge all the institutions (and their grants) along with
+the people who helped make Gnuastro possible. The full list of Gnuastro
+authors is available at the start of this book and the @file{AUTHORS} file
+in the source code (both are generated automatically from the version
+controlled history). The plain text file @file{THANKS}, which is also
+distributed along with the source code, contains the list of people and
+institutions who played an indirect role in Gnuastro (not committed any
+code in the Gnuastro version controlled history).
+
+The Japanese Ministry of Education, Culture, Sports, Science, and
+Technology (MEXT) scholarship for Mohammad Akhlaghi's Masters and PhD
+degree in Tohoku University Astronomical Institute had an instrumental role
+in the long term learning and planning that made the idea of Gnuastro
+possible. The very critical view points of Professor Takashi Ichikawa
+(Mohammad's adviser) were also instrumental in the initial ideas and
+creation of Gnuastro. Afterwards, the European Research Council (ERC)
+advanced grant 339659-MUSICOS (Principal investigator: Roland Bacon) was
+vital in the growth and expansion of Gnuastro. Working with Roland at the
+Centre de Recherche Astrophysique de Lyon (CRAL), enabled a thorough
+re-write of the core functionality of all libraries and programs, turning
+Gnuastro into the large collection of generic programs and libraries it is
+today.  Work on improving Gnuastro and making it mature is now continuing
+primarily in the Instituto de Astrofisica de Canarias (IAC) and in
+particular in collaboration with Johan Knapen and Ignacio Trujillo.
 
 @c To the developers: please keep this in the same order as the THANKS file
 @c (alphabetical, except for the names in the paragraph above).
@@ -1731,14 +1751,17 @@ important) technical questions.
 
 All work on Gnuastro has been voluntary, but the authors are most grateful
 to the following institutions (in chronological order) for hosting us in
-our research:
+our research. Where necessary, these institutions have disclaimed any
+ownership of the parts of Gnuastro that were developed there, thus insuring
+the freedom of Gnuastro for the future (see @ref{Copyright assignment}). We
+highly appreciate their support for free software, and thus free science,
+and therefore a free society.
 
 @quotation
-Ministry of education, culture, sports, science and technology (MEXT), Japan.@*
 Tohoku University Astronomical Institute, Sendai, Japan.@*
 University of Salento, Lecce, Italy.@*
-Centre national de la recherche scientifique (CNRS), France.@*
-Centre de Recherche Astrophysique de Lyon, University of Lyon 1, France.@*
+Centre de Recherche Astrophysique de Lyon (CRAL), Lyon, France.@*
+Instituto de Astrofisica de Canarias (IAC), Tenerife, Spain.@*
 @end quotation
 
 
@@ -3386,13 +3409,16 @@ $ astnoisechisel flat-ir/xdf-f160w.fits 
--output=nc/xdf-f160w.fits
 $ astnoisechisel flat-ir/xdf-f105w.fits --output=nc/xdf-f105w.fits
 @end example
 
-Before continuing with the higher-level processing of this dataset, we'll
-pause to use NoiseChisel's multi-extension output for showing how the Fits
-program can make it easy to work with this wonderful data container (see
-@ref{Fits}). Let's say you need to copy a HDU/extension from one FITS file
-to another. Try the command below to make an @file{objects.fits} file that
-contains only NoiseChisel's binary detection map. There are similar options
-to conveniently cut or delete HDUs from a FITS file also.
+Before continuing with the higher-level processing of this dataset, let's
+pause to use NoiseChisel's multi-extension output as a demonstration for
+working with FITS extensions using Gnuastro's Fits program (see @ref{Fits}.
+
+Let's say you need to copy a HDU/extension (image or table) from one FITS
+file to another. After the command below, @file{objects.fits} file will
+contain only one extension: a copy of NoiseChisel's binary detection
+map. There are similar options to conveniently cut (@option{--cut}, copy,
+then remove from the input) or delete (@option{--remove}) HDUs from a FITS
+file also.
 
 @example
 $ astfits nc/xdf-f160w.fits --copy=DETECTIONS -odetections.fits
@@ -3460,10 +3486,10 @@ more.
 
 Having localized the regions of interest in the dataset, we are ready to do
 measurements on them with @ref{MakeCatalog}. Besides the IDs, we want to
-measure the Right Ascension (with @option{--ra}), Declination
-(@option{--dec}, magnitude (@option{--magnitude} and signal-to-noise ratio
-(@option{--sn}) of the objects and clumps. The following command will make
-these measurements on Segment's F160W output:
+measure (in this order) the Right Ascension (with @option{--ra}),
+Declination (@option{--dec}), magnitude (@option{--magnitude}), and
+signal-to-noise ratio (@option{--sn}) of the objects and clumps. The
+following command will make these measurements on Segment's F160W output:
 
 @c Keep the `--zeropoint' on a single line, because later, we'll add
 @c `--valuesfile' in that line also, and it would be more clear if both
@@ -6834,12 +6860,14 @@ or sending to colleagues who don't use Git for an easy 
build and manual.
 
 @item -u STR
 @item --upload STR
-Activate the @option{--dist} (@option{-D}) option, but also rename the
-tarball suffix to @file{-latest.tar.lz} (instead of the version
-number). Then use secure copy (@command{scp}, part of the SSH tools) to
-copy the tarball and PDF to the server and directory specified in the value
-to this option. For example @command{--upload my-server:dir}, will copy the
-two files to the @file{dir} directory of @code{my-server} server.
+Activate the @option{--dist} (@option{-D}) option, then use secure copy
+(@command{scp}, part of the SSH tools) to copy the tarball and PDF to the
+@file{src} and @file{pdf} subdirectories of the specified server and its
+directory (value to this option). For example @command{--upload
+my-server:dir}, will copy the tarball in the @file{dir/src}, and the PDF
+manual in @file{dir/pdf} of @code{my-server} server. It will then make a
+symbolic link in the top server directory to the tarball that is called
+@file{gnuastro-latest.tar.lz}.
 
 @item -p
 @itemx --publish
@@ -7831,20 +7859,26 @@ done very fast (depending on the properties of your 
input) disabling these
 reports will also decrease running time.
 
 @item --cite
-Print the Bib@TeX{} entry for Gnuastro and the particular program (if
-that program comes with a separate paper) and abort. Citations are
-vital for the continued work on Gnuastro. Gnuastro started and is
-continued based on separate research projects. So if you find any of
-the tools offered in Gnuastro to be useful in your research, please
-use the output of this command to cite the program and Gnuastro in
-your research paper. Thank you.
+Print all necessary information to cite and acknowledge Gnuastro in your
+published papers. With this option, the programs will print the Bib@TeX{}
+entry to include in your paper for Gnuastro in general, and the particular
+program's paper (if that program comes with a separate paper). It will also
+print the necessary acknowledgement statement to add in the respective
+section of your paper and it will abort. For a more complete explanation,
+please see @ref{Acknowledgments}.
+
+Citations and acknowledgements are vital for the continued work on
+Gnuastro. Gnuastro started, and is continued, based on separate research
+projects. So if you find any of the tools offered in Gnuastro to be useful
+in your research, please use the output of this command to cite and
+acknowledge the program (and Gnuastro) in your research paper. Thank you.
 
 Gnuastro is still new, there is no separate paper only devoted to Gnuastro
 yet. Therefore currently the paper to cite for Gnuastro is the paper for
 NoiseChisel which is the first published paper introducing Gnuastro to the
 astronomical community. Upon reaching a certain point, a paper completely
-devoted to Gnuastro will be published, see @ref{GNU Astronomy Utilities
-1.0}.
+devoted to describing Gnuastro's many functionalities will be published,
+see @ref{GNU Astronomy Utilities 1.0}.
 
 @item -P
 @itemx --printparams
diff --git a/lib/options.c b/lib/options.c
index 1f4ceaa..a0f768f 100644
--- a/lib/options.c
+++ b/lib/options.c
@@ -297,12 +297,16 @@ gal_options_print_citation(struct argp_option *option, 
char *arg,
                "Acknowledgement\n"
                "---------------\n"
                "This work was partly done using GNU Astronomy Utilities "
-               "(Gnuastro, ascl.net/1801.009) version %s. Gnuastro is a "
-               "generic package for astronomical data manipulation and "
-               "analysis which was initially created and developed for "
-               "research funded by the Monbukagakusho (Japanese "
-               "government) scholarship and European Research Council "
-               "(ERC) advanced grant 339659-MUSICOS.", PACKAGE_VERSION)<0 )
+               "(Gnuastro, ascl.net/1801.009) version %s. Work on Gnuastro "
+               "has been funded by the Japanese Ministry of Education, "
+               "Culture, Sports, Science, and Technology (MEXT) scholarship "
+               "and its Grant-in-Aid for Scientific Research (21244012, "
+               "24253003), the European Research Council (ERC) advanced "
+               "grant 339659-MUSICOS, European Union’s Horizon 2020 research "
+               "and innovation programme under Marie Sklodowska-Curie grant "
+               "agreement No 721463 to the SUNDIAL ITN, and from the Spanish "
+               "Ministry of Economy and Competitiveness (MINECO) under grant "
+               "number AYA2016-76219-P. ", PACKAGE_VERSION)<0 )
     error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   printf("%s\n", gnuastro_acknowledgement);
   free(gnuastro_acknowledgement);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35b37d7..099a215 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -263,7 +263,7 @@ EXTRA_DIST = $(TESTS) during-dev.sh buildprog/simpleio.c 
crop/cat.txt     \
   mkprof/3d-cat.txt match/positions-1.txt match/positions-2.txt           \
   mkprof/mkprofcat1.txt mkprof/ellipticalmasks.txt mkprof/clearcanvas.txt \
   mkprof/mkprofcat2.txt mkprof/mkprofcat3.txt mkprof/mkprofcat4.txt       \
-  mkprof/radeccat.txt table/table.txt
+  mkprof/radeccat.txt statistics/stdin-input.txt table/table.txt