Changeset 28683 for branches/eam_branches/ipp-20100621/psphot

Timestamp:

Jul 16, 2010, 7:00:45 AM (16 years ago)

Author:

eugene

Message:

some notes on work needed

Location:

branches/eam_branches/ipp-20100621/psphot

Files:

• doc/notes.20100715.txt (added)
• src/Makefile.am (modified) (1 diff)
• src/psphotPSFConvModel.c (modified) (1 diff)

branches/eam_branches/ipp-20100621/psphot/src/Makefile.am

@@ -20 +20 @@
         -$(RM) psphotVersionDefinitions.h
         $(SED) -e "s|@PSPHOT_VERSION@|\"$(PSPHOT_VERSION)\"|" -e "s|@PSPHOT_BRANCH@|\"$(PSPHOT_BRANCH)\"|" -e "s|@PSPHOT_SOURCE@|\"$(PSPHOT_SOURCE)\"|" psphotVersionDefinitions.h.in > psphotVersionDefinitions.h
-# FORCE: ;
+FORCE: ;
 
 libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)

branches/eam_branches/ipp-20100621/psphot/src/psphotPSFConvModel.c

@@ -10 +10 @@
 // modelConv to contain the fitted parameters, and the modelFlux to contain the 
 // convolved model image.
-pmModel *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal, int psfSize) {
+
+// XXX need to generalize this -- number of fitted parameters must be flexible based on the fitOptions
+
+pmModel *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal, int psfSize) {
     
     // maskVal is used to test for rejected pixels, and must include markVal