Changeset 6859 for branches/rel10_ifa/psModules/src/objects/pmPSF.c

Timestamp:

Apr 14, 2006, 11:43:59 AM (20 years ago)

Author:

magnier

Message:

added JPEG and PSF I/O methods to pmFPAfile, added pmSourcePixelWeights

File:

• branches/rel10_ifa/psModules/src/objects/pmPSF.c (modified) (2 diffs)

branches/rel10_ifa/psModules/src/objects/pmPSF.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4.4.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-13 06:18:46 $
+ *  @version $Revision: 1.4.4.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-14 21:43:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -309 +309 @@
     return false;
 }
-
-psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf)
-{
-
-    if (metadata == NULL) {
-        metadata = psMetadataAlloc ();
-    }
-
-    char *modelName = pmModelGetType (psf->type);
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_MODEL_NAME", PS_DATA_STRING, "PSF model name", modelName);
-
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_POISSON_ERRORS", PS_DATA_BOOL, "Poisson errors for fits", psf->poissonErrors);
-
-    int nPar = pmModelParameterCount (psf->type)    ;
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_MODEL_NPAR", PS_DATA_S32, "PSF model parameter count", nPar);
-
-    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");
-
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_AP_RESID", PS_DATA_F32, "aperture residual", psf->ApResid);
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_dAP_RESID", PS_DATA_F32, "aperture residual scatter", psf->dApResid);
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_SKY_BIAS", PS_DATA_F32, "sky bias level", psf->skyBias);
-
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_CHISQ", PS_DATA_F32, "chi-square for fit", psf->chisq);
-    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_NSTARS", PS_DATA_S32, "number of stars used to measure PSF", psf->nPSFstars);
-
-    return metadata;
-}
-
-pmPSF *pmPSFfromMD (psMetadata *metadata)
-{
-
-    bool status;
-    char keyword[80];
-
-    char *modelName = psMetadataLookupPtr (&status, metadata, "PSF_MODEL_NAME");
-    pmModelType type = pmModelSetType (modelName);
-
-    bool poissonErrors = psMetadataLookupPtr (&status, metadata, "PSF_POISSON_ERRORS");
-    if (!status)
-        poissonErrors = true;
-
-    pmPSF *psf = pmPSFAlloc (type, poissonErrors);
-
-    int nPar = psMetadataLookupS32 (&status, metadata, "PSF_MODEL_NPAR");
-    if (nPar != pmModelParameterCount (psf->type))
-        psAbort ("read PSF" , "mismatch model par count");
-
-    for (int i = 0; i < nPar - 4; i++) {
-        sprintf (keyword, "PSF_PAR%02d", i);
-        psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
-        psPolynomial2D *poly = psPolynomial2DfromMD (folder);
-        psFree (psf->params->data[i]);
-        psf->params->data[i] = poly;
-    }
-    sprintf (keyword, "APTREND");
-    psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
-    psPolynomial4D *poly = psPolynomial4DfromMD (folder);
-    psFree (psf->ApTrend);
-    psf->ApTrend = poly;
-
-    psf->ApResid = psMetadataLookupF32 (&status, metadata, "PSF_AP_RESID");
-    psf->dApResid = psMetadataLookupF32 (&status, metadata, "PSF_dAP_RESID");
-    psf->skyBias = psMetadataLookupF32 (&status, metadata, "PSF_SKY_BIAS");
-
-    psf->chisq = psMetadataLookupF32 (&status, metadata, "PSF_CHISQ");
-    psf->nPSFstars = psMetadataLookupS32 (&status, metadata, "PSF_NSTARS");
-
-    psFree (metadata);
-    return (psf);
-}