aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README-hacking.md8
-rw-r--r--reproduce/analysis/config/gnuastro/astbuildprog.conf16
-rw-r--r--reproduce/analysis/config/gnuastro/astconvertt.conf33
-rw-r--r--reproduce/analysis/config/gnuastro/aststatistics.conf36
-rw-r--r--reproduce/analysis/config/gnuastro/gnuastro.conf43
-rw-r--r--reproduce/analysis/make/initialize.mk7
-rwxr-xr-xreproduce/software/shell/configure.sh1
-rw-r--r--tex/src/preamble-header.tex4
8 files changed, 7 insertions, 141 deletions
diff --git a/README-hacking.md b/README-hacking.md
index a598373..afa9a1d 100644
--- a/README-hacking.md
+++ b/README-hacking.md
@@ -1254,11 +1254,9 @@ for the benefit of others.
- *Configuration files*: If your research uses special programs as part
of the processing, put all their configuration files in a devoted
directory (with the program's name) within
- `reproduce/software/config`. Similar to the
- `reproduce/software/config/gnuastro` directory (which is put in
- Maneage as a demo in case you use GNU Astronomy Utilities). It is
- much cleaner and readable (thus less buggy) to avoid mixing the
- configuration files, even if there is no technical necessity.
+ `reproduce/software/config`. It is much cleaner and readable (thus
+ less buggy) to avoid mixing the configuration files, even if there is
+ no technical necessity.
- **Contents**: It is good practice to follow the following
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/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index fca75f5..3a35ece 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -38,9 +38,6 @@ mtexdir = $(texdir)/macros
bashdir = reproduce/analysis/bash
pconfdir = reproduce/analysis/config
installdir = $(BDIR)/software/installed
-# --------- Delete for no Gnuastro ---------
-gconfdir = reproduce/analysis/config/gnuastro
-# ------------------------------------------
@@ -239,7 +236,7 @@ clean: clean-mmap
# features like ignoring the listing of a file with `!()' that we
# are using afterwards.
shopt -s extglob
- rm -rf $(BDIR)/tex/macros/!(dependencies.tex|dependencies-bib.tex)
+ rm -rf $(BDIR)/tex/macros/!(dependencies.tex|dependencies-bib.tex|hardware-parameters.tex)
rm -rf $(BDIR)/!(software|tex) $(BDIR)/tex/!(macros|$(texbtopdir))
rm -rf $(BDIR)/tex/build/!(tikz) $(BDIR)/tex/build/tikz/*
rm -rf $(BDIR)/software/preparation-done.mk
@@ -254,8 +251,8 @@ distclean: clean
# `rm' program. So for this recipe, we'll use the host system's
# `rm', not our own.
$$sys_rm -rf $(BDIR)
+ $$sys_rm -f $(pconfdir)/LOCAL.conf
$$sys_rm -f Makefile .gnuastro .local .build
- $$sys_rm -f $(pconfdir)/LOCAL.conf $(gconfdir)/gnuastro-local.conf
diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index 8a30f1a..646f101 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -1257,7 +1257,6 @@ ln -s "$tikzdir" tex/tikz
# --------- Delete for no Gnuastro ---------
rm -f .gnuastro
-ln -s "$topdir"/reproduce/analysis/config/gnuastro .gnuastro
# ------------------------------------------
diff --git a/tex/src/preamble-header.tex b/tex/src/preamble-header.tex
index 9353afc..42bb409 100644
--- a/tex/src/preamble-header.tex
+++ b/tex/src/preamble-header.tex
@@ -73,8 +73,8 @@
\hypersetup
{
pdfauthor={YOUR NAME},
- pdfsubject={A SHORT DESCRIPTION OF THE WORK},
- pdftitle={THE TITLE OF THIS PROJECT},
+ pdfsubject={\projecttitle},
+ pdftitle={\projecttitle},
pdfkeywords={SOME, KEYWORDS, FOR, THE, PDF}
}