Index: branches/eam_branches/20091201/psModules/src/objects/pmObjects.c =================================================================== --- branches/eam_branches/20091201/psModules/src/objects/pmObjects.c (revision 26505) +++ (revision ) @@ -1,25 +1,0 @@ -/** @file pmObjects.c - * - * This file will ... - * - * @author GLG, MHPCC - * @author EAM, IfA: significant modifications. - * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-09-15 09:49:01 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include "pmObjects.h" -#include "pmModelGroup.h" - Index: branches/eam_branches/20091201/psModules/src/objects/pmObjects.h =================================================================== --- branches/eam_branches/20091201/psModules/src/objects/pmObjects.h (revision 26505) +++ (revision ) @@ -1,68 +1,0 @@ -/* @file pmObjects.h - * - * The process of finding, measuring, and classifying astronomical sources on - * images is one of the critical tasks of the IPP or any astronomical software - * system. This file will define structures and functions related to the task - * of source detection and measurement. The elements defined in this section - * are generally low-level components which can be connected together to - * construct a complete object measurement suite. - * - * @author GLG, MHPCC - * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-24 02:54:15 $ - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - -#ifndef PM_OBJECTS_H -#define PM_OBJECTS_H - -/// @addtogroup Objects Object Detection / Analysis Functions -/// @{ - -#include -#include -#include - -/** - * - * This function converts the source classification into the closest available - * approximation to the Dophot classification scheme: - * XXX EAM : fix this to use current source classification scheme - * - * PM_SOURCE_DEFECT: 8 - * PM_SOURCE_SATURATED: 8 - * PM_SOURCE_SATSTAR: 10 - * PM_SOURCE_PSFSTAR: 1 - * PM_SOURCE_GOODSTAR: 1 - * PM_SOURCE_POOR_FIT_PSF: 7 - * PM_SOURCE_FAIL_FIT_PSF: 4 - * PM_SOURCE_FAINTSTAR: 4 - * PM_SOURCE_GALAXY: 2 - * PM_SOURCE_FAINT_GALAXY: 2 - * PM_SOURCE_DROP_GALAXY: 2 - * PM_SOURCE_FAIL_FIT_GAL: 2 - * PM_SOURCE_POOR_FIT_GAL: 2 - * PM_SOURCE_OTHER: ? - * - */ -int pmSourceDophotType( - pmSource *source ///< Add comment. -); - - -/** pmSourceSextractType() - * - * This function converts the source classification into the closest available - * approximation to the Sextractor classification scheme. the correspondence is - * not yet defined (TBD) . - * - * XXX: Must code this. - * - */ -int pmSourceSextractType( - pmSource *source ///< Add comment. -); - -/// @} -#endif Index: branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.c =================================================================== --- branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.c (revision 26523) +++ branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.c (revision 26523) @@ -0,0 +1,39 @@ +/** @file pmPhotObj.c + * + * @author EAM, IfA + * + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-09-15 09:49:01 $ + * Copyright 2009 Institute for Astronomy, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include "pmPhotObj.h" + +static void pmPhotObjFree (pmPhotObj *tmp) +{ + if (!tmp) return; + psFree(tmp->sources); +} + + +pmPhotObj *pmPhotObjAlloc() +{ + static int id = 1; + pmPhotObj *obj = (pmPhotObj *) psAlloc(sizeof(pmPhotObj)); + psMemSetDeallocator(obj, (psFreeFunc) pmPhotObjFree); + + *(int *)&obj->id = id; // cast away the const to set the id. + id++; + + obj->sources = NULL; + return obj; +} + Index: branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.h =================================================================== --- branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.h (revision 26523) +++ branches/eam_branches/20091201/psModules/src/objects/pmPhotObj.h (revision 26523) @@ -0,0 +1,41 @@ +/* @file pmPhotObj.h + * + * @author EAM, IfA + * + * @version $Revision: $ + * @date $Date: 2009-02-16 22:30:50 $ + * Copyright 2009 Institute for Astronomy, University of Hawaii + */ + +# ifndef PM_PHOT_OBJ_H +# define PM_PHOT_OBJ_H + +#include +#include "pmPeaks.h" +#include "pmModel.h" +#include "pmMoments.h" + +/// @addtogroup Objects Object Detection / Analysis Functions +/// @{ + + +/** pmPhotObj data structure + * + * A Photometry Object is a connected set of source measurements with a common + * connection. Each source that comprises the object represents the detection of some + * astronomical object on a single image. The object represents the related collection + * of measurements. The fits are coupled in some way. For example, they may all have + * the same position, but independent fluxes. Or, they may have a common set of + * positions and shape parameters. Or the position in each image may be related by a + * function. + * + * XXX is thre any info that is neaded for each object beyond that carried by the sources + * (besides ID)? + */ +typedef struct { + int seq; ///< ID for output (generated on write OR set on read) + psArray *sources; +} pmPhotObj; + +/// @} +# endif /* PM_PHOT_OBJ_H */ Index: branches/eam_branches/20091201/psModules/src/objects/pmSource.c =================================================================== --- branches/eam_branches/20091201/psModules/src/objects/pmSource.c (revision 26505) +++ branches/eam_branches/20091201/psModules/src/objects/pmSource.c (revision 26523) @@ -3,12 +3,10 @@ * Functions to define and manipulate sources on images * - * @author GLG, MHPCC - * @author EAM, IfA: significant modifications. + * @author EAM, IfA + * @author GLG, MHPCC (initial code base) * * @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ * @date $Date: 2009-02-16 22:29:59 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - * + * Copyright 2009 Institute for Astronomy, University of Hawaii */