Changeset 3777

Timestamp:

Apr 27, 2005, 11:37:54 AM (21 years ago)

Author:

eugene

Message:

final for cycle 6

Location:

trunk/doc/modules

Files:

• ChangeLogSDRS.tex (modified) (6 diffs)
• ModulesSDRS.tex (modified) (7 diffs)

trunk/doc/modules/ChangeLogSDRS.tex

@@ -1 @@
-%%% $Id: ChangeLogSDRS.tex,v 1.17 2005-04-21 23:57:12 price Exp $
+%%% $Id: ChangeLogSDRS.tex,v 1.18 2005-04-27 21:37:54 eugene Exp $
 
-\subsection{Changes from version 00 to version 01}
+\subsection{Changes from version 00 (16 August 2004) to version 01 (12 October 2004)}
 
 \begin{itemize}
@@ -12 +12 @@
 \end{itemize}
 
-\subsection{Changes from version 01 to version 02}
+\subsection{Changes from version 01 (12 October 2004) to version 02 (30 November 2004)}
 
 \begin{itemize}
@@ -29 +29 @@
 \end{itemize}
 
-\subsection{Changes from version 02 to version 03}
+\subsection{Changes from version 02 (30 November 2004) to version 03 (21 January 2005) }
 
 \begin{itemize}
@@ -39 +39 @@
 \end{itemize}
 
-\subsection{Changes from version 03 to version 04}
+\subsection{Changes from version 03 (21 January 2005) to version 04 (14 February 2005)}
 
 \begin{itemize}
@@ -49 +49 @@
 \end{itemize}
 
-\subsection{Changes from version 04 to version 05 (15 March 2005)}
+\subsection{Changes from version 04 (14 February 2005) to version 05 (21 March 2005)}
 
 \begin{itemize}
@@ -56 +56 @@
 \end{itemize}
 
-\subsection{Changes from version 04 to version 06 (Present)}
+\subsection{Changes from version 05 (21 March 2005) to version 06 (27 April 2005)}
 
 \begin{itemize}
+\item changed \code{pmFindImagePeaks} to return an array, not a list
+\item replaced \code{pmCullPeaks} with \code{pmPeaksSubset} which returns a new array
+\item changed \code{pmModel} to use vectors for params and dparms.
+\item added nDOF and nIter to pmModel
+\item changed models to return psF64, not psF32, to match psMinimizeLMChi2Func
 \end{itemize}

trunk/doc/modules/ModulesSDRS.tex

@@ -1 @@
-%%% $Id: ModulesSDRS.tex,v 1.38 2005-04-22 01:33:25 price Exp $
+%%% $Id: ModulesSDRS.tex,v 1.39 2005-04-27 21:37:54 eugene Exp $
 \documentclass[panstarrs]{panstarrs}
 
@@ -11 +11 @@
 \project{Pan-STARRS Image Processing Pipeline}
 \organization{Institute for Astronomy}
-\version{04}
+\version{06}
 \docnumber{PSDC-430-012}
 
@@ -32 +32 @@
 03 & 2005 Jan 21 & draft for cycle 5 \\ \hline
 04 & 2005 Feb 14 & final for cycle 5 \\ \hline
+05 & 2005 Mar 21 & draft for cycle 6 \\ \hline
+06 & 2005 Apr 27 & final for cycle 6 \\ \hline
 \RevisionsEnd
 
@@ -1175 +1177 @@
 typedef struct {
   pmObjectModel type;       // model to be used
-  int Nparams;              // number of parameters
-  float *params;            // parameter values
-  float *dparams;           // parameter errors
-  float chisq;              // fit chisq
+  psVector *params;            // parameter values
+  psVector *dparams;           // parameter errors
+  psF32 chisq;              // fit chisq
+  psS32 nDOF;           // number of degrees of freedom
+  psS32 nIter;          // number of iterations
 } pmModel;
 \end{verbatim}
@@ -1253 +1256 @@
 
 \begin{verbatim}
-psList *pmFindImagePeaks(const psImage *image, float threshold);
+psArray *pmFindImagePeaks(const psImage *image, float threshold);
 \end{verbatim}
 
@@ -1259 +1262 @@
 This function should find all row peaks using
 \code{pmFindVectorPeaks}, then test each row peak and exclude peaks
-which are not local peaks.  A peak is a local peak if it has a higher value
-than all 8 neighbors.  If the peak has the same value as its +y
+which are not local peaks.  A peak is a local peak if it has a higher
+value than all 8 neighbors.  If the peak has the same value as its +y
 neighbor or +x neighbor, it is NOT a local peak.  If any other
 neighbors have an equal value, the peak is considered a valid peak.
@@ -1267 +1270 @@
 making flat-topped regions have single peaks at the (+x,+y) corner.
 When selecting the peaks, their type must also be set.  The result of
-this function is a list of \code{pmPeak} entries.
-
-\begin{verbatim}
-psList *pmCullPeaks(psList *peaks, float maxvalue, const psRegion *valid);
-\end{verbatim}
-
-Remove certain types of peaks from a list of peaks based on the given
-criteria.  Peaks should be eliminated if they have a peak value above
-the given maximum value limit or if the fall outside the valid
-region.  The result of the function is to reduce the number of peaks
-in the input peaks list, and return the resulting list. 
+this function is an array of \code{pmPeak} entries.
+
+\begin{verbatim}
+psArray *pmPeaksSubset(psArray *peaks, float maxvalue, const psRegion *valid);
+\end{verbatim}
+
+Create a new peaks array, removing certain types of peaks from the
+input array of peaks based on the given criteria.  Peaks should be
+eliminated if they have a peak value above the given maximum value
+limit or if the fall outside the valid region.  The result of the
+function is a new array with a reduced number of peaks.
 
 \begin{verbatim}