diff -Naur ./ChangeLog ../gpivtools-0.4.0_patch1/ChangeLog --- ./ChangeLog 2006-11-13 15:29:48.000000000 +0100 +++ ../gpivtools-0.4.0_patch1/ChangeLog 2007-02-21 16:18:56.000000000 +0100 @@ -16,4 +16,11 @@ (instead of old '-f file_basename' key option) * src/dac/rec_img: extended for double frame recording and saving (stdout) to png image - * src/imgproc.c repaired bugs \ No newline at end of file + * src/imgproc.c repaired bugs + +2007-2 - 15 Gerber Van der Graaf + gpivtools_0.4.0_patch1: + * src/eval/rr.c, man/gpiv_rr.1: removed -c, -r options (as they + are normally included in image header), added Gauss weighting and + SPOF filtering. + \ No newline at end of file diff -Naur ./man/gpiv_rr.1 ../gpivtools-0.4.0_patch1/man/gpiv_rr.1 --- ./man/gpiv_rr.1 2006-11-08 19:19:20.000000000 +0100 +++ ../gpivtools-0.4.0_patch1/man/gpiv_rr.1 2007-02-21 16:13:07.000000000 +0100 @@ -5,11 +5,11 @@ .SH SYNOPSIS \fBgpiv_rr\fP -[\fB-c \fIint\fR] [\fB--cf \fIint\fR] [\fB--cl \fIint\fR] [\fB--cp \fIint\fR] [\fB-g\fR] +[\fB--gauss\fR] [\fB-h\fR | \fB--help\fR] [\fB--ifit \fI0/1/2/3\fR] [\fB--ischeme \fIint\fR] @@ -23,11 +23,11 @@ [\fB--peak \fIint\fR] [\fB--p_piv\fR] \ [\fB--point \fIint int\fR] -[\fB-r \fIint\fR] [\fB--rf \fIint\fR] [\fB--rl \fIint\fR] [\fB--rp \fIint\fR] [\fB-s \fIfloat\fR] +[\fB--spof\fR] [\fB-v\fR | \fB--version\fR] [\fB--val_r \fIint\fR] [\fB--val_s \fIint\fR] @@ -91,11 +91,6 @@ .SH Options .TP -\fB-c \fIN\fR -Specify the number of columns with \fIN\fR that -contains the image. - -.TP \fB--cf \fIN\fR Specify the first column \fIN\fR in the image to interrogate. If --ad_int has been used, the first column has to be equal or larger than @@ -118,6 +113,11 @@ Graphic visualisation of the output with gnuplot. Can only be used in combination with \fIfilename\fR). +.TP +\fB--gauss\fR +Gauss weighting of interrogation area to reduce high spatial frequency +signal generated by the boundaries. + .TP \fB-h\fR | \fB--help\fR Print a help message on standard output and exit successfully. @@ -230,10 +230,6 @@ with a single point analyses. .TP -\fB-r \fIN\fR -Number of rows \fIN\fR that contains the image. - -.TP \fB--rf \fIN\fR Specify the first row \fIN\fR in the image to interrogate. If \fB-ad_int\fR has been used, the first row has to be equal or larger than (\fBint_size_2\fR - \fBint_size_1\fR)/2. @@ -254,6 +250,14 @@ Scale factor for graphic output with gnuplot. .TP +\fB--spof\fR +Applies symmetric phase only filtering. This option may drasticly +improve the SNR with higher and thinner covariance peak. Especially +usefull when there is flare or high reflections (from boundaries, for +example) in one of the two image frames from a PIV image +pair. (Werner, Meas. Sci. Technol., 16, 601-618). + +.TP \fB-v\fR | \fB--version\fR Print version information on standard output then exit successfully. diff -Naur ./man/gpivtools.1 ../gpivtools-0.4.0_patch1/man/gpivtools.1 --- ./man/gpivtools.1 2006-11-10 18:34:51.000000000 +0100 +++ ../gpivtools-0.4.0_patch1/man/gpivtools.1 2007-02-02 12:31:34.000000000 +0100 @@ -22,7 +22,7 @@ \fI$HOME/.gpivrc\fR or at the system-wide configuration file \fIgpiv.conf\fR, resident at \fI/etc\fR for most of the UNIX-like operating systems. Each parameter is described by the process key -(DAC, IMG, IMGPROC, EVAL, VALID or POST) and the parameter name, +(CAM, TRIG, IMG, IMGPROC, EVAL, VALID or POST) and the parameter name, separated by a dot (.), followed by its value. Some of the parameters are optional. The parameters may be defined in arbitrary order. Blank lines and comment (starting with a pound sign (#) at the first column) diff -Naur ./src/evaluate/rr.c ../gpivtools-0.4.0_patch1/src/evaluate/rr.c --- ./src/evaluate/rr.c 2007-01-29 15:35:14.000000000 +0100 +++ ../gpivtools-0.4.0_patch1/src/evaluate/rr.c 2007-02-21 16:22:10.000000000 +0100 @@ -22,7 +22,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -------------------------------------------------------------------- */ + --------------------------------------------------------------------------- */ #include #include @@ -34,20 +34,20 @@ /* #define SWAP(a,b) tempr=(a);(a)=(b);(b)=tempr */ #define USAGE "\ -Usage: rr [-c int] [--c_dif] [--no_cdif] [--cf int] [--cl int] [--cp int] \n\ - [-g] [-h | --help] [--iasize1 int] [--iasize2 int] [--iashift int] \n\ - [--ischeme int] [--ifit 0/1/2/3] [--linec int int int] \n\ +Usage: rr [--c_dif] [--no_cdif] [--cf int] [--cl int] [--cp int] \n\ + [-g] [--gauss][-h | --help] [--iasize1 int] [--iasize2 int] \n\ + [--iashift int] [--ischeme int] [--ifit 0/1/2/3] [--linec int int int] \n\ [--liner int int int] [-p | --print] [--peak 1/2/3] [--p_piv] \n\ - [--point int int] [-r int] [--rf int] [--rl int] [--rp int] \n\ + [--point int int] [--rf int] [--rl int] [--rp int] [--spof] \n\ [-s float] [-v | --version] [--val_r int] [--val_s] [--val_t float] \n\ [-x | --cross_corr] [--no_x | --auto_corr] [filename] < stdin > stdout \n\ \n\ keys: \n\ --c ncols: number of columns \n\ --cf col: first column of area to interrogate \n\ --cl col: last column of area to interrogate \n\ --cp columns: pre-shift in x-direction (columns) \n\ -g: graphical visualization with gnuplot (needs -f) \n\ +--gauss: Gauss weighting of interrogation area \n\ -h | --help: this on-line help \n\ --iasize1 size: size of first interrogation area \n\ --iasize2 size: size of second interrogation area (>= isi1) \n\ @@ -55,8 +55,8 @@ --ischeme 0/1/2/3/4: interrogation scheme: no correction (0), linear \n\ weighting (1), zero offset (2), zero offset with central \n\ differential (3), image deformation (4) \n\ ---ifit 0/1/2/3: interpolation type: none (0), Gauss (1), Parabolic (2) \n\ - or Centre of Gravity (3). \n\ +--ifit 0/1/2/3: sub-pixel interpolation type: none (0), Gauss (1), \n\ + Parabolic (2) or Centre of Gravity (3). \n\ --linec c rf rl: selects a vertical line at column r to interrogate \n\ from row rf to row rl \n\ --liner r cf cl: selects an horizontal line at row r to interrogate \n\ @@ -65,10 +65,10 @@ --peak #: find maximum of #-th covariance peak \n\ --p_piv: prints piv results to stdout, even if -f has been used \n\ --point x y: select one single point in the image to interrogate \n\ --r nrows: number of rows \n\ --rf row: first row of area to interrogate \n\ --rl row: last row of area to interrogate \n\ --rp rows: pre-shift in y-direction (rows) \n\ +--spof: symmetric phase only filtering \n\ -s S: scale factor for graphic output with gnuplot \n\ -v | --version: version number \n\ --val_r N: validation; residu type calculated from: snr (0), median \n\ @@ -102,7 +102,7 @@ particles for (Digital) Particle Image Velocimetry (PIV). \n\ " -#define RCSID "$Id: rr.c,v 3.20 2007-01-29 14:35:14 gerber Exp $" +#define RCSID "$Id: rr.c,v 3.21 2007-02-16 17:08:49 gerber Exp $" /* * Global parameters and variables @@ -568,19 +568,6 @@ switch (c) { /* - * number of columns - */ - case 'c': - image_par->ncolumns = atoi (*++argv); - image_par->ncolumns_logic = TRUE; - argc_next = 1; - /* - * an integer value belongs to this argument; argc a has to skip one - */ - --argc; - break; - - /* * graphic output with gnuplot */ case 'g': @@ -606,16 +593,6 @@ break; /* - * number of rows - */ - case 'r': - image_par->nrows = atoi (*++argv); - image_par->nrows_logic = TRUE; - --argc; - argc_next = 1; - break; - - /* * scaling for graphic output with gnuplot */ case 's': @@ -711,6 +688,12 @@ /* argc_next = 1; */ /* + * interrogation area weighting with gauss function + */ + } else if (strcmp ("-gauss", *argv) == 0) { + eval_par->gauss_weight_ia = TRUE; + eval_par->gauss_weight_ia__logic = TRUE; + /* * overrides Rr.Int_size_1 */ } else if (strcmp ("-iasize1", *argv) == 0) { @@ -892,7 +875,12 @@ --argc; argc_next = 1; - + /* + * Symmetric phase only filtering + */ + } else if (strcmp ("-spof", *argv) == 0) { + eval_par->spof_filter = TRUE; + eval_par->spof_filter__logic = TRUE; /* * validation parameter: residu type