Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotStackMatchPSFsNext.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/psphot/src

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary

branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotStackMatchPSFsNext.c

@@ -43 +43 @@
     for (int i = 0; i < num; i++) {
         if (!psphotStackMatchPSFsNextReadout (config, view, filerule, i, lastSize)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to smooth image %s (%d) to target PSF", filerule, i);
+            psLogMsg ("psphot", PS_LOG_INFO, "failed to smooth image %s (%d) to target PSF", filerule, i);
             psImageConvolveSetThreads(oldThreads);
             return false;
@@ -102 +102 @@
 
     if (targetFWHM <= currentFWHM) {
-        psError (PSPHOT_ERR_CONFIG, true, "target FWHM cannot be smaller than current FWHM");
+        // psError (PSPHOT_ERR_CONFIG, true, "target FWHM cannot be smaller than current FWHM");
+        psLogMsg ("psphot", PS_LOG_INFO, "target FWHM (%f) is smaller than current FWHM (%f), not smoothing\n", targetFWHM, currentFWHM);
+        fwhmValues->data.F32[lastSize + 1] = currentFWHM;
+        pmReadoutMaskInvalid(readout, maskVal, maskSat);
         return false;
     }

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary