[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master 1c8bf2e8 22/23: color-faint-gray: --regions is
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master 1c8bf2e8 22/23: color-faint-gray: --regions is new name for --segment |
Date: |
Sun, 24 Dec 2023 22:26:24 -0500 (EST) |
branch: master
commit 1c8bf2e80fc76afdb510a0f5860bece5ebe6b063
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>
color-faint-gray: --regions is new name for --segment
Until now, the option to specify regions within the image for the various
scenarios was called '--segment'. However, this could be confused with the
output of the Segment program (as is used by the PSF scripts for example).
With this commit, the option is renamed to '--regions'.
---
bin/script/color-faint-gray.sh | 50 +++++++++++++++++++++---------------------
doc/gnuastro.texi | 4 ++--
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/bin/script/color-faint-gray.sh b/bin/script/color-faint-gray.sh
index 124a3f22..0b7f4432 100644
--- a/bin/script/color-faint-gray.sh
+++ b/bin/script/color-faint-gray.sh
@@ -44,7 +44,7 @@ export LANG=C
# Default option values (can be changed with options on the command-line).
hdu=""
-shdu=1
+rhdu=1
globalhdu=""
# Minimum, weights, and zeropoint values
@@ -53,11 +53,11 @@ minimum=""
zeropoint=""
# To control the asinh transformation, set both to 1 (scientific notation)
-qbright_default=$(astarithmetic 1.0 1.0 x --quiet)
-stretch_default=$(astarithmetic 1.0 1.0 x --quiet)
+qbright_default=1.000000e+00
+stretch_default=1.000000e+00
# For color, black, and gray regions
-segment=""
+regions=""
grayval=""
colorval=""
coloronly=0
@@ -125,7 +125,7 @@ experienced Gnuastro users and developers. For more
information, please run:
$scriptname options:
Input:
-h, --hdu=STR HDU/extension for the input channels.
- -t, --shdu=STR HDU/extension for the segment image.
+ -t, --rhdu=STR HDU/extension for the regions image.
-g, --globalhdu=STR/INT Use this HDU for all inputs, ignore '--hdu'.
-w, --weight=FLT Relative weight for each input channel.
-m, --minimum=FLT Minimum value for each input channel.
@@ -142,7 +142,7 @@ $scriptname options:
Color and gray parameters
--coloronly No grayscale regions, background in color (black).
- --segment=STR Segmentation image (color=2, black=1, gray=0).
+ --regions=STR Regions labeled image (color=2, black=1, gray=0).
--grayval=FLT Gray threshold (highest value to use grayscale).
--colorval=FLT Color threshold (lowest value to have color).
--graykernelfwhm=FLT Kernel FWHM for convolving the background image.
@@ -245,9 +245,9 @@ do
-h|--hdu) aux="$2";
check_v "$1" "$aux"; hdu="$hdu $aux"; shift;shift;;
-h=*|--hdu=*) aux="${1#*=}";
check_v "$1" "$aux"; hdu="$hdu $aux"; shift;;
-h*) aux="$(echo "$1" | sed -e's/-h//')";
check_v "$1" "$aux"; hdu="$hdu $aux"; shift;;
- -t|--shdu) shdu="$2";
check_v "$1" "$shdu"; shift;shift;;
- -t=*|--shdu=*) shdu="${1#*=}";
check_v "$1" "$shdu"; shift;;
- -t*) shdu=$(echo "$1" | sed -e's/-t//');
check_v "$1" "$shdu"; shift;;
+ -t|--rhdu) rhdu="$2";
check_v "$1" "$rhdu"; shift;shift;;
+ -t=*|--rhdu=*) rhdu="${1#*=}";
check_v "$1" "$rhdu"; shift;;
+ -t*) rhdu=$(echo "$1" | sed -e's/-t//');
check_v "$1" "$rhdu"; shift;;
-w|--weight) aux="$2";
check_v "$1" "$aux"; weight="$weight $aux"; shift;shift;;
-w=*|--weight=*) aux="${1#*=}";
check_v "$1" "$aux"; weight="$weight $aux"; shift;;
-w*) aux="$(echo "$1" | sed -e's/-w//')";
check_v "$1" "$aux"; weight="$weight $aux"; shift;;
@@ -276,8 +276,8 @@ do
-b*) bias=$(echo "$1" | sed -e's/-b//');
check_v "$1" "$bias"; shift;;
--coloronly) coloronly=1; shift;;
- --segment) segment="$2"; check_v
"$1" "$segment"; shift;shift;;
- --segment=*) segment="${1#*=}"; check_v
"$1" "$segment"; shift;;
+ --regions) regions="$2"; check_v
"$1" "$regions"; shift;shift;;
+ --regions=*) regions="${1#*=}"; check_v
"$1" "$regions"; shift;;
--grayval) grayval="$2"; check_v
"$1" "$grayval"; shift;shift;;
--grayval=*) grayval="${1#*=}"; check_v
"$1" "$grayval"; shift;;
--colorval) colorval="$2"; check_v
"$1" "$colorval"; shift;shift;;
@@ -856,28 +856,28 @@ else
- # Segmentation image
- # ------------------
+ # Regions labeled image
+ # ---------------------
#
- # The TOTAL_MASK consists in a segmentation image whose pixel values
- # correspond to the three regions. Here it is defined as follow:
- # pixels=2 will be shown in color
- # pixels=1 will be shown in pure black
- # pixels=0 will be shown in gray
+ # The TOTAL_MASK consists of a labeled image whose pixel values
+ # correspond to the three regions. Labels are defined as follows:
+ # 2 will be shown in color
+ # 1 will be shown in pure black
+ # 0 will be shown in gray
# This image is computed by default from the colorval and grayval
# parameters. Alternatively, it can be provided by the user.
- if [ x$segment = x ]; then
+ if [ x$regions = x ]; then
TOTAL_MASK="$tmpdir/TOTAL_mask-2color-1black-0gray.fits"
astarithmetic $I_COLORGRAY_threshold set-i \
i $colorval gt 2 uint8 x set-c \
i $colorval lt i $grayval gt and 1 uint8 x set-b \
i $colorval lt 0 uint8 x set-g \
c b g 3 sum uint8 --output $TOTAL_MASK
- shdu=1
+ rhdu=1
else
- grayval="$segment"
- colorval="$segment"
- TOTAL_MASK=$segment
+ grayval="$regions"
+ colorval="$regions"
+ TOTAL_MASK=$regions
fi
@@ -909,7 +909,7 @@ else
grayscale=""
I_GRAY_colormasked="$tmpdir/GRAY_colormasked.fits"
astarithmetic $I_BACK_convolved -h1 set-values \
- $TOTAL_MASK -h$shdu 2 uint8 eq set-mask \
+ $TOTAL_MASK -h$rhdu 2 uint8 eq set-mask \
values mask nan where $grayscale set-masked \
masked minvalue set-oldmin \
masked maxvalue set-oldmax \
@@ -932,7 +932,7 @@ else
# this, those pixels will be set to pure black color.
I_GRAY_colormasked_zeroblack="$tmpdir/GRAY_colormasked_zeroblack.fits"
astarithmetic $I_GRAY_colormasked -h1 set-i \
- $TOTAL_MASK -h$shdu 1 uint8 eq -h1 set-b \
+ $TOTAL_MASK -h$rhdu 1 uint8 eq -h1 set-b \
i b 0.0 where float32 \
--output=$I_GRAY_colormasked_zeroblack
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index d41be600..729ddc60 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -9248,12 +9248,12 @@ $ astscript-fits-view R-sb-seg.fits
Let's say in words what this mean.
Pixels on this image equal to 2 will be shown in color, pixels equal to 1 will
be shown in pure black, pixels equal to 0 will be shown in gray.
-Now, let's use this segmentation image with the @option{--segment} option for
obtaining the color image.
+Now, let's use this labeled image with the @option{--regions} option for
obtaining the color image.
@example
$ astscript-color-faint-gray $params --output=m51-sb.pdf \
--qbright=0.01 --stretch=100 \
- --segment=R-sb-seg.fits
+ --regions=R-sb-seg.fits
@end example
Open @file{R-sb.pdf} and have a look.
- [gnuastro-commits] master 016c185a 09/23: Book: improving and correcting typos of rgb-asinh tutorial, (continued)
- [gnuastro-commits] master 016c185a 09/23: Book: improving and correcting typos of rgb-asinh tutorial, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 63718a46 15/23: Book: edited the color tutorial, typo in rgb script fixed, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 217ad4ff 16/23: color-faint-gray: new name for the script, --bias replaces --brightness, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 10841bab 17/23: color-faint-gray: bug corrected in the asinh transformation, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 2a63037e 18/23: color-faint-gray: improving the selection of color, black, and gray regions, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master cd724b3f 19/23: Book: color-faint-gray tutorial improved by including last features, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 16419fda 11/23: astscript-rgb-faint-gray: following Gnuastro standards for HDU arguments, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 6d1e2f4a 12/23: astscript-rgb-faint-gray: removing comma-separated arguments, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 145070a2 21/23: color-faint-gray: new option --segment to define the color regions, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 73181f88 07/23: Book: new tutorial describing how to generate color images, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 1c8bf2e8 22/23: color-faint-gray: --regions is new name for --segment,
Mohammad Akhlaghi <=
- [gnuastro-commits] master a0b7270e 10/23: astscript-rgb-faint-gray: set gray background by default, new script name, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master cf40daba 13/23: Book: edited tutorial on color image production, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master 4f206b8b 20/23: astscript-color-faint-gray: minor modifications to have better file names, Mohammad Akhlaghi, 2023/12/24
- [gnuastro-commits] master f9f40f41 23/23: Book: Tutorial of color-faint-gray broken into three sections, Mohammad Akhlaghi, 2023/12/24