Changeset 33415 for branches/meh_branches/ppstack_test/psphot/src/psphotChoosePSF.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/psphotChoosePSF.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/meh_branches/ppstack_test/psphot/src/psphotChoosePSF.c

@@ -5 +5 @@
 {
     bool status = true;
+
+    fprintf (stdout, "\n");
+    psLogMsg ("psphot", PS_LOG_INFO, "--- psphot Choose PSF ---");
 
     // select the appropriate recipe information
@@ -376 +379 @@
 
     char *modelName = pmModelClassGetName (psf->type);
-    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
+    psLogMsg ("psphot.pspsf", PS_LOG_WARN, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 
@@ -443 +446 @@
             psVectorAppend (fwhmMinor, FWHM_MINOR);
 
-            if (modelPSF->params->n >= 7) {
+            if (modelPSF->params->n > 7) {
               psVectorAppend (psfExtra1, modelPSF->params->data.F32[7]);
             }
-            if (modelPSF->params->n >= 8) {
+            if (modelPSF->params->n > 8) {
               psVectorAppend (psfExtra2, modelPSF->params->data.F32[8]);
             }
@@ -517 +520 @@
     }
 
-    // psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "ANGLE",    PS_META_REPLACE, "PSF angle",           axes.theta);
+    psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "ANGLE",    PS_META_REPLACE, "PSF angle",           axes.theta);
     psMetadataAddS32 (readout->analysis, PS_LIST_TAIL, "NPSFSTAR", PS_META_REPLACE, "Number of stars used to make PSF", psf->nPSFstars);
 

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest