Changeset 36884 for branches/eam_branches/ipp-20140610/psphot/src

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

• . (modified) (1 prop)
• psphot/src/psphotChoosePSF.c (modified) (1 diff)
• psphot/src/psphotEfficiency.c (modified) (2 diffs)
• psphot/src/psphotEvalFLT.c (modified) (1 diff)
• psphot/src/psphotFullForceSummaryReadout.c (modified) (2 diffs)
• psphot/src/psphotGalaxyShape.c (modified) (4 diffs)
• psphot/src/psphotLensing.c (modified) (3 diffs)
• psphot/src/psphotLoadSRCTEXT.c (modified) (1 diff)
• psphot/src/psphotMakeFluxScale.c (modified) (1 diff)
• psphot/src/psphotRadiusChecks.c (modified) (3 diffs)
• psphot/src/psphotSersicModelClass.c (modified) (1 diff)
• psphot/src/psphotSourceFits.c (modified) (3 diffs)
• psphot/src/psphotVisual.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/psphot/src/psphotChoosePSF.c

@@ -448 +448 @@
 
             // get the model full-width at half-max
-            float FWHM_MAJOR = 2*modelPSF->modelRadius (modelPSF->params, 0.5);
+            float FWHM_MAJOR = 2*modelPSF->class->modelRadius (modelPSF->params, 0.5);
 
             // XXX make sure this is consistent with the re-definition of PM_PAR_SXX

branches/eam_branches/ipp-20140610/psphot/src/psphotEfficiency.c

@@ -71 +71 @@
                 continue;
             }
-            float flux = normModel->modelFlux(normModel->params); // Total flux for peak of 1.0
+            float flux = normModel->class->modelFlux(normModel->params); // Total flux for peak of 1.0
             psFree(normModel);
             if (!isfinite(flux)) {
@@ -424 +424 @@
                     continue;
                 }
-                float sourceRadius = PS_MAX(radius, model->modelRadius(model->params, minFlux)); // Radius for source
+                float sourceRadius = PS_MAX(radius, model->class->modelRadius(model->params, minFlux)); // Radius for source
                 psFree(model);
                 if (!isfinite(sourceRadius)) {

branches/eam_branches/ipp-20140610/psphot/src/psphotEvalFLT.c

@@ -53 +53 @@
     } 
 
-    keep = model->modelFitStatus(model);
+    keep = model->class->modelFitStatus(model);
     if (keep) return true;
 

branches/eam_branches/ipp-20140610/psphot/src/psphotFullForceSummaryReadout.c

@@ -425 +425 @@
                 // copy the best fit params to the model
                 // fractional radii with the lowest chisq
-                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->type);
+                psEllipseAxes axes = pmPSF_ModelToAxes(model->params->data.F32, model->class->useReff);
 
                 // examine the params for the trial with minimum chisq.
@@ -637 +637 @@
                 // now save the model parameters in the model structure
 
-                pmPSF_AxesToModel (model->params->data.F32, axes, modelType);
+                pmPSF_AxesToModel (model->params->data.F32, axes, model->class->useReff);
 
                 model->mag = -2.5 * log10(flux0);

branches/eam_branches/ipp-20140610/psphot/src/psphotGalaxyShape.c

@@ -283 +283 @@
 
         // I have some source guess (e0, e1, e2)
-        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, modelType);
+        psEllipseAxes guessAxes = pmPSF_ModelToAxes (PAR, model->class->useReff);
 
         float fRmajorBest = NAN;
@@ -295 +295 @@
                 testAxes.minor = guessAxes.minor * fRminor;
                 
-                pmPSF_AxesToModel (PAR, testAxes, modelType);
+                pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
                 psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, true);
@@ -324 +324 @@
 #endif
             
-            pmPSF_AxesToModel (PAR, testAxes, modelType);
+            pmPSF_AxesToModel (PAR, testAxes, model->class->useReff);
                 
             psphotGalaxyShapeSource (pcm, source, galaxyFits, maskVal, psfSize, false);
@@ -400 +400 @@
 
     pcm->modelConv->params->data.F32[PM_PAR_I0] = Io;
-    float flux = pcm->modelConv->modelFlux (pcm->modelConv->params);
+    float flux = pcm->modelConv->class->modelFlux (pcm->modelConv->params);
     float dflux = flux * (dIo / Io);
 

branches/eam_branches/ipp-20140610/psphot/src/psphotLensing.c

@@ -12 +12 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
     psAssert (recipe, "missing recipe?");
+
+    // perform full extended source non-linear fits?
+    if (!psMetadataLookupBool (&status, recipe, "LENSING_PARAMETERS")) {
+        psLogMsg ("psphot", PS_LOG_INFO, "skipping extended source fits\n");
+        return true;
+    }
 
     int num = psphotFileruleCount(config, filerule);
@@ -87 +93 @@
     }
 
+    psMetadataAddBool(readout->analysis, PS_LIST_TAIL, "LENS_OBJ", PS_META_REPLACE, "per-object lensing stats measured", true);
     psLogMsg ("psphot.lensing", PS_LOG_DETAIL, "calculate lensing parameters for %d objects\n", (int) sources->n);
 
@@ -317 +324 @@
     psFree (stats);
 
+    psMetadataAddBool(readout->analysis, PS_LIST_TAIL, "LENS_PSF", PS_META_REPLACE, "psf-trend lensing stats measured", true);
     psLogMsg ("psphot.lensing", PS_LOG_DETAIL, "calculate lensing parameters for %d objects: %f sec\n", (int) sources->n, psTimerMark ("psphot.lensing"));
 

branches/eam_branches/ipp-20140610/psphot/src/psphotLoadSRCTEXT.c

@@ -73 +73 @@
             dPAR[PM_PAR_I0]   = 0.0;
 
-            pmPSF_AxesToModel (PAR, axes, modelType);
+            pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 
             float peakFlux    = 1.0;

branches/eam_branches/ipp-20140610/psphot/src/psphotMakeFluxScale.c

@@ -38 +38 @@
             } else {
                 // measure the fitMag for this model
-                fitSum = model->modelFlux (model->params);
+                fitSum = model->class->modelFlux (model->params);
             }
             if (fitSum < 1.e-6) continue;

branches/eam_branches/ipp-20140610/psphot/src/psphotRadiusChecks.c

@@ -60 +60 @@
     if (radiusFit <= 0) {               // use fixed radius
         if (moments == NULL) {
-            radiusFit = model->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
+            radiusFit = model->class->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
         } else {
-            radiusFit = model->modelRadius(model->params, 1.0);
+            radiusFit = model->class->modelRadius(model->params, 1.0);
         }
         model->fitRadius = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
@@ -95 +95 @@
     if (radiusFit <= 0) {               // use fixed radius
         if (moments == NULL) {
-            radiusFit = model->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
+            radiusFit = model->class->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
         } else {
-            radiusFit = model->modelRadius(model->params, 1.0);
+            radiusFit = model->class->modelRadius(model->params, 1.0);
         }
         model->fitRadius = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
@@ -294 +294 @@
     float flux = deep ? EXT_FIT_NSIGMA*EXT_FIT_SKY_SIG : 0.1 * model->params->data.F32[PM_PAR_I0];
 
-    float rawRadius = model->modelRadius (model->params, flux);
+    float rawRadius = model->class->modelRadius (model->params, flux);
     if (isnan(rawRadius)) return false;
 

branches/eam_branches/ipp-20140610/psphot/src/psphotSersicModelClass.c

@@ -586 +586 @@
             coord->data.F32[1] = (psF32) (i + source->pixels->row0);
 
-            pcm->modelConvFlux->data.F32[i][j] = pcm->modelConv->modelFunc (NULL, params, coord);
+            pcm->modelConvFlux->data.F32[i][j] = pcm->modelConv->class->modelFunc (NULL, params, coord);
         }
     }

branches/eam_branches/ipp-20140610/psphot/src/psphotSourceFits.c

@@ -700 +700 @@
         model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[i];
 
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;
@@ -723 +723 @@
     model->flags = PM_MODEL_STATUS_NONE; // do not attempt to handle failures here, let the next iteration deal with it
     model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[iMin];
-    model->modelGuess(model, source, maskVal, markVal);
+    model->class->modelGuess(model, source, maskVal, markVal);
 
     return true;
@@ -752 +752 @@
         model->params->data.F32[PM_PAR_7] = indexGuess[i];
         
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;

branches/eam_branches/ipp-20140610/psphot/src/psphotVisual.c

@@ -1444 +1444 @@
             coord->data.F32[1] = r;
             coord->data.F32[0] = 0.0;
-            fmaj->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmaj->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
 
             coord->data.F32[0] = r;
             coord->data.F32[1] = 0.0;
-            fmin->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmin->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
         }
         psFree (coord);
         psFree (params);
 
-        float FWHM_MAJOR = 2.0*source->modelPSF->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
+        float FWHM_MAJOR = 2.0*source->modelPSF->class->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
         float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major);
         if (FWHM_MAJOR < FWHM_MINOR) PS_SWAP (FWHM_MAJOR, FWHM_MINOR);