[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master a8428fe 088/113: Imported recent work in maste
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master a8428fe 088/113: Imported recent work in master, conflicts fixed |
Date: |
Fri, 16 Apr 2021 10:33:55 -0400 (EDT) |
branch: master
commit a8428fe892b51f93de20ae55932d706f8acd0da2
Merge: d57e0e6 e41a18a
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Imported recent work in master, conflicts fixed
There were a few conflicts regarding the parallel changes in both branches
(on MakeCatalog's new `--spectrum' feature in this branch, along with the
updated book text. All these conflicts are fixed with this commit.
---
NEWS | 1 +
bin/mkcatalog/mkcatalog.c | 1 -
doc/gnuastro.texi | 17 ++++++++---------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/NEWS b/NEWS
index f0761ef..d6191b1 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ GNU Astronomy Utilities NEWS -*-
outline -*-
--meanmedqdiff: new name for `--modmedqdiff'. Similar to NoiseChisel.
Library:
+ - gal_data_copy_to_allocated: Also copies string metadata (e.g., name).
- gal_fits_key_write: filename and hdu instead of FITS pointer.
- gal_fits_key_write_version: filename and hdu instead of FITS pointer.
- gal_fits_key_write_filename: write at the top or end of the input list.
diff --git a/bin/mkcatalog/mkcatalog.c b/bin/mkcatalog/mkcatalog.c
index 50d6764..4a3efca 100644
--- a/bin/mkcatalog/mkcatalog.c
+++ b/bin/mkcatalog/mkcatalog.c
@@ -730,7 +730,6 @@ mkcatalog_write_outputs(struct mkcatalogparams *p)
printf(" - Spectra in %zu files with `-spec-NN.txt' suffix.\n",
p->numobjects);
}
-
}
}
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index ee791da..ec32028 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -17639,10 +17639,10 @@ the output catalog/table's central position
column@footnote{See
@ref{Measuring elliptical parameters} for a discussion on this and the
derivation of positional parameters, which includes the
center.}. Similarly, the sum of all these pixels will be the 42nd row in
-the brightness column and etc. Pixels with labels equal to, or smaller than
-zero will be ignored by MakeCatalog. In other words, the number of rows in
-MakeCatalog's output is already known before running it (the maximum value
-of the labeled dataset).
+the brightness column and etc. Pixels with labels equal to, or smaller
+than, zero will be ignored by MakeCatalog. In other words, the number of
+rows in MakeCatalog's output is already known before running it (the
+maximum value of the labeled dataset).
Before getting into the details of running MakeCatalog (in @ref{Invoking
astmkcatalog}, we'll start with a discussion on the basics of its approach
@@ -18408,9 +18408,9 @@ options and general setting options are described below.
@item -l STR
@itemx --clumpsfile=STR
The file containing the labeled clumps dataset when @option{--clumpscat} is
-called (see @ref{MakeCatalog output}). When @option{--clumpscat} is
-called, but this option isn't, MakeCatalog will look into the main input
-file (given as an argument) for the required extension/HDU (value to
+called (see @ref{MakeCatalog output}). When @option{--clumpscat} is called,
+but this option isn't, MakeCatalog will look into the main input file
+(given as an argument) for the required extension/HDU (value to
@option{--clumpshdu}).
@item --clumpshdu=STR
@@ -18637,8 +18637,7 @@ option.
The final group of options particular to MakeCatalog are those that specify
which measurements/columns should be written into the final output
table. The most basic measurement is one which only produces one final
-value for each label (for example its total brightness: a single
-number).
+value for each label (for example its total brightness: a single number).
In this case, all the different label's measurements can be written as one
column in a final table/catalog that contains other columns for other
- [gnuastro-commits] master 91f2d3e 068/113: Imported recent work in master, conflicts fixed, (continued)
- [gnuastro-commits] master 91f2d3e 068/113: Imported recent work in master, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 63b4edd 070/113: Imported work in master, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 0ced9e5 072/113: Imported recent work in master, no conflicts, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 88935ae 073/113: Dataset pointers initialized to NULL in upperlimit_write_check, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master d02c999 079/113: Recent work in master imported, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 4021652 078/113: Imported recent work in master, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 8d64628 081/113: Recent work in master imported, minor conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 800c769 082/113: Imported all the work in master, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master ac91655 084/113: Imported recent work in master, no conflicts, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master d57e0e6 087/113: New spectrum measurement from 3D inputs in MakeCatalog, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master a8428fe 088/113: Imported recent work in master, conflicts fixed,
Mohammad Akhlaghi <=
- [gnuastro-commits] master 175354f 095/113: All MakeCatalog spectrums set to NaN when no measurement was done, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master fe0e594 097/113: Imported recent work in master, no conflicts, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 5d5fd95 106/113: NoiseChisel: independent test of input's dimensions, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master ee4bf1e 069/113: Imported recent work from master, Segment's 3D kernels added, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 2c6c7e0 076/113: Imported recent work, no conflicts, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master e2aba57 083/113: Recent work in master imported, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master e92fd9c 039/113: Merged recent work in master, conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 54b099d 043/113: Neighbors options doc generalized for different dimensions, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 5cd3c1e 044/113: Recent work in master merged, small conflicts fixed, Mohammad Akhlaghi, 2021/04/16
- [gnuastro-commits] master 1b0046b 051/113: Recent additions in master imported here, no conflicts, Mohammad Akhlaghi, 2021/04/16