Changeset 396

Timestamp:

Apr 7, 2004, 12:42:11 PM (22 years ago)

Author:

Paul Price

Message:

Minor fixes to get things to compile. e.g. need to do "struct psCell"
inside a psChip, since the psCell isn't defined yet.

Location:

trunk/archive/pslib/include

Files:

• psAstrom.h (modified) (4 diffs)
• psDateTime.h (modified) (1 diff)
• psFFT.h (modified) (1 diff)
• psImage.h (modified) (1 diff)
• psLib.h (modified) (1 diff)
• psMemory.h (modified) (1 diff)
• psMetaData.h (modified) (1 diff)
• psPosition.h (modified) (1 diff)
• psStdArrays.h (modified) (1 diff)

trunk/archive/pslib/include/psAstrom.h

@@ -77 +77 @@
     int nChips;                         ///< Number of Cells assigned
     int nAlloc;                         ///< Number of Cells available
-    psChip *chips;                      ///< Chips in the Focal Plane Array
+    struct psChip *chips;               ///< Chips in the Focal Plane Array
 
     psMetaDataSet *md;                  ///< FPA-level metadata 
@@ -94 +94 @@
 typedef struct {
     int nCells;                         ///< Number of Cells assigned
-    psCell *cells;                      ///< Cells in the Chip
+    struct psCell *cells;               ///< Cells in the Chip
 
     psMetaDataSet *md;                  ///< Chip-level metadata
@@ -108 +108 @@
     int nReadouts;                      ///< number of readouts in this cell realization; each may have its
                                         ///< own image, objects and overscan.
-    psReadout *readouts;                ///< Readouts from the cell
+    struct psReadout *readouts;         ///< Readouts from the cell
     psMetaDataSet *md;                  ///< Cell-level metadata
 
@@ -115 +115 @@
     psCoordXform *cellToSky;            ///< Quick and Dirty transformations from cell coordinates to sky
 
-    psChip  *parentChip;                ///< chip which contains this cell
+    struct psChip  *parentChip;         ///< chip which contains this cell
 } psCell;
 

trunk/archive/pslib/include/psDateTime.h

@@ -14 +14 @@
  *  \{
  */
+
+/** psTime is the time structure we will use throughout.  This needs to be revised.  If we end up wrapping
+    libTAI, then we'll probably just use their time struct.  But until then, we need this temporary
+    definition. */
+typedef struct {
+    long numSeconds;                    ///< Number of seconds from some defined epoch
+    double fracSeconds;                 ///< Fraction of seconds
+} psTime;
+
 
 /** Get current MJD, for a timestamp \ingroup AstroGroup */

trunk/archive/pslib/include/psFFT.h

@@ -71 +71 @@
  */
 psFFT *
-psFFTCrossCorrelate(psFFT *out          ///< Output FFT (or NULL)
+psFFTCrossCorrelate(psFFT *out,         ///< Output FFT (or NULL)
                     const psFFT *fft1, const psFFT *fft2 ///< FFTs to use in cross-correlation
                     );

trunk/archive/pslib/include/psImage.h

@@ -24 +24 @@
         psComplex **rows_complex;       ///< pointers to psComplex data
     } rows;
-    psImage *parent;                    ///< parent, if a subimage 
+    struct psImage *parent;             ///< parent, if a subimage 
     int Nchildren;                      ///< number of subimages 
-    psImage *children;                  ///< children of this region; array of Nchildren pointers
+    struct psImage *children;           ///< children of this region; array of Nchildren pointers
 } psImage;
 

trunk/archive/pslib/include/psLib.h

@@ -23 +23 @@
 # include <psDlist.h>
 
+/* These are here to ensure things compile --- ordering is important.  ): */
+/** @ingroup MathGroup */
+# include <psStats.h>
+# include <psFunctions.h>
+/** @ingroup AstroGroup */
+# include <psMetaData.h>
+# include <psImage.h>
+
 /** @defgroup MathGroup Math Utilities */
 # include <psBitMask.h>

trunk/archive/pslib/include/psMemory.h

@@ -92 +92 @@
 
 /// Set call back for when a particular memory block is allocated 
-psMemCB psMemAllocateCBSet(psMemAllocateCB func) ///< Function to run
+psMemAllocateCB psMemAllocateCBSet(psMemAllocateCB func) ///< Function to run
 ;
 
 /// Set call back for when a particular memory block is freed 
-psMemCB psMemFreeCBSet(psMemFreeCB func) ///< Function to run
+psMemFreeCB psMemFreeCBSet(psMemFreeCB func) ///< Function to run
 ;
 

trunk/archive/pslib/include/psMetaData.h

@@ -49 +49 @@
     psHash *restrict table;             ///< hash table of the same metadata
 } psMetaDataSet;
+
+/** Metadata is actually a "set of metadata" */
+typedef psMetaDataSet psMetadata;
 
 /** Functions **************************************************************/

trunk/archive/pslib/include/psPosition.h

@@ -55 +55 @@
 /** apply the optical distortion to the given coordinate, magnitude, color */
 psCoord *psDistortionApply (psCoord *out, ///< Output coordinates, or NULL
-                            const psdistortion *pattern, ///< optical distortion pattern
+                            const psDistortion *pattern, ///< optical distortion pattern
                             const psCoord *coords, ///< input coordinate
                             float mag,  ///< magnitude of object

trunk/archive/pslib/include/psStdArrays.h

@@ -189 +189 @@
 
 /** Reallocator \ingroup DataGroup */
-psVectorArray *psVectorArrayRealloc(psVectorArray *myArray ///< Array to reallocate
+psVectorArray *psVectorArrayRealloc(psVectorArray *myArray, ///< Array to reallocate
                                     int nalloc) ///< Total number of elements to make available
 ;