Changeset 25754 for trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

Timestamp:

Oct 2, 2009, 3:11:32 PM (17 years ago)

Author:

eugene

Message:

check in changes from genes development branch : extensive changes to moments calculation, psf model generation, aperture residuals

File:

• trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c (modified) (6 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

@@ -128 +128 @@
             nDOF = model->nDOF;
             nPix = model->nPix;
-            apRadius = model->radiusFit; // XXX should we really use the fitRadius for aperture Radius?
+            apRadius = source->apRadius;
             errMag = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
         } else {
@@ -308 +308 @@
         source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
         source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");
+        source->apRadius  = psMetadataLookupS32 (&status, row, "AP_MAG_RADIUS");
 
         // note that some older versions used PSF_PROBABILITY: this was not well defined.
@@ -313 +314 @@
         model->nDOF       = psMetadataLookupS32 (&status, row, "PSF_NDOF");
         model->nPix       = psMetadataLookupS32 (&status, row, "PSF_NPIX");
-        model->radiusFit  = psMetadataLookupS32 (&status, row, "AP_MAG_RADIUS");
 
         source->moments = pmMomentsAlloc ();
@@ -353 +353 @@
 
     // which extended source analyses should we perform?
-    bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
-    bool doIsophotal    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ISOPHOTAL");
-    bool doAnnuli       = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
-    bool doKron         = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_KRON");
+    // bool doPetrosian    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_PETROSIAN");
+    // bool doIsophotal    = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ISOPHOTAL");
+    // bool doAnnuli       = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_ANNULI");
+    // bool doKron         = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_KRON");
 
     psVector *radialBinsLower = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.LOWER");
@@ -396 +396 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_EXT_SIG",        PS_DATA_F32, "Sigma in EXT y coordinate",                  yErr);
 
+# if (0)
         // Petrosian measurements
         // XXX insert header data: petrosian ref radius, flux ratio
@@ -476 +477 @@
         }
 
+# endif
         psArrayAdd (table, 100, row);
         psFree (row);