Index: trunk/pois/src/errorCodes-skl.c =================================================================== --- trunk/pois/src/errorCodes-skl.c (revision 8077) +++ trunk/pois/src/errorCodes-skl.c (revision 8480) @@ -24,9 +24,9 @@ for (int i = 0; i < nerror; i++) { psErrorDescription *tmp = psAlloc(sizeof(psErrorDescription)); - p_psMemSetPersistent(tmp, true); + p_psMemSetPersistent(tmp, true); *tmp = errors[i]; psErrorRegister(tmp, 1); - psFree(tmp); /* it's on the internal list */ + psFree(tmp); /* it's on the internal list */ } - nerror = 0; // don't register more than once + nerror = 0; // don't register more than once } Index: trunk/pois/src/pois.c =================================================================== --- trunk/pois/src/pois.c (revision 8077) +++ trunk/pois/src/pois.c (revision 8480) @@ -1,8 +1,21 @@ -/* - * POIS: Pan-STARRS (or Pricey's) Optimal Image Subtraction - * - * Attempts to fit for a general convolution kernel that will match the PSFs between two images. - * - */ +// POIS: Pan-STARRS (or Pricey's) Optimal Image Subtraction +// +// Attempts to fit for a general convolution kernel that will match the PSFs between two images. +// +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include Index: trunk/pois/src/poisAddPenalty.c =================================================================== --- trunk/pois/src/poisAddPenalty.c (revision 8077) +++ trunk/pois/src/poisAddPenalty.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include @@ -4,9 +20,9 @@ #include "pois.h" -void poisAddPenalty(psImage *matrix, // The matrix - psVector *vector, // The vector - float penalty, // Penalty value - const psArray *kernels, // Kernel basis functions - const poisConfig *config // Configuration +void poisAddPenalty(psImage *matrix, // The matrix + psVector *vector, // The vector + float penalty, // Penalty value + const psArray *kernels, // Kernel basis functions + const poisConfig *config // Configuration ) { @@ -25,31 +41,31 @@ for (int j = 0; j < numKernels; j++) { - poisKernelBasis *kernel = kernels->data[j]; - if (kernel->xOrder == 0 && kernel->yOrder == 0) { - for (int k = j + 1; k < numKernels; k++) { - poisKernelBasis *compare = kernels->data[k]; - if (compare->xOrder == 0 && compare->yOrder == 0 && - (compare->u == kernel->u + 1 || compare->u == kernel->u - 1 || - compare->v == kernel->v + 1 || compare->v == kernel->v - 1)) { - matrix->data.F64[j][k] -= penalty; - matrix->data.F64[k][j] -= penalty; - } - } - } - - if (abs(kernel->u) == config->xKernel) { - if (abs(kernel->v) == config->yKernel) { - vector->data.F64[j] -= 3.0 * penalty; - } else { - vector->data.F64[j] -= 5.0 * penalty; - } - } else { - if (abs(kernel->v) == config->yKernel) { - vector->data.F64[j] -= 5.0 * penalty; - } else { - vector->data.F64[j] -= 8.0 * penalty; - } - } - + poisKernelBasis *kernel = kernels->data[j]; + if (kernel->xOrder == 0 && kernel->yOrder == 0) { + for (int k = j + 1; k < numKernels; k++) { + poisKernelBasis *compare = kernels->data[k]; + if (compare->xOrder == 0 && compare->yOrder == 0 && + (compare->u == kernel->u + 1 || compare->u == kernel->u - 1 || + compare->v == kernel->v + 1 || compare->v == kernel->v - 1)) { + matrix->data.F64[j][k] -= penalty; + matrix->data.F64[k][j] -= penalty; + } + } + } + + if (abs(kernel->u) == config->xKernel) { + if (abs(kernel->v) == config->yKernel) { + vector->data.F64[j] -= 3.0 * penalty; + } else { + vector->data.F64[j] -= 5.0 * penalty; + } + } else { + if (abs(kernel->v) == config->yKernel) { + vector->data.F64[j] -= 5.0 * penalty; + } else { + vector->data.F64[j] -= 8.0 * penalty; + } + } + } Index: trunk/pois/src/poisCalculateDeviations.c =================================================================== --- trunk/pois/src/poisCalculateDeviations.c (revision 8077) +++ trunk/pois/src/poisCalculateDeviations.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisCalculateEquation.c =================================================================== --- trunk/pois/src/poisCalculateEquation.c (revision 8077) +++ trunk/pois/src/poisCalculateEquation.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisCheckKernel.c =================================================================== --- trunk/pois/src/poisCheckKernel.c (revision 8077) +++ trunk/pois/src/poisCheckKernel.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include "pslib.h" Index: trunk/pois/src/poisConvolveImage.c =================================================================== --- trunk/pois/src/poisConvolveImage.c (revision 8077) +++ trunk/pois/src/poisConvolveImage.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisExtractKernel.c =================================================================== --- trunk/pois/src/poisExtractKernel.c (revision 8077) +++ trunk/pois/src/poisExtractKernel.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisFindStamps.c =================================================================== --- trunk/pois/src/poisFindStamps.c (revision 8077) +++ trunk/pois/src/poisFindStamps.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisKernelBasisFunctions.c =================================================================== --- trunk/pois/src/poisKernelBasisFunctions.c (revision 8077) +++ trunk/pois/src/poisKernelBasisFunctions.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisMakeMask.c =================================================================== --- trunk/pois/src/poisMakeMask.c (revision 8077) +++ trunk/pois/src/poisMakeMask.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include @@ -7,8 +23,8 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) -psImage *poisMakeMask(psImage *mask, // Mask to update, or NULL - const psImage *refImage, // Reference image - const psImage *inImage, // Input image - const poisConfig *config // Configuration +psImage *poisMakeMask(psImage *mask, // Mask to update, or NULL + const psImage *refImage, // Reference image + const psImage *inImage, // Input image + const poisConfig *config // Configuration ) { @@ -20,6 +36,6 @@ assert(config); - int nx = config->xImage; // Size in x - int ny = config->yImage; // Size in y + int nx = config->xImage; // Size in x + int ny = config->yImage; // Size in y psTrace("pois.makeMask", 5, "Creating mask: %dx%d\n", nx, ny); @@ -27,35 +43,35 @@ // Allocate the mask image, if necessary if (mask == NULL) { - mask = psImageAlloc(nx, ny, PS_TYPE_U8); - // Initialise to zero - for (int j = 0; j < ny; j++) { - for (int i = 0; i < nx; i++) { - mask->data.U8[j][i] = POIS_MASK_OK; - } - } + mask = psImageAlloc(nx, ny, PS_TYPE_U8); + // Initialise to zero + for (int j = 0; j < ny; j++) { + for (int i = 0; i < nx; i++) { + mask->data.U8[j][i] = POIS_MASK_OK; + } + } } // Iterate over the images for (int y = config->yKernel; y < ny - config->yKernel; y++) { - for (int x = config->xKernel; x < nx - config->xKernel; x++) { - // Mask all around something that's saturated in the reference, since it gets convolved - // But only mask single pixel in the input image, since it doesn't get convolved - if (refImage->data.F32[y][x] >= config->refSat || refImage->data.F32[y][x] <= config->refBad || - isnan(refImage->data.F32[y][x])) { - mask->data.U8[y][x] |= POIS_MASK_BAD; - int xlow = MAX(0, x - config->xKernel); - int xhigh = MIN(nx, x + config->xKernel); - int ylow = MAX(0, y - config->yKernel); - int yhigh = MIN(ny, y + config->yKernel); - for (int v = ylow; v <= yhigh; v++) { - for (int u = xlow; u <= xhigh; u++) { - mask->data.U8[v][u] |= POIS_MASK_NEAR_BAD; - } - } - } else if (inImage->data.F32[y][x] >= config->inSat || inImage->data.F32[y][x] <= config->inBad || - isnan(inImage->data.F32[y][x])) { - mask->data.U8[y][x] |= POIS_MASK_BAD; - } - } + for (int x = config->xKernel; x < nx - config->xKernel; x++) { + // Mask all around something that's saturated in the reference, since it gets convolved + // But only mask single pixel in the input image, since it doesn't get convolved + if (refImage->data.F32[y][x] >= config->refSat || refImage->data.F32[y][x] <= config->refBad || + isnan(refImage->data.F32[y][x])) { + mask->data.U8[y][x] |= POIS_MASK_BAD; + int xlow = MAX(0, x - config->xKernel); + int xhigh = MIN(nx, x + config->xKernel); + int ylow = MAX(0, y - config->yKernel); + int yhigh = MIN(ny, y + config->yKernel); + for (int v = ylow; v <= yhigh; v++) { + for (int u = xlow; u <= xhigh; u++) { + mask->data.U8[v][u] |= POIS_MASK_NEAR_BAD; + } + } + } else if (inImage->data.F32[y][x] >= config->inSat || inImage->data.F32[y][x] <= config->inBad || + isnan(inImage->data.F32[y][x])) { + mask->data.U8[y][x] |= POIS_MASK_BAD; + } + } } Index: trunk/pois/src/poisMaskOps.c =================================================================== --- trunk/pois/src/poisMaskOps.c (revision 8077) +++ trunk/pois/src/poisMaskOps.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + /* * Some utility routines that should be in psLib @@ -8,6 +24,6 @@ #include "pois.h" -psImage *poisImageSetVal(psImage *restrict in, // Input image - const psC64 val // set to this value +psImage *poisImageSetVal(psImage *restrict in, // Input image + const psC64 val // set to this value ) { @@ -16,31 +32,31 @@ switch (in->type.type) { case PS_TYPE_U8: - { - const int numCols = in->numCols; - psU8 *row0 = in->data.U8[0]; - for (int c = 0; c < numCols; c++) { - row0[c] = val; - } - for (int r = 1; r < in->numRows; r++) { - memcpy(in->data.U8[r], row0, numCols*sizeof(psU8)); - } - } - break; + { + const int numCols = in->numCols; + psU8 *row0 = in->data.U8[0]; + for (int c = 0; c < numCols; c++) { + row0[c] = val; + } + for (int r = 1; r < in->numRows; r++) { + memcpy(in->data.U8[r], row0, numCols*sizeof(psU8)); + } + } + break; case PS_TYPE_F32: - { - const int numCols = in->numCols; - psF32 *row0 = in->data.F32[0]; - for (int c = 0; c < numCols; c++) { - row0[c] = val; - } - for (int r = 1; r < in->numRows; r++) { - memcpy(in->data.F32[r], row0, numCols*sizeof(psF32)); - } - } - break; + { + const int numCols = in->numCols; + psF32 *row0 = in->data.F32[0]; + for (int c = 0; c < numCols; c++) { + row0[c] = val; + } + for (int r = 1; r < in->numRows; r++) { + memcpy(in->data.F32[r], row0, numCols*sizeof(psF32)); + } + } + break; default: - psError(POIS_ERR_UNSUPPORTED_TYPE, true, - "Type %d is not supported", in->type.type); - return NULL; + psError(POIS_ERR_UNSUPPORTED_TYPE, true, + "Type %d is not supported", in->type.type); + return NULL; } @@ -48,9 +64,9 @@ } -psImage *poisImageSetValInMask(psImage *out, // Image to update, or NULL - const psImage *restrict in, // Input image - const psImage *mask, // mask for image - const psC64 val, // set to this value - const unsigned long bits // set pixels where mask & bits != 0 +psImage *poisImageSetValInMask(psImage *out, // Image to update, or NULL + const psImage *restrict in, // Input image + const psImage *mask, // mask for image + const psC64 val, // set to this value + const unsigned long bits // set pixels where mask & bits != 0 ) { @@ -65,26 +81,26 @@ // Allocate the output image, if necessary if (out == NULL) { - out = psImageCopy(NULL, in, in->type.type); + out = psImageCopy(NULL, in, in->type.type); } switch (in->type.type) { case PS_TYPE_F32: - { - const int numCols = in->numCols; - for (int r = 0; r < in->numRows; r++) { - psF32 *row = out->data.F32[r]; // n.b. a copy of in - psU8 *mrow = mask->data.U8[r]; - for (int c = 0; c < numCols; c++) { - if (mrow[c] & bits) { - row[c] = val; - } - } - } - } - break; + { + const int numCols = in->numCols; + for (int r = 0; r < in->numRows; r++) { + psF32 *row = out->data.F32[r]; // n.b. a copy of in + psU8 *mrow = mask->data.U8[r]; + for (int c = 0; c < numCols; c++) { + if (mrow[c] & bits) { + row[c] = val; + } + } + } + } + break; default: - psError(POIS_ERR_UNSUPPORTED_TYPE, true, - "Type %d is not supported", in->type.type); - return NULL; + psError(POIS_ERR_UNSUPPORTED_TYPE, true, + "Type %d is not supported", in->type.type); + return NULL; } Index: trunk/pois/src/poisParseConfig.c =================================================================== --- trunk/pois/src/poisParseConfig.c (revision 8077) +++ trunk/pois/src/poisParseConfig.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include @@ -7,31 +23,31 @@ { fprintf (stderr, "POIS: Pan-STARRS (or Pricey's) Optimal Image Subtraction\n" - "Usage: pois [-h] [-v] [-k X Y] [-t T] [-s S1 S2] [-b B1 B2] [-B BG] [-o N] [-n NSTAMPS] [-S STAMPS] [-i ITER] [-r REJ] [-m] REF IN OUT\n" - "where\n" - "\t-h Help (this info)\n" - "\t-v Increase verbosity level\n" - "\t-k X Y Kernel half-size in x and y (5)\n" - "\t-t T Threshold for stamps on reference image (0)\n" - "\t-s S1 S2 Saturation level for reference (S1) and input (S2) (50000)\n" - "\t-b B1 B2 Bad level for both images (0)\n" - "\t-B BG Level to add to background to get above zero (0)\n" - "\t-o ORDER Order of spatial variations in the kernel (0)\n" - "\t-n NSTAMPS Number of stamps in each dimension (5)\n" - "\t-S STAMPS File from which to read stamps\n" - "\t-R Reverse the sense of the subtraction (REF - IN)\n" - "\t-i ITER Number of rejection iterations (10)\n" - "\t-r REJ Rejection level in standard deviations (2.5)\n" - "\t-m Output mask frame (OUT.mask)\n" - "\tREF Reference image\n" - "\tIN Input image (to be matched to REF)\n" - "\tOUT Output image\n" - ); + "Usage: pois [-h] [-v] [-k X Y] [-t T] [-s S1 S2] [-b B1 B2] [-B BG] [-o N] [-n NSTAMPS] [-S STAMPS] [-i ITER] [-r REJ] [-m] REF IN OUT\n" + "where\n" + "\t-h Help (this info)\n" + "\t-v Increase verbosity level\n" + "\t-k X Y Kernel half-size in x and y (5)\n" + "\t-t T Threshold for stamps on reference image (0)\n" + "\t-s S1 S2 Saturation level for reference (S1) and input (S2) (50000)\n" + "\t-b B1 B2 Bad level for both images (0)\n" + "\t-B BG Level to add to background to get above zero (0)\n" + "\t-o ORDER Order of spatial variations in the kernel (0)\n" + "\t-n NSTAMPS Number of stamps in each dimension (5)\n" + "\t-S STAMPS File from which to read stamps\n" + "\t-R Reverse the sense of the subtraction (REF - IN)\n" + "\t-i ITER Number of rejection iterations (10)\n" + "\t-r REJ Rejection level in standard deviations (2.5)\n" + "\t-m Output mask frame (OUT.mask)\n" + "\tREF Reference image\n" + "\tIN Input image (to be matched to REF)\n" + "\tOUT Output image\n" + ); } poisConfig *poisParseConfig(int argc, // Number of command-line arguments - char **argv // Command-line arguments + char **argv // Command-line arguments ) { - poisConfig *config; // Configuration values + poisConfig *config; // Configuration values /* Variables for getopt */ @@ -68,11 +84,11 @@ while ((opt = getopt(argc, argv, "hvRmk:f:q:t:s:o:b:B:n:i:r:p:S:")) != -1) { switch (opt) { - case 'h': - help(); - exit(EXIT_SUCCESS); - case 'v': + case 'h': + help(); + exit(EXIT_SUCCESS); + case 'v': config->verbose++; break; - case 'k': + case 'k': if ((sscanf(argv[optind-1], "%d", &config->xKernel) != 1) || (sscanf(argv[optind++], "%d", &config->yKernel) != 1)) { @@ -84,18 +100,18 @@ exit(EXIT_FAILURE); } - break; - case 'f': - if (sscanf(optarg, "%d", &config->footprint) != 1) { - help(); - exit(EXIT_FAILURE); - } - break; - case 't': - if (sscanf(optarg, "%f", &config->threshold) != 1) { - help(); - exit(EXIT_FAILURE); - } - break; - case 's': + break; + case 'f': + if (sscanf(optarg, "%d", &config->footprint) != 1) { + help(); + exit(EXIT_FAILURE); + } + break; + case 't': + if (sscanf(optarg, "%f", &config->threshold) != 1) { + help(); + exit(EXIT_FAILURE); + } + break; + case 's': if ((sscanf(argv[optind-1], "%f", &config->refSat) != 1) || (sscanf(argv[optind++], "%f", &config->inSat) != 1)) { @@ -107,12 +123,12 @@ exit(EXIT_FAILURE); } - break; - case 'o': - if (sscanf(optarg, "%d", &config->spatialOrder) != 1) { - help(); - exit(EXIT_FAILURE); - } - break; - case 'b': + break; + case 'o': + if (sscanf(optarg, "%d", &config->spatialOrder) != 1) { + help(); + exit(EXIT_FAILURE); + } + break; + case 'b': if ((sscanf(argv[optind-1], "%f", &config->refBad) != 1) || (sscanf(argv[optind++], "%f", &config->inBad) != 1)) { @@ -124,49 +140,49 @@ exit(EXIT_FAILURE); } - break; - case 'B': - if (sscanf(optarg, "%f", &config->background) != 1) { - help(); - exit(EXIT_FAILURE); - } - break; - case 'n': + break; + case 'B': + if (sscanf(optarg, "%f", &config->background) != 1) { + help(); + exit(EXIT_FAILURE); + } + break; + case 'n': if (sscanf(argv[optind-1], "%d", &config->nsx) != 1) { help(); exit(EXIT_FAILURE); } - config->nsy = config->nsx; - break; - case 'i': + config->nsy = config->nsx; + break; + case 'i': if (sscanf(argv[optind-1], "%d", &config->numIter) != 1) { help(); exit(EXIT_FAILURE); } - break; - case 'r': + break; + case 'r': if (sscanf(argv[optind-1], "%f", &config->sigmaRej) != 1) { help(); exit(EXIT_FAILURE); } - break; - case 'p': + break; + case 'p': if (sscanf(argv[optind-1], "%f", &config->penalty) != 1) { help(); exit(EXIT_FAILURE); } - break; - case 'S': - config->stampFile = argv[optind-1]; - config->threshold = -INFINITY; - break; - case 'R': - config->reverse = true; - break; - case 'm': + break; + case 'S': + config->stampFile = argv[optind-1]; + config->threshold = -INFINITY; + break; + case 'R': + config->reverse = true; + break; + case 'm': config->mask = true; break; - default: - help(); - } + default: + help(); + } } Index: trunk/pois/src/poisReadStamps.c =================================================================== --- trunk/pois/src/poisReadStamps.c (revision 8077) +++ trunk/pois/src/poisReadStamps.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include "pslib.h" Index: trunk/pois/src/poisRejectStamps.c =================================================================== --- trunk/pois/src/poisRejectStamps.c (revision 8077) +++ trunk/pois/src/poisRejectStamps.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisSolveEquation.c =================================================================== --- trunk/pois/src/poisSolveEquation.c (revision 8077) +++ trunk/pois/src/poisSolveEquation.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include Index: trunk/pois/src/poisStamp.c =================================================================== --- trunk/pois/src/poisStamp.c (revision 8077) +++ trunk/pois/src/poisStamp.c (revision 8480) @@ -1,2 +1,18 @@ +// Copyright (C) 2006 Paul A. Price (price@ifa.hawaii.edu) +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #include #include "pslib.h" @@ -19,8 +35,8 @@ { if (stamp->matrix) { - psFree(stamp->matrix); + psFree(stamp->matrix); } if (stamp->vector) { - psFree(stamp->vector); + psFree(stamp->vector); } psFree(stamp); @@ -30,31 +46,31 @@ // Return true if the stamp is OK bool poisCheckStamp(const psImage *image, // Image to check for threshold - const psImage *mask, // Mask to check for bad pixels - int x, int y, // Pixel coordinates - const poisConfig *config // Configuration + const psImage *mask, // Mask to check for bad pixels + int x, int y, // Pixel coordinates + const poisConfig *config // Configuration ) { if (x < config->footprint + config->xKernel || - y < config->footprint + config->yKernel || - x > config->xImage - config->footprint - config->xKernel || - y > config->yImage - config->footprint - config->yKernel || - image->data.F32[y][x] < config->threshold) { - psTrace("pois.checkStamp", 9, "Rejecting stamp at %d,%d (border/threshold)\n", x, y); - return false; + y < config->footprint + config->yKernel || + x > config->xImage - config->footprint - config->xKernel || + y > config->yImage - config->footprint - config->yKernel || + image->data.F32[y][x] < config->threshold) { + psTrace("pois.checkStamp", 9, "Rejecting stamp at %d,%d (border/threshold)\n", x, y); + return false; } // Check the footprint - bool ok = true; // Is the footprint OK? - int footprint = config->footprint; // Footprint size + bool ok = true; // Is the footprint OK? + int footprint = config->footprint; // Footprint size for (int v = y - footprint; v <= y + footprint && ok; v++) { - for (int u = x - footprint; u <= x + footprint && ok; u++) { - if (mask->data.U8[v][u] & - (POIS_MASK_BAD | POIS_MASK_NEAR_BAD | POIS_MASK_STAMP)) { - psTrace("pois.checkStamp", 9, "Rejecting stamp at %d,%d (bad footprint)\n", x, y); - ok = false; - } - } + for (int u = x - footprint; u <= x + footprint && ok; u++) { + if (mask->data.U8[v][u] & + (POIS_MASK_BAD | POIS_MASK_NEAR_BAD | POIS_MASK_STAMP)) { + psTrace("pois.checkStamp", 9, "Rejecting stamp at %d,%d (bad footprint)\n", x, y); + ok = false; + } + } } - + return ok; }