Imported recent work in Maneage, minor conflicts fixed

Some minor conflicts that came up during the merge were fixed.

5 files changed, 5 insertions, 133 deletions

diff --git a/reproduce/analysis/config/gnuastro/astbuildprog.conf b/reproduce/analysis/config/gnuastro/astbuildprog.conf
deleted file mode 100644
index 7adb4d1..0000000
--- a/reproduce/analysis/config/gnuastro/astbuildprog.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# BuildProgram's configuration file depends on the build and is installed
-# along with the rest of Gnuastro. So we'll set any specific configuration
-# we want here, then import those.
-#
-# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice and
-# this notice are preserved.  This file is offered as-is, without any
-# warranty.
-
-# To keep the program's compiled excutable file, comment this line.
-deletecompiled 1
-
-# Import the built configuration file
-config .local/etc/astbuildprog.conf
\ No newline at end of file
diff --git a/reproduce/analysis/config/gnuastro/astconvertt.conf b/reproduce/analysis/config/gnuastro/astconvertt.conf
deleted file mode 100644
index 770ac39..0000000
--- a/reproduce/analysis/config/gnuastro/astconvertt.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# Default parameters (System) for ConvertType.
-# ConvertType is part of GNU Astronomy Utitlies.
-#
-# Use the long option name of each parameter followed by a value. The name
-# and value should be separated by atleast one white-space character (for
-# example ` '[space], or tab). Lines starting with `#' are ignored.
-#
-# For more information, please run these commands:
-#
-#  $ astconvertt --help                  # Full list of options, short doc.
-#  $ astconvertt -P                      # Print all options and used values.
-#  $ info astconvertt                    # All options and input/output.
-#  $ info gnuastro "Configuration files" # How to use configuration files.
-#
-# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice and
-# this notice are preserved.  This file is offered as-is, without any
-# warranty.
-
-# Input:
-
-# Output:
- quality              100
- widthincm            10.0
- borderwidth          1
- output               jpg
-
-# Flux:
- invert               0
-
-# Common options
diff --git a/reproduce/analysis/config/gnuastro/aststatistics.conf b/reproduce/analysis/config/gnuastro/aststatistics.conf
deleted file mode 100644
index 90f985d..0000000
--- a/reproduce/analysis/config/gnuastro/aststatistics.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Default parameters (System) for Statistics.
-# Statistics is part of GNU Astronomy Utitlies.
-#
-# Use the long option name of each parameter followed by a value. The name
-# and value should be separated by atleast one white-space character (for
-# example ` '[space], or tab). Lines starting with `#' are ignored.
-#
-# For more information, please run these commands:
-#
-#  $ aststatistics --help                # Full list of options, short doc.
-#  $ aststatistics -P                    # Print all options and used values.
-#  $ info aststatistics                  # All options and input/output.
-#  $ info gnuastro "Configuration files" # How to use configuration files.
-#
-# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice and
-# this notice are preserved.  This file is offered as-is, without any
-# warranty.
-
-# Input image:
-
-# Sky and its STD settings
- khdu                 1
- meanmedqdiff     0.005
- outliersigma        10
- outliersclip     3,0.2
- smoothwidth          3
- sclipparams      3,0.1
-
-# Histogram and CFP settings
- numasciibins        70
- asciiheight         10
- numbins            100
- mirrordist         1.5
diff --git a/reproduce/analysis/config/gnuastro/gnuastro.conf b/reproduce/analysis/config/gnuastro/gnuastro.conf
deleted file mode 100644
index 82cb100..0000000
--- a/reproduce/analysis/config/gnuastro/gnuastro.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Default values for the common options to all the programs in GNU
-# Astronomy Utitlies.
-#
-# IMPORTANT NOTE: The `lastconfig' option is very important in a
-# reproducible environment. Because we don't want any of Gnuastro's
-# programs to go into an un-controlled environment (user or system wide
-# configuration files).
-#
-# The rest of this configuration file is taken from the default Gnuastro
-# configuration from its source (`bin/gnuastro.conf').
-#
-# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice and
-# this notice are preserved.  This file is offered as-is, without any
-# warranty.
-
-# Local project settings (`config' has to be before `lastconfig').
- config           .gnuastro/gnuastro-local.conf
- lastconfig       1
-
-# Input:
- hdu              1
- ignorecase       1
- searchin         name
- stdintimeout     100000
-
-# Tessellation
- tilesize         30,30
- numchannels      1,1
- remainderfrac    0.1
- workoverch       0
- interpmetric     radial
- interpnumngb     9
- interponlyblank  0
-
-# Output:
- tableformat      fits-binary
-
-# Operating mode
- quietmmap        0
- minmapsize       2000000000
diff --git a/reproduce/analysis/config/pdf-build.conf b/reproduce/analysis/config/pdf-build.conf
index e2d59cc..48585b4 100644
--- a/reproduce/analysis/config/pdf-build.conf
+++ b/reproduce/analysis/config/pdf-build.conf
@@ -3,13 +3,13 @@
 #
 # During the project's early phases, it is usually not necessary to build
 # the PDF file (which makes a lot of output lines on the command-line and
-# can make it hard to find the commands and possible errors (and their
-# outputs). Also, in some cases, only the produced results may be of
+# can make it hard to find the analysis commands and possible errors (and
+# their outputs). Also, in some cases, only the produced results may be of
 # interest and not the final PDF, so LaTeX (and its necessary packages) may
-# not be installed.
+# not be installed at all.
 #
-# If this variable is given any string, a PDF will be made with
-# LaTeX. Otherwise, a notice will just printed that for now, no PDF will be
+# If 'pdf-build-final' is given the value 'yes', a PDF will be made with
+# LaTeX. Otherwise, a notice will just printed that, no PDF will be
 # created.
 #
 # Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>