Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
csst-pipeline
msc
sextractor
Commits
f66d6f79
Commit
f66d6f79
authored
Mar 07, 2023
by
Emmanuel Bertin
Browse files
Add a config option to change Pearson's factor in background mode estimation.
parent
1f1191b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
f66d6f79
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#
#
# This file part of: SExtractor
# This file part of: SExtractor
#
#
# Copyright: (C) 2002-2023 IAP/CNRS/SorbonneU
# Copyright: (C) 2002-2023
CFHT/
IAP/CNRS/SorbonneU
#
#
# License: GNU General Public License
# License: GNU General Public License
#
#
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
#
#
# Last modified:
26
/0
2
/2023
# Last modified:
07
/0
3
/2023
#
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
...
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)
define([AC_CACHE_SAVE],)
# This is your standard AstrOmatic source code...
# This is your standard AstrOmatic source code...
AC_INIT([SExtractor],[2.2
7.1
],[astromatic@astromatic.iap.fr],
AC_INIT([SExtractor],[2.2
8.0
],[astromatic@astromatic.iap.fr],
[sextractor],[http://astromatic.net/software/sextractor])
[sextractor],[http://astromatic.net/software/sextractor])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(autoconf)
AC_CONFIG_AUX_DIR(autoconf)
...
...
doc/src/conf.py
View file @
f66d6f79
...
@@ -67,9 +67,9 @@ author = u'E. Bertin'
...
@@ -67,9 +67,9 @@ author = u'E. Bertin'
# built documents.
# built documents.
#
#
# The short X.Y version.
# The short X.Y version.
version
=
'2.2
7.1
'
version
=
'2.2
8.0
'
# The full version, including alpha/beta/rc tags.
# The full version, including alpha/beta/rc tags.
release
=
'2.2
7.1
'
release
=
'2.2
8.0
'
# The language for content autogenerated by Sphinx. Refer to documentation
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
# for a list of supported languages.
...
@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
...
@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# The name for this set of Sphinx documents.
# The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default.
# "<project> v<release> documentation" by default.
#
#
# html_title = u'SExtractor v2.2
7.1
'
# html_title = u'SExtractor v2.2
8.0
'
# A shorter title for the navigation bar. Default is the same as html_title.
# A shorter title for the navigation bar. Default is the same as html_title.
#
#
...
...
src/back.c
View file @
f66d6f79
...
@@ -673,7 +673,7 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
...
@@ -673,7 +673,7 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
{
{
LONG
*
histo
,
*
hilow
,
*
hihigh
,
*
histot
;
LONG
*
histo
,
*
hilow
,
*
hihigh
,
*
histot
;
unsigned
long
lowsum
,
highsum
,
sum
;
unsigned
long
lowsum
,
highsum
,
sum
;
double
ftemp
,
mea
,
sig
,
sig1
,
med
,
dpix
;
double
ftemp
,
mea
,
meafac
,
sig
,
sig1
,
med
,
medfac
,
dpix
;
int
i
,
n
,
lcut
,
hcut
,
nlevelsm1
,
pix
;
int
i
,
n
,
lcut
,
hcut
,
nlevelsm1
,
pix
;
/* Leave here if the mesh is already classified as `bad' */
/* Leave here if the mesh is already classified as `bad' */
...
@@ -689,6 +689,8 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
...
@@ -689,6 +689,8 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
sig
=
10
.
0
*
nlevelsm1
;
sig
=
10
.
0
*
nlevelsm1
;
sig1
=
1
.
0
;
sig1
=
1
.
0
;
medfac
=
prefs
.
back_pearsons
;
meafac
=
prefs
.
back_pearsons
-
1
.
0
;
mea
=
med
=
bkg
->
mean
;
mea
=
med
=
bkg
->
mean
;
for
(
n
=
100
;
n
--
&&
(
sig
>=
0
.
1
)
&&
(
fabs
(
sig
/
sig1
-
1
.
0
)
>
EPS
);)
for
(
n
=
100
;
n
--
&&
(
sig
>=
0
.
1
)
&&
(
fabs
(
sig
/
sig1
-
1
.
0
)
>
EPS
);)
{
{
...
@@ -725,7 +727,7 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
...
@@ -725,7 +727,7 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
*
mean
=
fabs
(
sig
)
>
0
.
0
?
(
fabs
(
bkg
->
sigma
/
(
sig
*
bkg
->
qscale
)
-
1
)
<
0
.
0
?
*
mean
=
fabs
(
sig
)
>
0
.
0
?
(
fabs
(
bkg
->
sigma
/
(
sig
*
bkg
->
qscale
)
-
1
)
<
0
.
0
?
bkg
->
qzero
+
mea
*
bkg
->
qscale
bkg
->
qzero
+
mea
*
bkg
->
qscale
:
(
fabs
((
mea
-
med
)
/
sig
)
<
0
.
3
?
:
(
fabs
((
mea
-
med
)
/
sig
)
<
0
.
3
?
bkg
->
qzero
+
(
2
.
5
*
med
-
1
.
5
*
mea
)
*
bkg
->
qscale
bkg
->
qzero
+
(
medfac
*
med
-
meafac
*
mea
)
*
bkg
->
qscale
:
bkg
->
qzero
+
med
*
bkg
->
qscale
))
:
bkg
->
qzero
+
med
*
bkg
->
qscale
))
:
bkg
->
qzero
+
mea
*
bkg
->
qscale
;
:
bkg
->
qzero
+
mea
*
bkg
->
qscale
;
...
...
src/preflist.h
View file @
f66d6f79
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
*
*
* Last modified:
15/07/2020
* Last modified:
07/03/2023
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...
@@ -61,6 +61,7 @@
...
@@ -61,6 +61,7 @@
{
"BACK_FILTERSIZE"
,
P_INTLIST
,
prefs
.
backfsize
,
1
,
11
,
0
.
0
,
0
.
0
,
{
"BACK_FILTERSIZE"
,
P_INTLIST
,
prefs
.
backfsize
,
1
,
11
,
0
.
0
,
0
.
0
,
{
""
},
1
,
2
,
&
prefs
.
nbackfsize
},
{
""
},
1
,
2
,
&
prefs
.
nbackfsize
},
{
"BACK_FILTTHRESH"
,
P_FLOAT
,
&
prefs
.
backfthresh
,
0
,
0
,
0
.
0
,
BIG
},
{
"BACK_FILTTHRESH"
,
P_FLOAT
,
&
prefs
.
backfthresh
,
0
,
0
,
0
.
0
,
BIG
},
{
"BACK_PEARSONS"
,
P_FLOAT
,
&
prefs
.
back_pearsons
,
0
,
0
,
1
.
0
,
BIG
},
{
"BACKPHOTO_THICK"
,
P_INT
,
&
prefs
.
pback_size
,
1
,
256
},
{
"BACKPHOTO_THICK"
,
P_INT
,
&
prefs
.
pback_size
,
1
,
256
},
{
"BACKPHOTO_TYPE"
,
P_KEY
,
&
prefs
.
pback_type
,
0
,
0
,
0
.
0
,
0
.
0
,
{
"BACKPHOTO_TYPE"
,
P_KEY
,
&
prefs
.
pback_type
,
0
,
0
,
0
.
0
,
0
.
0
,
{
"GLOBAL"
,
"LOCAL"
,
""
}},
{
"GLOBAL"
,
"LOCAL"
,
""
}},
...
@@ -261,6 +262,9 @@ char *default_prefs[] =
...
@@ -261,6 +262,9 @@ char *default_prefs[] =
" "
,
" "
,
"*BACK_TYPE AUTO # AUTO or MANUAL"
,
"*BACK_TYPE AUTO # AUTO or MANUAL"
,
"*BACK_VALUE 0.0 # Default background value in MANUAL mode"
,
"*BACK_VALUE 0.0 # Default background value in MANUAL mode"
,
"*BACK_PEARSONS 2.5 # Pearson's factor P >= 1 with"
,
"* # (mean - mode) ~ P * (mean - median)"
,
"* # Legacy value is 2.5, but 3.5 is more accurate"
,
"BACK_SIZE 64 # Background mesh: <size> or <width>,<height>"
,
"BACK_SIZE 64 # Background mesh: <size> or <width>,<height>"
,
"BACK_FILTERSIZE 3 # Background filter: <size> or <width>,<height>"
,
"BACK_FILTERSIZE 3 # Background filter: <size> or <width>,<height>"
,
" "
,
" "
,
...
...
src/prefs.h
View file @
f66d6f79
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*
*
* This file part of: SExtractor
* This file part of: SExtractor
*
*
* Copyright: (C) 1993-202
0
IAP/CNRS/SorbonneU
* Copyright: (C) 1993-202
3
IAP/CNRS/SorbonneU
*
*
* License: GNU General Public License
* License: GNU General Public License
*
*
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
*
*
* Last modified:
15/07/2020
* Last modified:
07/03/2023
*
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...
@@ -136,6 +136,7 @@ typedef struct
...
@@ -136,6 +136,7 @@ typedef struct
int
backfsize
[
2
];
/* bkgnd filt. size */
int
backfsize
[
2
];
/* bkgnd filt. size */
int
nbackfsize
;
/* nb of params */
int
nbackfsize
;
/* nb of params */
double
backfthresh
;
/* bkgnd fil. thresh */
double
backfthresh
;
/* bkgnd fil. thresh */
double
back_pearsons
;
/* Pearson's factor */
enum
{
GLOBAL
,
LOCAL
}
pback_type
;
/* phot. bkgnd type */
enum
{
GLOBAL
,
LOCAL
}
pback_type
;
/* phot. bkgnd type */
int
pback_size
;
/* rect. ann. width */
int
pback_size
;
/* rect. ann. width */
/*----- memory */
/*----- memory */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment