Changeset 36892

Timestamp:

Jun 17, 2014, 1:58:58 PM (12 years ago)

Author:

eugene

Message:

only do PSF_CORE if params->n > 7, do not try to get PSF_APERTURE or PSF_FIT_RADIUS if missing roAnalysis

Location:

trunk/psModules/src/objects

Files:

• pmPSF_IO.c (modified) (1 diff)
• pmSourceIO.c (modified) (2 diffs)
• pmSourceIO_CMF.c.in (modified) (1 diff)

trunk/psModules/src/objects/pmPSF_IO.c

@@ -511 +511 @@
         psMetadataAddF32 (header, PS_LIST_TAIL, "SKY_BIAS", PS_DATA_F32, "sky bias level", psf->skyBias);
 
-        float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
-        if (status) {
+        if (roAnalysis) {
+          float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
+          if (status) {
             psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_APERTURE", PS_DATA_F32, "aperture for psf objects", PSF_APERTURE);
-        }
-        float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
-        if (status) {
+          }
+          float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
+          if (status) {
             psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_FIT_RADIUS", PS_DATA_F32, "aperture for psf objects", PSF_FIT_RADIUS);
+          }
         }
 

trunk/psModules/src/objects/pmSourceIO.c

@@ -365 +365 @@
 # define PM_SOURCES_WRITE(NAME,TYPE)                                    \
     if (!strcmp (exttype, NAME)) {                                      \
-        status &= pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
+        status = pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
         if (xsrcname) {                                                 \
             status &= pmSourcesWrite_##TYPE##_XSRC(file->fits, readout, sources, file->header, xsrcname, recipe); \
@@ -589 +589 @@
 
             // these are case-sensitive since the EXTYPE is case-sensitive
-            status = true;
+            status = false;
             PM_SOURCES_WRITE("SMPDATA",   SMPDATA);
             PM_SOURCES_WRITE("PS1_DEV_0", PS1_DEV_0);

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -358 +358 @@
         @ALL@     axes.theta        = axes.theta * PS_RAD_DEG;
         
-        @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n >= PM_PAR_7) {
+        @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n > PM_PAR_7) {
         @>PS1_V4,>PS1_SV2,>PS1_DV3@     PAR[PM_PAR_7] = psMetadataLookupF32 (&status, row, "PSF_CORE");
         @>PS1_V4,>PS1_SV2,>PS1_DV3@ }