Index: /trunk/pois/GPL.txt =================================================================== --- /trunk/pois/GPL.txt (revision 8480) +++ /trunk/pois/GPL.txt (revision 8480) @@ -0,0 +1,345 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: /trunk/pois/src/errorCodes-skl.c =================================================================== --- /trunk/pois/src/errorCodes-skl.c (revision 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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 8479) +++ /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; }