Index: /trunk/psphot/doc/notes.txt
===================================================================
--- /trunk/psphot/doc/notes.txt	(revision 4982)
+++ /trunk/psphot/doc/notes.txt	(revision 4983)
@@ -7,4 +7,7 @@
   pmObjects.[ch] files.  I need to minimize the difference between the
   v0.7.0, v0.5.0, and my own version of pmObjects.c
+
+  additions to psLib based on the new version:
+  - extended the minimization to include parameter limits
 
   changes v0.5.0 / v0.7.0 / EAM
@@ -62,4 +65,5 @@
     the psImageMaskRegion, etc functions.
   - pmSourceSetPixelsCircle uses a hard-coded mask value
+  - define a mask registration process??
   - pmSourceContour is using the model flux, not the image flux
 
Index: /trunk/psphot/src/pmObjects_EAM.h
===================================================================
--- /trunk/psphot/src/pmObjects_EAM.h	(revision 4982)
+++ /trunk/psphot/src/pmObjects_EAM.h	(revision 4983)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-08 04:32:40 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-09 18:31:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -125,22 +125,22 @@
  */
 typedef enum {
-    PS_SOURCE_DEFECT,
-    PS_SOURCE_SATURATED,
-
-    PS_SOURCE_SATSTAR,
-    PS_SOURCE_PSFSTAR,
-    PS_SOURCE_GOODSTAR,
-
-    PS_SOURCE_POOR_FIT_PSF,
-    PS_SOURCE_FAIL_FIT_PSF,
-    PS_SOURCE_FAINTSTAR,
-
-    PS_SOURCE_GALAXY,
-    PS_SOURCE_FAINT_GALAXY,
-    PS_SOURCE_DROP_GALAXY,
-    PS_SOURCE_FAIL_FIT_GAL,
-    PS_SOURCE_POOR_FIT_GAL,
-
-    PS_SOURCE_OTHER,
+    PM_SOURCE_DEFECT,
+    PM_SOURCE_SATURATED,
+
+    PM_SOURCE_SATSTAR,
+    PM_SOURCE_PSFSTAR,
+    PM_SOURCE_GOODSTAR,
+
+    PM_SOURCE_POOR_FIT_PSF,
+    PM_SOURCE_FAIL_FIT_PSF,
+    PM_SOURCE_FAINTSTAR,
+
+    PM_SOURCE_GALAXY,
+    PM_SOURCE_FAINT_GALAXY,
+    PM_SOURCE_DROP_GALAXY,
+    PM_SOURCE_FAIL_FIT_GAL,
+    PM_SOURCE_POOR_FIT_GAL,
+
+    PM_SOURCE_OTHER,
 } pmSourceType;
 
Index: /trunk/psphot/src/psLibUtils.h
===================================================================
--- /trunk/psphot/src/psLibUtils.h	(revision 4982)
+++ /trunk/psphot/src/psLibUtils.h	(revision 4983)
@@ -30,32 +30,30 @@
 
 // psLib extra utilities
-bool 	     psTimerStart (char *name);
-void 	     psTimerFree ();
-bool 	     psTimerClear (char *name);
-psF64 	     psTimerMark (char *name);
-psS32 	     psLogArguments (int *argc, char **argv);
-psS32 	     psTraceArguments (int *argc, char **argv);
-int	     psArgumentGet (int argc, char **argv, char *arg);
-int	     psArgumentRemove (int N, int *argc, char **argv);
-psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type);
-psVector    *psGetRowVectorFromImage(psImage *image, psU32 row);
-int          psImageCountPixelMask (psImage *mask, psU8 value);
+bool 	     psTimerStart (char *name);   // added to SDRS
+bool 	     psTimerClear (char *name);   // added to SDRS 
+psF64 	     psTimerMark (char *name);    // added to SDRS
+void 	     psTimerFree ();              // added to SDRS (as psTimerStop)
+psS32 	     psLogArguments (int *argc, char **argv);   // added to SDRS (part of psArgumentVerbosity)
+psS32 	     psTraceArguments (int *argc, char **argv); // added to SDRS (part of psArgumentVerbosity)
+int	     psArgumentGet (int argc, char **argv, char *arg); // added to SDRS
+int	     psArgumentRemove (int N, int *argc, char **argv); // added to SDRS
+psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type); // added to SDRS
+psVector    *psGetRowVectorFromImage(psImage *image, psU32 row); // added to SDRS (as psImageRow)
+int          psImageCountPixelMask (psImage *mask, psU8 value); // added to SDRS
 
 // basic image functions
-bool         psImageInit (psImage *image,...);
-void	     psImageSmooth_EAM (psImage *image, float sigma, float Nsigma);
+bool         psImageInit (psImage *image,...); // added to SDRS (v.15)
+void	     psImageSmooth_EAM (psImage *image, float sigma, float Nsigma); // added to SDRS (v.15)
 
-// psLine functions
+// psLine functions -- keep out for now?
 psLine      *psLineAlloc (int Nline);
 bool	     psLineInit (psLine *line);
 bool	     psLineAdd (psLine *line, char *format, ...);
 
-// not included in the .h file?
+// not included in the .h file -- these are fairly lame, keep out?
 bool p_psVectorPrint (int fd, psVector *a, char *name);
-
-// not included in the .h file?
 bool p_psVectorPrintRow (int fd, psVector *a, char *name);
 
-// polynomial functions
+// polynomial functions -- all in SDRS, not done for v.15
 psPolynomial1D *Polynomial1DAlloc_EAM(psPolynomialType type, psS32 nOrder);
 void	        Polynomial1DDump_EAM(psPolynomial1D *poly);
Index: /trunk/psphot/src/psModulesUtils.h
===================================================================
--- /trunk/psphot/src/psModulesUtils.h	(revision 4982)
+++ /trunk/psphot/src/psModulesUtils.h	(revision 4983)
@@ -17,4 +17,5 @@
 bool	     pmSourcePhotometry (float *fitMag, float *obsMag, pmModel *model, psImage *image, psImage *mask);
 
+// unify with paul's image/header/metadata functions
 psF32        pmConfigLookupF32 (bool *status, psMetadata *config, psMetadata *header, char *name);