Changeset 36876

Timestamp:

Jun 16, 2014, 9:50:32 AM (12 years ago)

Author:

eugene

Message:

do not try to save PSF_APERTURE or PSF_FIT_RADIUS if we are missing a readout->analysis entry (just causes errors to be ignored); only save PAR_7 if model param->n > 7

Location:

tags/ipp-pv3-20140616/psModules/src/objects

Files:

• pmPSF_IO.c (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (1 diff)

tags/ipp-pv3-20140616/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);
+          }
         }
 

tags/ipp-pv3-20140616/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@ }