Changeset 9539 for trunk/psModules/src/objects/pmPSF_IO.c

Timestamp:

Oct 13, 2006, 11:22:09 AM (20 years ago)

Author:

Paul Price

Message:

Fixing psLib APIs following clean-up.

File:

• trunk/psModules/src/objects/pmPSF_IO.c (modified) (8 diffs)

trunk/psModules/src/objects/pmPSF_IO.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:15:45 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 #include "pmSourceIO.h"
 
-psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf)
+psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf)
 {
 
@@ -54 +54 @@
     for (int i = 0; i < nPar - 4; i++) {
         psPolynomial2D *poly = psf->params->data[i];
-        psPolynomial2DtoMD (metadata, poly, "PSF_PAR%02d", i);
-    }
-    psPolynomial4DtoMD (metadata, psf->ApTrend, "APTREND");
+        psPolynomial2DtoMetadata (metadata, poly, "PSF_PAR%02d", i);
+    }
+    psPolynomial4DtoMetadata (metadata, psf->ApTrend, "APTREND");
 
     psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_AP_RESID", PS_DATA_F32, "aperture residual", psf->ApResid);
@@ -68 +68 @@
 }
 
-pmPSF *pmPSFfromMD (psMetadata *metadata)
+pmPSF *pmPSFfromMetadata (psMetadata *metadata)
 {
 
@@ -90 +90 @@
         sprintf (keyword, "PSF_PAR%02d", i);
         psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
-        psPolynomial2D *poly = psPolynomial2DfromMD (folder);
+        psPolynomial2D *poly = psPolynomial2DfromMetadata (folder);
         psFree (psf->params->data[i]);
         psf->params->data[i] = poly;
@@ -96 +96 @@
     sprintf (keyword, "APTREND");
     psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
-    psPolynomial4D *poly = psPolynomial4DfromMD (folder);
+    psPolynomial4D *poly = psPolynomial4DfromMetadata (folder);
     psFree (psf->ApTrend);
     psf->ApTrend = poly;
@@ -197 +197 @@
     case PM_FPA_FILE_PSF:
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        psMetadata *psfData = pmPSFtoMD (NULL, psf);
+        psMetadata *psfData = pmPSFtoMetadata (NULL, psf);
         psMetadataConfigWrite (psfData, filename);
         psFree (psfData);
@@ -299 +299 @@
 
         psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, filename, FALSE);
-        pmPSF *psf = pmPSFfromMD (psfData);
+        pmPSF *psf = pmPSFfromMetadata (psfData);
         psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN, "psphot psf", psf);