Commit f998c6bf authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

tweaks

parent cd4590c0
./configure --with-atlas-libdir=/line17/zouhu/softwares/ATLAS/MyObj/lib --with-atlas-incdir=/line17/zouhu/softwares/ATLAS/MyObj/include/
...@@ -67,6 +67,7 @@ BACK_TYPE AUTO # AUTO or MANUAL ...@@ -67,6 +67,7 @@ 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_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>
FBACK_DIFF 0.15 # Difference tolerence between mode and median. If relative difference < FBACK_DIFF, use mode or else use median filter *Hu Zou @ 202307
#------------------------------ Check Image ---------------------------------- #------------------------------ Check Image ----------------------------------
......
...@@ -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.24.2' version = '2.25.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.24.2' release = '2.25.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.
...@@ -81,7 +81,7 @@ language = None ...@@ -81,7 +81,7 @@ language = None
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:
# #
today = 'Fri Dec 29 2017' today = 'Fri Jul 14 2023'
# #
# Else, today_fmt is used as the format for a strftime call. # Else, today_fmt is used as the format for a strftime call.
# #
...@@ -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.24.2' # html_title = u'SExtractor v2.25.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.
# #
......
...@@ -625,7 +625,7 @@ float backguess(backstruct *bkg, float *mean, float *sigma) ...@@ -625,7 +625,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, sig, sig1, med, dpix, fback;
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' */
...@@ -674,12 +674,17 @@ float backguess(backstruct *bkg, float *mean, float *sigma) ...@@ -674,12 +674,17 @@ float backguess(backstruct *bkg, float *mean, float *sigma)
hcut = (ftemp=med+3.0*sig)<nlevelsm1 ?(int)(ftemp>0.0?ftemp+0.5:ftemp-0.5) hcut = (ftemp=med+3.0*sig)<nlevelsm1 ?(int)(ftemp>0.0?ftemp+0.5:ftemp-0.5)
: nlevelsm1; : nlevelsm1;
} }
*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+(2.5*med-1.5*mea)*bkg->qscale
:bkg->qzero+med*bkg->qscale)) :bkg->qzero+med*bkg->qscale))
:bkg->qzero+mea*bkg->qscale; :bkg->qzero+mea*bkg->qscale; */
fback=prefs.fback_diff;
*mean = fabs(sig)>0.0?(fabs((mea-med)/sig)< fback ?
bkg->qzero+(2.5*med-1.5*mea)*bkg->qscale
:bkg->qzero+mea*bkg->qscale)
:bkg->qzero+mea*bkg->qscale;
*sigma = sig*bkg->qscale; *sigma = sig*bkg->qscale;
......
...@@ -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},
{"FBACK_DIFF", P_FLOAT, &prefs.fback_diff, 0,0, 0.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",""}},
...@@ -263,6 +264,9 @@ char *default_prefs[] = ...@@ -263,6 +264,9 @@ char *default_prefs[] =
"*BACK_VALUE 0.0 # Default background value in MANUAL mode", "*BACK_VALUE 0.0 # Default background value in MANUAL mode",
"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>",
"FBACK_DIFF 0.15 # Difference tolerence between mode and median",
" # If relative difference < FBACK_DIFF, use mode",
" # or else use median filter *Hu Zou @ 202307",
" ", " ",
"BACKPHOTO_TYPE GLOBAL # can be GLOBAL or LOCAL", "BACKPHOTO_TYPE GLOBAL # can be GLOBAL or LOCAL",
"*BACKPHOTO_THICK 24 # thickness of the background LOCAL annulus", "*BACKPHOTO_THICK 24 # thickness of the background LOCAL annulus",
......
...@@ -138,6 +138,7 @@ typedef struct ...@@ -138,6 +138,7 @@ typedef struct
double backfthresh; /* bkgnd fil. thresh */ double backfthresh; /* bkgnd fil. thresh */
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 */
double fback_diff; /* mode and median relative difference threashold (default 15%, if mode and median agrees within this value, use mode or else use median) Hu Zou @ 202307*/
/*----- memory */ /*----- memory */
int clean_stacksize; /* size of buffer */ int clean_stacksize; /* size of buffer */
int mem_pixstack; /* pixel stack size */ int mem_pixstack; /* pixel stack size */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment