Index: trunk/psModules/src/astrom/pmAstrometry.h
===================================================================
--- trunk/psModules/src/astrom/pmAstrometry.h	(revision 5435)
+++ trunk/psModules/src/astrom/pmAstrometry.h	(revision 5543)
@@ -8,6 +8,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-10-20 23:06:24 $
+*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-18 19:43:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -274,5 +274,5 @@
  *  @return psPlane*    the resulting chip coordinate
  */
-psPlane* psCoordCellToChip(
+psPlane* pmCoordCellToChip(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within Cell
@@ -285,5 +285,5 @@
  *  @return psPlane*    the resulting FPA coordinate
  */
-psPlane* psCoordChipToFPA(
+psPlane* pmCoordChipToFPA(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within Chip
@@ -296,5 +296,5 @@
  *  @return psPlane*    the resulting Tangent Plane coordinate
  */
-psPlane* psCoordFPAToTP(
+psPlane* pmCoordFPAToTP(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within FPA
@@ -309,5 +309,5 @@
  *  @return psSphere*    the resulting Sky coordinate
  */
-psSphere* psCoordTPToSky(
+psSphere* pmCoordTPToSky(
     psSphere* out,                     ///< a sphere struct to recycle. If NULL, a new struct is created
     const psPlane* in,                ///< the coordinate within Tangent Plane
@@ -319,5 +319,5 @@
  *  @return psPlane*    the resulting FPA coordinate
  */
-psPlane* psCoordCellToFPA(
+psPlane* pmCoordCellToFPA(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within cell
@@ -330,5 +330,5 @@
  *  @return psSphere*    the resulting Sky coordinate
  */
-psSphere* psCoordCellToSky(
+psSphere* pmCoordCellToSky(
     psSphere* out,                     ///< a sphere struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within cell
@@ -344,5 +344,5 @@
  *  @return psSphere*    the resulting Sky coordinate
  */
-psSphere* psCoordCellToSkyQuick(
+psSphere* pmCoordCellToSkyQuick(
     psSphere* out,                     ///< a sphere struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within cell
@@ -355,5 +355,5 @@
  *  @return psPlane*    the resulting Tangent Plane coordinate
  */
-psPlane* psCoordSkyToTP(
+psPlane* pmCoordSkyToTP(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psSphere* in,                ///< the sky coordinate
@@ -365,5 +365,5 @@
  *  @return psPlane*    the resulting FPA coordinate
  */
-psPlane* psCoordTPToFPA(
+psPlane* pmCoordTPToFPA(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within tangent plane
@@ -378,5 +378,5 @@
  *  @return psPlane*    the resulting chip coordinate
  */
-psPlane* psCoordFPAToChip(
+psPlane* pmCoordFPAToChip(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the FPA coordinate
@@ -389,5 +389,5 @@
  *  @return psPlane*    the resulting cell coordinate
  */
-psPlane* psCoordChipToCell(
+psPlane* pmCoordChipToCell(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the Chip coordinate
@@ -400,5 +400,5 @@
  *  @return psPlane*    the resulting cell coordinate
  */
-psPlane* psCoordSkyToCell(
+psPlane* pmCoordSkyToCell(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psSphere* in,                ///< the Sky coordinate
@@ -414,5 +414,5 @@
  *  @return psPlane*    the resulting cell coordinate
  */
-psPlane* psCoordSkyToCellQuick(
+psPlane* pmCoordSkyToCellQuick(
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psSphere* in,                ///< the Sky coordinate
@@ -420,40 +420,3 @@
 );
 
-
-psMetadataItem *pmCellGetConcept(pmCell *cell, const char *concept);
-psMetadataItem *pmChipGetConcept(pmChip *chip, const char *concept);
-psMetadataItem *pmFPAGetConcept(pmFPA *fpa, const char *concept);
-
-/**
- * 
- *  We next specify a series of specific functions for concept lookups. These
- *  will generally be what the user utilises, so the goal is to provide a simple
- *  interface providing a single type back, so the user doesnt have to go to the
- *  trouble of checking types, etc. These functions should employ the above three
- *  general lookup functions and deal with the result appropriately.
- *
- */
-float pmFPAGetAirmass(pmFPA *fpa); // FPA.AIRMASS
-psString pmFPAGetFilter(pmFPA *fpa); // FPA.FILTER
-float pmFPAGetPosAngle(pmFPA *fpa); // FPA.POSANGLE
-double pmFPAGetRA(pmFPA *fpa); // FPA.RA
-double pmFPAGetDec(pmFPA *fpa); // FPA.DEC
-psString pmFPAGetRADecSys(pmFPA *fpa); // FPA.RADECSYS
-psString pmFPAGetName(pmFPA *fpa); // FPA.NAME
-psString pmChipGetName(pmChip *chip); // CHIP.NAME
-psString pmCellGetName(pmCell *cell); // CELL.NAME
-psTime *pmCellGetTime(pmCell *cell); // CELL.TIME
-psList *pmCellGetBiasSec(pmCell *cell); // CELL.BIASSEC
-psRegion pmCellGetTrimSec(pmCell *cell); // CELL.TRIMSEC
-float pmCellGetGain(pmCell *cell); // CELL.GAIN
-float pmCellGetReadNoise(pmCell *cell); // CELL.READNOISE
-float pmCellGetSaturation(pmCell *cell); // CELL.SATURATION
-float pmCellGetBad(pmCell *cell); // CELL.BAD
-psPixelCoord pmCellGetBin(pmCell *cell); // CELL.BIN
-psPixelCoord pmCellGetParity(pmCell *cell); // CELL.PARITY
-float pmReadoutGetExposure(pmReadout *readout); // READOUT.EXPOSURE
-float pmReadoutGetDarkTime(pmReadout *readout); // READOUT.DARKTIME
-
-
-
 #endif // #ifndef PS_ASTROMETRY_H