Index: /trunk/doc/pslib/psAstroGroup.tex =================================================================== --- /trunk/doc/pslib/psAstroGroup.tex (revision 380) +++ /trunk/doc/pslib/psAstroGroup.tex (revision 381) @@ -37,4 +37,6 @@ float {\bf ps\-Get\-Refraction} (float colour, {\bf ps\-Phot\-System} color\-Plus, {\bf ps\-Phot\-System} color\-Minus, const {\bf ps\-Exposure} $\ast$exp) \begin{CompactList}\small\item\em Estimate atmospheric refraction, along the parallactic.\item\end{CompactList}\item +{\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Parallax\-Factor} (const {\bf ps\-Exposure} $\ast$exp) +\begin{CompactList}\small\item\em Calculate the parallax factor.\item\end{CompactList}\item {\bf ps\-Exposure} $\ast$ {\bf ps\-Exposure\-Alloc} (double ra, double dec, double ha, double zd, double az, double lst, float mjd, float rot\-Angle, float temp, float pressure, float humidity, float exptime) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item @@ -87,6 +89,4 @@ {\bf ps\-Float\-Array} $\ast$ {\bf ps\-Image\-Radial\-Cut} ({\bf ps\-Float\-Array} $\ast$out, const {\bf ps\-Image} $\ast$input, float x, float y, float radius, float dr, const {\bf ps\-Stats} $\ast$stats) \begin{CompactList}\small\item\em Extract radial annulii data to a vector.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Image\-Contour} ({\bf ps\-Float\-Array} $\ast$out, const {\bf ps\-Image} $\ast$input, float threshold, int binning) -\begin{CompactList}\small\item\em Extract a 2-d contour from an image at the given threshold.\item\end{CompactList}\item {\bf ps\-Image} $\ast$ {\bf ps\-Image\-Rebin} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$input, float scale, const {\bf ps\-Stats} $\ast$stats) \begin{CompactList}\small\item\em Rebin image to new scale.\item\end{CompactList}\item @@ -97,5 +97,5 @@ {\bf ps\-Image} $\ast$ {\bf ps\-Image\-Roll} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$input, int dx, int dy) \begin{CompactList}\small\item\em Roll image by an integer number of pixels in either direction.\item\end{CompactList}\item -{\bf ps\-Stats} $\ast$ {\bf ps\-Image\-Get\-Stats} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$input, {\bf ps\-Stats} $\ast$stats) +{\bf ps\-Stats} $\ast$ {\bf ps\-Image\-Get\-Stats} (const {\bf ps\-Image} $\ast$input, {\bf ps\-Stats} $\ast$stats) \begin{CompactList}\small\item\em Determine statistics for image (or subimage).\item\end{CompactList}\item {\bf ps\-Histogram} $\ast$ {\bf ps\-Image\-Histogram} ({\bf ps\-Histogram} $\ast$hist, const {\bf ps\-Image} $\ast$input) @@ -107,21 +107,19 @@ {\bf ps\-Image} $\ast$ {\bf ps\-Image\-Read\-Section} ({\bf ps\-Image} $\ast$output, int x, int y, int nx, int ny, int z, const char $\ast$extname, int extnum, const char $\ast$filename) \begin{CompactList}\small\item\em Read an image or subimage from a named file.\item\end{CompactList}\item -{\bf ps\-Image} $\ast$ {\bf ps\-Image\-FRead\-Section} ({\bf ps\-Image} $\ast$output, int x, int y, int dx, int dy, int z, const char $\ast$extname, int extnum, const FILE $\ast$f) +{\bf ps\-Image} $\ast$ {\bf ps\-Image\-FRead\-Section} ({\bf ps\-Image} $\ast$output, int x, int y, int nx, int ny, int z, const char $\ast$extname, int extnum, FILE $\ast$f) \begin{CompactList}\small\item\em Read an image or subimage from file descriptor.\item\end{CompactList}\item {\bf ps\-Image} $\ast$ {\bf ps\-Image\-Write\-Section} ({\bf ps\-Image} $\ast$input, int x, int y, int z, const char $\ast$extname, int extnum, const char $\ast$filename) \begin{CompactList}\small\item\em Write an image section to named file (which may exist).\item\end{CompactList}\item -{\bf ps\-Image} $\ast$ {\bf ps\-Image\-FWrite\-Section} ({\bf ps\-Image} $\ast$input, int x, int y, int z, const char $\ast$extname, int extnum, const FILE $\ast$f) +{\bf ps\-Image} $\ast$ {\bf ps\-Image\-FWrite\-Section} ({\bf ps\-Image} $\ast$input, int x, int y, int z, const char $\ast$extname, int extnum, FILE $\ast$f) \begin{CompactList}\small\item\em Write an image section to named file (which may exist).\item\end{CompactList}\item ps\-Metadata $\ast$ {\bf ps\-Image\-Read\-Header} (ps\-Metadata $\ast$output, const char $\ast$extname, int extnum, const char $\ast$filename) \begin{CompactList}\small\item\em Read only header from image file.\item\end{CompactList}\item -ps\-Metadata $\ast$ {\bf ps\-Image\-FRead\-Header} (ps\-Metadata $\ast$output, const char $\ast$extname, int extnum, const FILE $\ast$f) +ps\-Metadata $\ast$ {\bf ps\-Image\-FRead\-Header} (ps\-Metadata $\ast$output, const char $\ast$extname, int extnum, FILE $\ast$f) \begin{CompactList}\small\item\em Read only header from image file descriptor.\item\end{CompactList}\item -{\bf ps\-Image} $\ast$ {\bf ps\-Image\-FFT} ({\bf ps\-Image} $\ast$output, const {\bf ps\-Image} $\ast$input, int direction) -\begin{CompactList}\small\item\em Perform an FFT on the image. The output image type is ps\-Complex.\item\end{CompactList}\item int {\bf ps\-Image\-Clip} ({\bf ps\-Image} $\ast$input, float min, float vmin, float max, float vmax) \begin{CompactList}\small\item\em Clip image values outside of range to given values. Return number of clipped pixels.\item\end{CompactList}\item int {\bf ps\-Image\-Clip\-Na\-N} ({\bf ps\-Image} $\ast$input, float value) \begin{CompactList}\small\item\em Clip Na\-N image pixels to given value. Return number of clipped pixels.\item\end{CompactList}\item -int {\bf ps\-Image\-Overlay\-Section} ({\bf ps\-Image} $\ast$image, const {\bf ps\-Image} $\ast$overlay, int x0, int y0, const char $\ast$operator) +int {\bf ps\-Image\-Overlay\-Section} ({\bf ps\-Image} $\ast$image, const {\bf ps\-Image} $\ast$overlay, int x0, int y0, const char $\ast$op) \begin{CompactList}\small\item\em Overlay subregion of image with another image. Return number of pixels replaced.\item\end{CompactList}\item {\bf ps\-Meta\-Data\-Item} $\ast$ {\bf ps\-Meta\-Data\-Item\-Alloc} (int type\-Flags, const void $\ast$val, const char $\ast$comment, const char $\ast$name,...) @@ -130,5 +128,5 @@ \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item {\bf ps\-Meta\-Data\-Set} $\ast$ {\bf ps\-Meta\-Data\-Set\-Alloc} (void) -\begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item +\begin{CompactList}\small\item\em make a new set of metadata\item\end{CompactList}\item void {\bf ps\-Meta\-Data\-Set\-Free} ({\bf ps\-Meta\-Data\-Set} $\ast$ms) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item @@ -145,11 +143,11 @@ void {\bf ps\-Meta\-Data\-Item\-Print} (FILE $\ast$fd, const {\bf ps\-Meta\-Data\-Item} $\ast$restrict ms, const char $\ast$prefix) \begin{CompactList}\small\item\em print metadata item to the specified stream\item\end{CompactList}\item -{\bf ps\-Coord} $\ast$ {\bf ps\-Coord\-Xform\-Apply} ({\bf ps\-Coord\-Xform} $\ast$frame, {\bf ps\-Coord} $\ast$coords) +{\bf ps\-Coord} $\ast$ {\bf ps\-Coord\-Xform\-Apply} ({\bf ps\-Coord} $\ast$out, const {\bf ps\-Coord\-Xform} $\ast$frame, const {\bf ps\-Coord} $\ast$coords) \begin{CompactList}\small\item\em apply the coordinate transformation to the given coordinate\item\end{CompactList}\item -{\bf ps\-Coord} $\ast$ {\bf ps\-Distortion\-Apply} ({\bf ps\-Distortion} $\ast$pattern, {\bf ps\-Coord} $\ast$coords, float mag, float color) +{\bf ps\-Coord} $\ast$ {\bf ps\-Distortion\-Apply} ({\bf ps\-Coord} $\ast$out, const psdistortion $\ast$pattern, const {\bf ps\-Coord} $\ast$coords, float mag, float color) \begin{CompactList}\small\item\em apply the optical distortion to the given coordinate, magnitude, color\item\end{CompactList}\item -{\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Offset} (const {\bf ps\-Coord} $\ast$restrict position1, const {\bf ps\-Coord} $\ast$restrict position2, char $\ast$system) +{\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Offset} (const {\bf ps\-Coord} $\ast$restrict position1, const {\bf ps\-Coord} $\ast$restrict position2, const char $\ast$type) \begin{CompactList}\small\item\em Get offset (RA,Dec) on the sky between two positions position1 and position2 may not be identical.\item\end{CompactList}\item -{\bf ps\-Coord} $\ast$ {\bf ps\-Apply\-Offset} (const {\bf ps\-Coord} $\ast$restrict position, const {\bf ps\-Coord} $\ast$restrict offset, char $\ast$system) +{\bf ps\-Coord} $\ast$ {\bf ps\-Apply\-Offset} (const {\bf ps\-Coord} $\ast$restrict position, const {\bf ps\-Coord} $\ast$restrict offset, const char $\ast$type) \begin{CompactList}\small\item\em Apply an offset to a position.\item\end{CompactList}\item {\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Sun\-Pos} (float mjd) @@ -159,5 +157,5 @@ float {\bf ps\-Get\-Moon\-Phase} (float mjd) \begin{CompactList}\small\item\em Get Moon phase.\item\end{CompactList}\item -{\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Solar\-System\-Pos} (char $\ast$solar\-System\-Object, float mjd) +{\bf ps\-Coord} $\ast$ {\bf ps\-Get\-Solar\-System\-Pos} (const char $\ast$solar\-System\-Object, float mjd) \begin{CompactList}\small\item\em Get Planet positions.\item\end{CompactList}\item {\bf ps\-Coord} $\ast$ {\bf ps\-Coordinates\-Ito\-E} (const {\bf ps\-Coord} $\ast$restrict coordinates) @@ -169,2 +167,3 @@ {\bf ps\-Coord} $\ast$ {\bf ps\-Coordinates\-Gto\-I} (const {\bf ps\-Coord} $\ast$restrict coordinates) \begin{CompactList}\small\item\em Convert Galactic to ICRS.\item\end{CompactList}\end{CompactItemize} + Index: /trunk/doc/pslib/psDataGroup.tex =================================================================== --- /trunk/doc/pslib/psDataGroup.tex (revision 380) +++ /trunk/doc/pslib/psDataGroup.tex (revision 381) @@ -10,18 +10,18 @@ \begin{CompactList}\small\item\em Append to a list.\item\end{CompactList}\item void $\ast$ {\bf ps\-Dlist\-Remove} ({\bf ps\-Dlist} $\ast$list, void $\ast$data, int which) -\begin{CompactList}\small\item\em PS\_\-DLIST\_\-PREV.\item\end{CompactList}\item -void $\ast$ {\bf ps\-Dlist\-Get} (const {\bf ps\-Dlist} $\ast$list, int which) +\begin{CompactList}\small\item\em Remove from a list.\item\end{CompactList}\item +void $\ast$ {\bf ps\-Dlist\-Get} (const {\bf ps\-Dlist} $\ast$list, void $\ast$data, int which) \begin{CompactList}\small\item\em Retrieve from a list.\item\end{CompactList}\item -void {\bf ps\-Dlist\-Set\-Iterator} ({\bf ps\-Dlist} $\ast$list, int where, int which) -\begin{CompactList}\small\item\em PS\_\-DLIST\_\-PREV.\item\end{CompactList}\item -void $\ast$ {\bf ps\-Dlist\-Get\-Next} ({\bf ps\-Dlist} $\ast$list, int which) -\begin{CompactList}\small\item\em PS\_\-DLIST\_\-PREV.\item\end{CompactList}\item -void $\ast$ {\bf ps\-Dlist\-Get\-Prev} ({\bf ps\-Dlist} $\ast$list, int which) -\begin{CompactList}\small\item\em PS\_\-DLIST\_\-PREV.\item\end{CompactList}\item +void {\bf ps\-Dlist\-Set\-Iterator} ({\bf ps\-Dlist} $\ast$list, int where) +\begin{CompactList}\small\item\em Set the iterator.\item\end{CompactList}\item +void $\ast$ {\bf ps\-Dlist\-Get\-Next} ({\bf ps\-Dlist} $\ast$list) +\begin{CompactList}\small\item\em Get next element relative to iter.\item\end{CompactList}\item +void $\ast$ {\bf ps\-Dlist\-Get\-Prev} ({\bf ps\-Dlist} $\ast$list) +\begin{CompactList}\small\item\em Get prev element relative to iter.\item\end{CompactList}\item {\bf ps\-Void\-Ptr\-Array} $\ast$ {\bf ps\-Dlist\-To\-Array} ({\bf ps\-Dlist} $\ast$dlist) \begin{CompactList}\small\item\em Convert doubly-linked list to an array.\item\end{CompactList}\item {\bf ps\-Dlist} $\ast$ {\bf ps\-Array\-To\-Dlist} ({\bf ps\-Void\-Ptr\-Array} $\ast$arr) \begin{CompactList}\small\item\em Convert array to a doubly-linked list.\item\end{CompactList}\item -{\bf ps\-Hash} $\ast$ {\bf ps\-Hash\-Alloc} (int nbucket) +{\bf ps\-Hash} $\ast$ {\bf ps\-Hash\-Alloc} (void) \begin{CompactList}\small\item\em Allocate hash buckets in table.\item\end{CompactList}\item void {\bf ps\-Hash\-Free} ({\bf ps\-Hash} $\ast$table, void($\ast$item\-Free)(void $\ast$item)) @@ -33,39 +33,38 @@ void $\ast$ {\bf ps\-Hash\-Remove} ({\bf ps\-Hash} $\ast$table, const char $\ast$key) \begin{CompactList}\small\item\em Remove key from table.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Float\-Array\-Alloc} (int s, int n) +{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Float\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Float\-Array\-Realloc} ({\bf ps\-Float\-Array} $\ast$my\-Array, int s) +{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Float\-Array\-Realloc} ({\bf ps\-Float\-Array} $\ast$my\-Array, int nalloc) \begin{CompactList}\small\item\em Reallocator.\item\end{CompactList}\item void {\bf ps\-Float\-Array\-Free} ({\bf ps\-Float\-Array} $\ast$restrict my\-Array) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Complex\-Array\-Alloc} (int s, int n) +{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Complex\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Complex\-Array\-Realloc} ({\bf ps\-Complex\-Array} $\ast$my\-Array, int s) +{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Complex\-Array\-Realloc} ({\bf ps\-Complex\-Array} $\ast$my\-Array, int nalloc) \begin{CompactList}\small\item\em Reallocator.\item\end{CompactList}\item void {\bf ps\-Complex\-Array\-Free} ({\bf ps\-Complex\-Array} $\ast$restrict my\-Array) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Int\-Array} $\ast$ {\bf ps\-Int\-Array\-Alloc} (int s, int n) +{\bf ps\-Int\-Array} $\ast$ {\bf ps\-Int\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Int\-Array} $\ast$ {\bf ps\-Int\-Array\-Realloc} ({\bf ps\-Int\-Array} $\ast$my\-Array, int s) +{\bf ps\-Int\-Array} $\ast$ {\bf ps\-Int\-Array\-Realloc} ({\bf ps\-Int\-Array} $\ast$my\-Array, int nalloc) \begin{CompactList}\small\item\em Reallocator.\item\end{CompactList}\item void {\bf ps\-Int\-Array\-Free} ({\bf ps\-Int\-Array} $\ast$restrict my\-Array) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Double\-Array} $\ast$ {\bf ps\-Double\-Array\-Alloc} (int s, int n) +{\bf ps\-Double\-Array} $\ast$ {\bf ps\-Double\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Double\-Array} $\ast$ {\bf ps\-Double\-Array\-Realloc} ({\bf ps\-Double\-Array} $\ast$my\-Array, int s) +{\bf ps\-Double\-Array} $\ast$ {\bf ps\-Double\-Array\-Realloc} ({\bf ps\-Double\-Array} $\ast$my\-Array, int nalloc) \begin{CompactList}\small\item\em Reallocator.\item\end{CompactList}\item void {\bf ps\-Double\-Array\-Free} ({\bf ps\-Double\-Array} $\ast$restrict my\-Array) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Vector\-Array} $\ast$ {\bf ps\-Vector\-Array\-Alloc} (int s, int n) +{\bf ps\-Vector\-Array} $\ast$ {\bf ps\-Vector\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Vector\-Array} $\ast$ {\bf ps\-Vector\-Array\-Realloc} ({\bf ps\-Vector\-Array} $\ast$my\-Array, int s) +{\bf ps\-Vector\-Array} $\ast$ {\bf ps\-Vector\-Array\-Realloc} ({\bf ps\-Vector\-Array} $\ast$my\-Array int nalloc) \begin{CompactList}\small\item\em Reallocator.\item\end{CompactList}\item void {\bf ps\-Vector\-Array\-Free} ({\bf ps\-Vector\-Array} $\ast$restrict my\-Array) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Void\-Ptr\-Array} $\ast$ {\bf ps\-Void\-Ptr\-Array\-Alloc} (int n, int s) +{\bf ps\-Void\-Ptr\-Array} $\ast$ {\bf ps\-Void\-Ptr\-Array\-Alloc} (int nalloc) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -{\bf ps\-Void\-Ptr\-Array} $\ast$ {\bf ps\-Void\-Ptr\-Array\-Realloc} ({\bf ps\-Void\-Ptr\-Array} $\ast$arr, int n) +{\bf ps\-Void\-Ptr\-Array} $\ast$ {\bf ps\-Void\-Ptr\-Array\-Realloc} ({\bf ps\-Void\-Ptr\-Array} $\ast$arr, int nalloc) \begin{CompactList}\small\item\em Reallocate.\item\end{CompactList}\item void {\bf ps\-Void\-Ptr\-Array\-Free} ({\bf ps\-Void\-Ptr\-Array} $\ast$arr, void($\ast$elem\-Free)(void $\ast$)) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\end{CompactItemize} - Index: /trunk/doc/pslib/psLibSDRS.tex =================================================================== --- /trunk/doc/pslib/psLibSDRS.tex (revision 380) +++ /trunk/doc/pslib/psLibSDRS.tex (revision 381) @@ -1,3 +1,3 @@ -%%% $Id: psLibSDRS.tex,v 1.30 2004-04-01 10:24:51 price Exp $ +%%% $Id: psLibSDRS.tex,v 1.31 2004-04-01 10:31:20 eugene Exp $ \documentclass[panstarrs]{panstarrs} @@ -2443,4 +2443,5 @@ psMetaDataFlags flags; ///< flags associated with this item const union { + double d; ///< double value float f; ///< floating value int i; ///< integer value @@ -2987,4 +2988,5 @@ typedef struct { int x0, y0; ///< Offset from the lower-left corner + int nx, ny; ///< Image binning psImage *image; ///< imaging area of cell psDlist *objects; ///< objects derived from cell Index: /trunk/doc/pslib/psMathGroup.tex =================================================================== --- /trunk/doc/pslib/psMathGroup.tex (revision 380) +++ /trunk/doc/pslib/psMathGroup.tex (revision 381) @@ -5,5 +5,5 @@ void {\bf ps\-Bit\-Mask\-Free} ({\bf ps\-Bit\-Mask} $\ast$restrict my\-Mask) \begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Bit\-Mask} $\ast$ {\bf ps\-Bit\-Mask\-Set} ({\bf ps\-Bit\-Mask} $\ast$out\-Mask, const {\bf ps\-Bit\-Mask} $\ast$my\-Mask, int bit) +{\bf ps\-Bit\-Mask} $\ast$ {\bf ps\-Bit\-Mask\-Set} ({\bf ps\-Bit\-Mask} $\ast$my\-Mask, int bit) \begin{CompactList}\small\item\em Set a bit mask.\item\end{CompactList}\item int {\bf ps\-Bit\-Mask\-Test} (const {\bf ps\-Bit\-Mask} $\ast$check\-Mask, int bit) @@ -11,10 +11,28 @@ {\bf ps\-Bit\-Mask} $\ast$ {\bf ps\-Bit\-Mask\-Op} ({\bf ps\-Bit\-Mask} $\ast$out\-Mask, const {\bf ps\-Bit\-Mask} $\ast$restrict in\-Mask1, char $\ast$operator, const {\bf ps\-Bit\-Mask} $\ast$restrict in\-Mask2) \begin{CompactList}\small\item\em apply the given operator to two bit masks\item\end{CompactList}\item -{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Real\-FFT} ({\bf ps\-Complex\-Array} $\ast$restrict out, const {\bf ps\-Float\-Array} $\ast$restrict my\-Array) -\begin{CompactList}\small\item\em Return Fourier Transform of an array.\item\end{CompactList}\item -{\bf ps\-Complex\-Array} $\ast$ {\bf ps\-Complex\-FFT} ({\bf ps\-Complex\-Array} $\ast$restrict out, const {\bf ps\-Complex\-Array} $\ast$restrict my\-Array, int sign) -\begin{CompactList}\small\item\em Return [inverse?] Fourier Transform of a complex array.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Power\-Spec} ({\bf ps\-Float\-Array} $\ast$restrict out, const {\bf ps\-Float\-Array} $\ast$restrict my\-Array) -\begin{CompactList}\small\item\em Return Power spectrum of a array.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTAlloc} ({\bf ps\-Image} $\ast$image) +\begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTAlloc1D} (const {\bf ps\-Float\-Array} $\ast$arr) +\begin{CompactList}\small\item\em Constructor for 1D case.\item\end{CompactList}\item +{\bf ps\-Image} $\ast$ {\bf ps\-FFTFree} ({\bf ps\-Image} $\ast$out, {\bf ps\-FFT} $\ast$restrict fft) +\begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTForward} ({\bf ps\-FFT} $\ast$fft) +\begin{CompactList}\small\item\em Forward FFT: from real to fourier space.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTReverse} ({\bf ps\-FFT} $\ast$fft) +\begin{CompactList}\small\item\em Reverse FFT: from fourier to real space.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTFilter} ({\bf ps\-FFT} $\ast$fft, float($\ast$filter\-Func)(int kx, int ky)) +\begin{CompactList}\small\item\em Apply filter function in fourier space.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTFilter\-Complex} ({\bf ps\-FFT} $\ast$fft, float($\ast$real\-Filter\-Func)(int kx, int ky), float($\ast$imag\-Filter\-Func)(int kx, int ky)) +\begin{CompactList}\small\item\em Apply complex filter function.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTCross\-Correlate} ({\bf ps\-FFT} $\ast$out const {\bf ps\-FFT} $\ast$fft1, const {\bf ps\-FFT} $\ast$fft2) +\begin{CompactList}\small\item\em Calculate FFT of the cross-correlation.\item\end{CompactList}\item +{\bf ps\-FFT} $\ast$ {\bf ps\-FFTConvolve} ({\bf ps\-FFT} $\ast$out, const {\bf ps\-FFT} $\ast$fft1, const {\bf ps\-FFT} $\ast$fft2) +\begin{CompactList}\small\item\em Calculate FFT of the convolution.\item\end{CompactList}\item +{\bf ps\-Float\-Array} $\ast$ {\bf ps\-FFTPower\-Spec} ({\bf ps\-FFT} $\ast$fft) +\begin{CompactList}\small\item\em Calculate power spectrum.\item\end{CompactList}\item +{\bf ps\-Image} $\ast$ {\bf ps\-FFTGet\-Image} ({\bf ps\-Image} $\ast$out, const {\bf ps\-FFT} $\ast$fft) +\item +{\bf ps\-Image} $\ast$ {\bf ps\-FFTGet\-FT} ({\bf ps\-Image} $\ast$out, const {\bf ps\-FFT} $\ast$fft) +\begin{CompactList}\small\item\em Convert the Fourier transform data in the FFT struct to an image of complex numbers.\item\end{CompactList}\item {\bf ps\-Polynomial1D} $\ast$ {\bf ps\-Polynomial1DAlloc} (int n) \begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item @@ -65,32 +83,34 @@ double {\bf ps\-Eval\-DPolynomial4D} (double w, double x, double y, double z, const {\bf ps\-DPolynomial4D} $\ast$restrict my\-Poly) \begin{CompactList}\small\item\em Evaluate 4D polynomial (double precision).\item\end{CompactList}\item -{\bf ps\-Type} $\ast$ {\bf ps\-Binary\-Op} (void $\ast$out, void $\ast$in1, char $\ast$operator, void $\ast$in2) -\begin{CompactList}\small\item\em Perform a binary operation on two data items (ps\-Image, ps\-Vector, ps\-Scalar).\item\end{CompactList}\item -{\bf ps\-Type} $\ast$ {\bf ps\-Unary\-Op} (void $\ast$out, void $\ast$in, char $\ast$operator) -\begin{CompactList}\small\item\em Perform a binary operation on two data items (ps\-Image, ps\-Vector, ps\-Scalar).\item\end{CompactList}\item +{\bf ps\-Type} $\ast$ {\bf ps\-Binary\-Op} (void $\ast$out, void $\ast$in1, char $\ast$op, void $\ast$in2) +\begin{CompactList}\small\item\em Perform a binary operation on two data items ({\bf ps\-Image} {\rm (p.\,\pageref{structpsImage})}, ps\-Vector, ps\-Scalar).\item\end{CompactList}\item +{\bf ps\-Type} $\ast$ {\bf ps\-Unary\-Op} (void $\ast$out, void $\ast$in, char $\ast$op) +\begin{CompactList}\small\item\em Perform a unary operation on two data items ({\bf ps\-Image} {\rm (p.\,\pageref{structpsImage})}, ps\-Vector, ps\-Scalar).\item\end{CompactList}\item {\bf p\_\-ps\-Scalar} $\ast$ {\bf ps\-Scalar} (double value) -\begin{CompactList}\small\item\em create a ps\-Type-ed structure from a constant double value.\item\end{CompactList}\item +\begin{CompactList}\small\item\em create a {\bf ps\-Type} {\rm (p.\,\pageref{structpsType})}-ed structure from a constant double value.\item\end{CompactList}\item {\bf p\_\-ps\-Scalar} $\ast$ {\bf ps\-Scalar\-Type} (char $\ast$mode,...) -\begin{CompactList}\small\item\em create a ps\-Type-ed structure from a specified type\item\end{CompactList}\item -{\bf ps\-Matrix} $\ast$ {\bf ps\-Matrix\-Alloc} (int Xdimen, int Ydimen) -\begin{CompactList}\small\item\em Constructor.\item\end{CompactList}\item -void {\bf ps\-Matrix\-Free} ({\bf ps\-Matrix} $\ast$restrict my\-Matrix) -\begin{CompactList}\small\item\em Destructor.\item\end{CompactList}\item -{\bf ps\-Matrix} $\ast$ {\bf ps\-Matrix\-Invert} ({\bf ps\-Matrix} $\ast$out, const {\bf ps\-Matrix} $\ast$my\-Matrix, float $\ast$restrict determinant) +\begin{CompactList}\small\item\em create a {\bf ps\-Type} {\rm (p.\,\pageref{structpsType})}-ed structure from a specified type\item\end{CompactList}\item +{\bf ps\-Image} $\ast$ {\bf ps\-Matrix\-Invert} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$my\-Matrix, float $\ast$restrict determinant) \begin{CompactList}\small\item\em Invert matrix.\item\end{CompactList}\item -float {\bf ps\-Matrix\-Determinant} (const {\bf ps\-Matrix} $\ast$restrict my\-Matrix) +float {\bf ps\-Matrix\-Determinant} (const {\bf ps\-Image} $\ast$restrict my\-Matrix) \begin{CompactList}\small\item\em Matrix determinant.\item\end{CompactList}\item -{\bf ps\-Matrix} $\ast$ {\bf ps\-Matrix\-Op} ({\bf ps\-Matrix} $\ast$out, const {\bf ps\-Matrix} $\ast$matrix1, const char $\ast$op, const {\bf ps\-Matrix} $\ast$matrix2) -\begin{CompactList}\small\item\em Matrix operations.\item\end{CompactList}\item -{\bf ps\-Matrix} $\ast$ {\bf ps\-Matrix\-Transpose} ({\bf ps\-Matrix} $\ast$out, const {\bf ps\-Matrix} $\ast$my\-Matrix) +{\bf ps\-Image} $\ast$ {\bf ps\-Matrix\-Op} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$matrix1, const char $\ast$op, const {\bf ps\-Image} $\ast$matrix2) +\begin{CompactList}\small\item\em Matrix operation: addition, subtraction, multiplication.\item\end{CompactList}\item +{\bf ps\-Image} $\ast$ {\bf ps\-Matrix\-Transpose} ({\bf ps\-Image} $\ast$out, const {\bf ps\-Image} $\ast$my\-Matrix) \begin{CompactList}\small\item\em Transpose Matrix.\item\end{CompactList}\item -{\bf ps\-Vector} $\ast$ {\bf ps\-Matrix\-To\-Vector} ({\bf ps\-Matrix} $\ast$my\-Matrix) +{\bf ps\-Image} $\ast$ {\bf ps\-Matrix\-LUD} ({\bf ps\-Image} $\ast$out, {\bf ps\-Image} $\ast$my\-Matrix) +\begin{CompactList}\small\item\em LU Decomposition of a matrix.\item\end{CompactList}\item +{\bf ps\-Vector} $\ast$ {\bf ps\-Matrix\-LUSolve} ({\bf ps\-Vector} $\ast$out, const {\bf ps\-Image} $\ast$lu\-Matrix, const {\bf ps\-Vector} $\ast$rhs\-Vector) +\begin{CompactList}\small\item\em LU Solution.\item\end{CompactList}\item +{\bf ps\-Vector} $\ast$ {\bf ps\-Matrix\-To\-Vector} ({\bf ps\-Vector} $\ast$out, {\bf ps\-Image} $\ast$my\-Matrix) \begin{CompactList}\small\item\em Convert matrix to vector.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Minimize} (float($\ast$my\-Function)(const {\bf ps\-Float\-Array} $\ast$restrict), {\bf ps\-Float\-Array} $\ast$restrict initial\-Guess) -\begin{CompactList}\small\item\em Minimize a particular function.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Minimize\-Chi2} (float($\ast$eval\-Model)(const {\bf ps\-Float\-Array} $\ast$restrict, const {\bf ps\-Float\-Array} $\ast$restrict), const {\bf ps\-Float\-Array} $\ast$restrict domain, const {\bf ps\-Float\-Array} $\ast$restrict data, const {\bf ps\-Float\-Array} $\ast$restrict errors, {\bf ps\-Float\-Array} $\ast$restrict initial\-Guess, const {\bf ps\-Int\-Array} $\ast$restrict guess\-Mask) +{\bf ps\-Image} $\ast$ {\bf ps\-Vector\-To\-Matrix} ({\bf ps\-Image} $\ast$out, {\bf ps\-Vector} $\ast$my\-Vector) +\begin{CompactList}\small\item\em Convert vector to matrix.\item\end{CompactList}\item +{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Minimize} (float($\ast$my\-Function)(const {\bf ps\-Float\-Array} $\ast$restrict), {\bf ps\-Float\-Array} $\ast$restrict initial\-Guess, {\bf ps\-Int\-Array} $\ast$restrict param\-Mask) +\begin{CompactList}\small\item\em Minimize a particular non-linear function.\item\end{CompactList}\item +{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Minimize\-Chi2} (float($\ast$eval\-Model)(const {\bf ps\-Float\-Array} $\ast$restrict, const {\bf ps\-Float\-Array} $\ast$restrict), const {\bf ps\-Float\-Array} $\ast$restrict domain, const {\bf ps\-Float\-Array} $\ast$restrict data, const {\bf ps\-Float\-Array} $\ast$restrict errors, {\bf ps\-Float\-Array} $\ast$restrict initial\-Guess, const {\bf ps\-Int\-Array} $\ast$restrict param\-Mask) \begin{CompactList}\small\item\em Minimize chi$^\wedge$2 for input data.\item\end{CompactList}\item -{\bf ps\-Float\-Array} $\ast$ {\bf ps\-Get\-Array\-Polynomial} (const {\bf ps\-Float\-Array} $\ast$restrict ord, const {\bf ps\-Float\-Array} $\ast$restrict coord) -\begin{CompactList}\small\item\em Derive a polynomial fit by least-squares --- can be done analytically.\item\end{CompactList}\item +{\bf ps\-Polynomial1D} $\ast$ {\bf ps\-Get\-Array\-Polynomial} ({\bf ps\-Polynomial1D} my\-Poly, const {\bf ps\-Float\-Array} $\ast$restrict x, const {\bf ps\-Float\-Array} $\ast$restrict y, const {\bf ps\-Float\-Array} $\ast$restrict y\-Err) +\begin{CompactList}\small\item\em Derive a polynomial fit by chi$^\wedge$2 minimisation --- can be done analytically.\item\end{CompactList}\item {\bf ps\-Float\-Array} $\ast$ {\bf ps\-Sort} ({\bf ps\-Float\-Array} $\ast$out, const {\bf ps\-Float\-Array} $\ast$my\-Array) \begin{CompactList}\small\item\em Sort an array.\item\end{CompactList}\item Index: /trunk/doc/pslib/psStructures.tex =================================================================== --- /trunk/doc/pslib/psStructures.tex (revision 380) +++ /trunk/doc/pslib/psStructures.tex (revision 381) @@ -1,10 +1,11 @@ \begin{CompactList} +\item\contentsline{section}{{\bf p\_\-ps\-FFTDetails} (Details on FFT implementation (private))}{\pageref{structp__psFFTDetails}}{} \item\contentsline{section}{{\bf p\_\-ps\-Scalar} (Private structure used to pass constant values into the math operators)}{\pageref{structp__psScalar}}{} \item\contentsline{section}{{\bf ps\-Bit\-Mask} (A bitmask of arbitrary length)}{\pageref{structpsBitMask}}{} \item\contentsline{section}{{\bf ps\-Catalogue\-Objects} (Objects from a catalogue)}{\pageref{structpsCatalogueObjects}}{} -\item\contentsline{section}{{\bf ps\-Cell} (A Cell: a collection of frames)}{\pageref{structpsCell}}{} +\item\contentsline{section}{{\bf ps\-Cell} (A Cell: a collection of readouts)}{\pageref{structpsCell}}{} \item\contentsline{section}{{\bf ps\-Chip} (A Chip: a collection of cells)}{\pageref{structpsChip}}{} \item\contentsline{section}{{\bf ps\-Complex\-Array} (An array of complex numbers)}{\pageref{structpsComplexArray}}{} -\item\contentsline{section}{{\bf ps\-Coord} (A point in 2-D space, with errors)}{\pageref{structpsCoord}}{} +\item\contentsline{section}{{\bf ps\-Coord} (A point in 2-D space, with errors)}{\pageref{unionpsCoord}}{} \item\contentsline{section}{{\bf ps\-Coord\-Xform} (A polynomial transformation between coordinate frames)}{\pageref{structpsCoordXform}}{} \item\contentsline{section}{{\bf ps\-Distortion} (The optical distortion terms)}{\pageref{structpsDistortion}}{} @@ -16,9 +17,10 @@ \item\contentsline{section}{{\bf ps\-DPolynomial3D} (Double-precision three-dimensional polynomial)}{\pageref{structpsDPolynomial3D}}{} \item\contentsline{section}{{\bf ps\-DPolynomial4D} (Double-precision four-dimensional polynomial)}{\pageref{structpsDPolynomial4D}}{} +\item\contentsline{section}{{\bf ps\-Err} }{\pageref{structpsErr}}{} \item\contentsline{section}{{\bf ps\-Exposure} (Exposure information from the telescope)}{\pageref{structpsExposure}}{} +\item\contentsline{section}{{\bf ps\-FFT} (Fast Fourier Transform)}{\pageref{structpsFFT}}{} \item\contentsline{section}{{\bf ps\-Fixed\-Pattern} (The fixed pattern residual offsets)}{\pageref{structpsFixedPattern}}{} \item\contentsline{section}{{\bf ps\-Float\-Array} (An array of real numbers)}{\pageref{structpsFloatArray}}{} \item\contentsline{section}{{\bf ps\-FPA} (A Focal plane array: a collection of chips)}{\pageref{structpsFPA}}{} -\item\contentsline{section}{{\bf ps\-Frame} (A Frame: a collection of pixels)}{\pageref{structpsFrame}}{} \item\contentsline{section}{{\bf ps\-Grommit} (Information needed (by SLALIB) to convert Apparent to Observed Position)}{\pageref{structpsGrommit}}{} \item\contentsline{section}{{\bf ps\-Histogram} (Histograms)}{\pageref{structpsHistogram}}{} @@ -26,5 +28,4 @@ \item\contentsline{section}{{\bf ps\-Image\-Objects} (Associates objects on an image with the image)}{\pageref{structpsImageObjects}}{} \item\contentsline{section}{{\bf ps\-Int\-Array} (An array of integers)}{\pageref{structpsIntArray}}{} -\item\contentsline{section}{{\bf ps\-Matrix} (A matrix)}{\pageref{structpsMatrix}}{} \item\contentsline{section}{{\bf ps\-Mem\-Block} (Book-keeping data for storage allocator)}{\pageref{structpsMemBlock}}{} \item\contentsline{section}{{\bf ps\-Meta\-Data\-Item} (A struct to define a single item of metadata)}{\pageref{structpsMetaDataItem}}{} @@ -38,4 +39,5 @@ \item\contentsline{section}{{\bf ps\-Polynomial3D} (Three-dimensional polynomial)}{\pageref{structpsPolynomial3D}}{} \item\contentsline{section}{{\bf ps\-Polynomial4D} (Four-dimensional polynomial)}{\pageref{structpsPolynomial4D}}{} +\item\contentsline{section}{{\bf ps\-Readout} (A Readout: a collection of pixels)}{\pageref{structpsReadout}}{} \item\contentsline{section}{{\bf ps\-Stats} (Generic statistics structure)}{\pageref{structpsStats}}{} \item\contentsline{section}{{\bf ps\-Super\-Object} (A \char`\"{}super\char`\"{} object --- an object with multiple detections in different images)}{\pageref{structpsSuperObject}}{} Index: /trunk/doc/pslib/psSystemGroup.tex =================================================================== --- /trunk/doc/pslib/psSystemGroup.tex (revision 380) +++ /trunk/doc/pslib/psSystemGroup.tex (revision 381) @@ -7,7 +7,7 @@ void {\bf ps\-Set\-Log\-Format} (const char $\ast$fmt) \begin{CompactList}\small\item\em sets the log format\item\end{CompactList}\item -void {\bf ps\-Log\-Msg} (const char $\ast$name, int level, const char $\ast$fmt,...) +void {\bf ps\-Log\-Msg} (const char $\ast$name, int my\-Level, const char $\ast$fmt,...) \begin{CompactList}\small\item\em Logs a message.\item\end{CompactList}\item -void {\bf p\_\-ps\-VLog\-Msg} (const char $\ast$name, int level, const char $\ast$fmt, va\_\-list ap) +void {\bf p\_\-ps\-VLog\-Msg} (const char $\ast$name, int my\-Level, const char $\ast$fmt, va\_\-list ap) \begin{CompactList}\small\item\em Logs a message from varargs.\item\end{CompactList}\item void $\ast$ {\bf p\_\-ps\-Alloc} (size\_\-t size, const char $\ast$file, int lineno) @@ -27,31 +27,29 @@ void $\ast$ {\bf ps\-Mem\-Decr\-Ref\-Counter} (void $\ast$vptr) \begin{CompactList}\small\item\em Decrement reference counter and return the pointer.\item\end{CompactList}\item -{\bf ps\-Mem\-Problem\-Callback} {\bf ps\-Mem\-Problem\-Set\-CB} ({\bf ps\-Mem\-Problem\-Callback} func) +{\bf ps\-Mem\-Problem\-CB} {\bf ps\-Mem\-Problem\-CBSet} ({\bf ps\-Mem\-Problem\-CB} func) \begin{CompactList}\small\item\em Set callback for problems.\item\end{CompactList}\item -{\bf ps\-Mem\-Exhausted\-Callback} {\bf ps\-Mem\-Exhausted\-Set\-CB} ({\bf ps\-Mem\-Exhausted\-Callback} func) +{\bf ps\-Mem\-Exhausted\-CB} {\bf ps\-Mem\-Exhausted\-CBSet} ({\bf ps\-Mem\-Exhausted\-CB} func) \begin{CompactList}\small\item\em Set callback for out-of-memory.\item\end{CompactList}\item -{\bf ps\-Mem\-Callback} {\bf ps\-Mem\-Allocate\-Set\-CB} ({\bf ps\-Mem\-Callback} func) +ps\-Mem\-CB {\bf ps\-Mem\-Allocate\-CBSet} ({\bf ps\-Mem\-Allocate\-CB} func) \begin{CompactList}\small\item\em Set call back for when a particular memory block is allocated.\item\end{CompactList}\item -{\bf ps\-Mem\-Callback} {\bf ps\-Mem\-Free\-Set\-CB} ({\bf ps\-Mem\-Callback} func) +ps\-Mem\-CB {\bf ps\-Mem\-Free\-CBSet} ({\bf ps\-Mem\-Free\-CB} func) \begin{CompactList}\small\item\em Set call back for when a particular memory block is freed.\item\end{CompactList}\item int {\bf ps\-Mem\-Get\-Id} (void) \begin{CompactList}\small\item\em get next memory ID\item\end{CompactList}\item -long {\bf ps\-Mem\-Set\-Allocate\-ID} (long id) +long {\bf ps\-Mem\-Allocate\-IDSet} (long id) \begin{CompactList}\small\item\em set p\_\-ps\-Mem\-Allocate\-ID to id\item\end{CompactList}\item -long {\bf ps\-Mem\-Set\-Free\-ID} (long id) +long {\bf ps\-Mem\-Free\-IDSet} (long id) \begin{CompactList}\small\item\em set p\_\-ps\-Mem\-Free\-ID to id\item\end{CompactList}\item void {\bf ps\-Abort} (const char $\ast$name, const char $\ast$fmt,...) \begin{CompactList}\small\item\em Prints an error message and aborts.\item\end{CompactList}\item -void {\bf ps\-Error} (const char $\ast$name, const char $\ast$fmt,...) -\begin{CompactList}\small\item\em Prints an error message and doesn't abort.\item\end{CompactList}\item char $\ast$ {\bf ps\-String\-Copy} (const char $\ast$str) \begin{CompactList}\small\item\em Allocates and returns a copy of a string.\item\end{CompactList}\item char $\ast$ {\bf ps\-String\-NCopy} (const char $\ast$str, int n\-Char) \begin{CompactList}\small\item\em Allocates n\-Char and returns a copy of the string or segment.\item\end{CompactList}\item -void {\bf p\_\-ps\-Trace} (const char $\ast$facil, int level,...) +void {\bf p\_\-ps\-Trace} (const char $\ast$facil, int my\-Level,...) \begin{CompactList}\small\item\em Send a trace message.\item\end{CompactList}\item int {\bf ps\-Set\-Trace\-Level} (const char $\ast$facil, int level) \begin{CompactList}\small\item\em Set trace level.\item\end{CompactList}\item -int {\bf ps\-Get\-Trace\-Level} (const char $\ast$name) +int {\bf ps\-Get\-Trace\-Level} (const char $\ast$facil) \begin{CompactList}\small\item\em Get the trace level.\item\end{CompactList}\item void {\bf ps\-Trace\-Reset} (void)