Changeset 6365

Timestamp:

Feb 7, 2006, 4:25:03 PM (20 years ago)

Author:

jhoblitt

Message:

sync psElemType, psDataType, & psFitsType with the implementation in pslib

Location:

branches/SDRS-18-FIXES/doc/pslib

Files:

• ChangeLogSDRS.tex (modified) (2 diffs)
• psLibSDRS.tex (modified) (5 diffs)

branches/SDRS-18-FIXES/doc/pslib/ChangeLogSDRS.tex

@@ -1 @@
-%%% $Id: ChangeLogSDRS.tex,v 1.183.2.5 2006-02-08 01:00:34 jhoblitt Exp $
+%%% $Id: ChangeLogSDRS.tex,v 1.183.2.6 2006-02-08 02:25:03 jhoblitt Exp $
 
 \subsection{Changes from version 00 to version 01}
@@ -842 +842 @@
 \item sync \code{psImage}'s definition with the implementation in psLib
 \item add \code{*out} param to \code{psFitsReadHeaderSet()}
-\end{itemize}
+\item sync \code{psElemType}, \code{psDataType}, & \code{psFitsType} with the implementation in pslib
+\end{itemize}

branches/SDRS-18-FIXES/doc/pslib/psLibSDRS.tex

@@ -1 @@
-%%% $Id: psLibSDRS.tex,v 1.362.2.5 2006-02-08 01:00:34 jhoblitt Exp $
+%%% $Id: psLibSDRS.tex,v 1.362.2.6 2006-02-08 02:25:03 jhoblitt Exp $
 \documentclass[panstarrs,spec]{panstarrs}
 
@@ -916 +916 @@
 \begin{datatype}
 typedef enum {
-    PS_TYPE_S8,                        ///< Character
-    PS_TYPE_S16,                       ///< Short integer
-    PS_TYPE_S32,                       ///< Integer
-    PS_TYPE_S64,                       ///< Long integer
-    PS_TYPE_U8,                        ///< Unsigned character
-    PS_TYPE_U16,                       ///< Unsigned short integer
-    PS_TYPE_U32,                       ///< Unsigned integer
-    PS_TYPE_U64,                       ///< Unsigned long integer
-    PS_TYPE_F32,                       ///< Floating point
-    PS_TYPE_F64,                       ///< Double-precision floating point
-    PS_TYPE_C32,                       ///< Float complex
-    PS_TYPE_C64,                       ///< Double complex
-    PS_TYPE_BOOL                       ///< Boolean value
+    PS_TYPE_S8      = 0x0101,           ///< Character
+    PS_TYPE_S16     = 0x0102,           ///< Short integer
+    PS_TYPE_S32     = 0x0104,           ///< Integer
+    PS_TYPE_S64     = 0x0108,           ///< Long integer
+    PS_TYPE_U8      = 0x0301,           ///< Unsigned character
+    PS_TYPE_U16     = 0x0302,           ///< Unsigned short integer
+    PS_TYPE_U32     = 0x0304,           ///< Unsigned integer
+    PS_TYPE_U64     = 0x0308,           ///< Unsigned long integer
+    PS_TYPE_F32     = 0x0404,           ///< Floating point
+    PS_TYPE_F64     = 0x0408,           ///< Double-precision floating point
+    PS_TYPE_C32     = 0x0808,           ///< Float complex
+    PS_TYPE_C64     = 0x0810,           ///< Double complex
+    PS_TYPE_BOOL    = 0x1301            ///< Boolean value
 } psElemType;
 \end{datatype}
@@ -939 +939 @@
 \begin{datatype}
 typedef enum {                         ///< type of item.data is:
-    PS_DATA_S32  = PS_TYPE_S32,        ///< psS32
-    PS_DATA_F32  = PS_TYPE_F32,        ///< psF32
-    PS_DATA_F64  = PS_TYPE_F64,        ///< psF64
-    PS_DATA_BOOL = PS_TYPE_BOOL,       ///< psBool
-    PS_DATA_STRING = 0x10000,          ///< String (char *)
+    PS_DATA_S8      = PS_TYPE_S8,      ///< psS8
+    PS_DATA_S16     = PS_TYPE_S16,     ///< psS16
+    PS_DATA_S32     = PS_TYPE_S32,     ///< psS32
+    PS_DATA_U8      = PS_TYPE_U8,      ///< psU8
+    PS_DATA_U16     = PS_TYPE_U16,     ///< psU16
+    PS_DATA_U32     = PS_TYPE_U32,     ///< psU32
+    PS_DATA_F32     = PS_TYPE_F32,     ///< psF32
+    PS_DATA_F64     = PS_TYPE_F64,     ///< psF64
+    PS_DATA_BOOL    = PS_TYPE_BOOL,    ///< psBool
+    PS_DATA_STRING  = 0x10000,         ///< String (char *)
     PS_DATA_ARRAY,                     ///< psArray
     PS_DATA_BITSET,                    ///< psBitSet
@@ -978 +983 @@
 \end{datatype}
 
-Here we have not included every type of structure used in PSLib, but
-only those we expect will be frequently carried around in containers.
-We include \code{PS_DATA_S32, PS_DATA_F32, PS_DATA_F64} and
-\code{PS_DATA_BOOL} since the metadata use these, and we set them to
-the same values as in \code{psElemType}.
+Here we have included every type of structure used in PSLib that we expect will
+be frequently carried around in containers.  If applicable, the value should
+corespond to the same type as represented in \code{psElemType}.
 
 The other values are offset from these ``primitive'' types so that
@@ -4014 +4017 @@
 \begin{datatype}
 typedef enum {
-    PS_FITS_TYPE_NONE,
-    PS_FITS_TYPE_IMAGE,
-    PS_FITS_TYPE_BINARY_TABLE,
-    PS_FITS_TYPE_ASCII_TABLE,
-    PS_FITS_TYPE_ANY
+    PS_FITS_TYPE_NONE           = -1,
+    PS_FITS_TYPE_IMAGE          = IMAGE_HDU,
+    PS_FITS_TYPE_BINARY_TABLE   = BINARY_TBL,
+    PS_FITS_TYPE_ASCII_TABLE    = ASCII_TBL,
+    PS_FITS_TYPE_ANY            = ANY_HDU
 } psFitsType;
 \end{datatype}