Changeset 26667 for branches/eam_branches/20091201/ppSub/src/ppSubMatchPSFs.c

Timestamp:

Jan 22, 2010, 10:58:17 AM (16 years ago)

Author:

Paul Price

Message:

Move scaling into psModules so ppStack can use it too.

File:

• branches/eam_branches/20091201/ppSub/src/ppSubMatchPSFs.c (modified) (3 diffs)

branches/eam_branches/20091201/ppSub/src/ppSubMatchPSFs.c

@@ -131 +131 @@
     }
 
-
     float inFWHM = subImagePSF(data, inRO, inSources); // FWHM for input
     float refFWHM = subImagePSF(data, refRO, refSources); // FWHM for reference
@@ -139 +138 @@
         return true;
     }
-
-//    float diff = sqrtf(PS_SQR(PS_MAX(inFWHM, refFWHM)) - PS_SQR(PS_MIN(inFWHM, refFWHM))); // Difference
-    float diff = PS_MAX(inFWHM, refFWHM);
 
     float scaleRef = psMetadataLookupF32(NULL, recipe, "SCALE.REF"); // Reference for scaling
@@ -153 +149 @@
     }
 
-    float scale = diff / scaleRef;      // Scaling factor
-    if (scale < scaleMin) {
-        scale = scaleMin;
-    }
-    if (scale > scaleMax) {
-        scale = scaleMax;
-    }
-
-    for (int i = 0; i < kernelWidths->n; i++) {
-        kernelWidths->data.F32[i] *= scale;
-    }
-    *kernelSize = *kernelSize * scale + 0.5;
-    *stampSize = *stampSize * scale + 0.5;
-
-    psLogMsg("ppSub", PS_LOG_INFO, "Scaled kernel parameters by %f: %d %d", scale, *kernelSize, *stampSize);
+    if (!pmSubtractionParamsScale(kernelSize, stampSize, kernelWidths, inFWHM, refFWHM,
+                                  scaleRef, scaleMin, scaleMax)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to scale parameters.");
+        return false;
+    }
 
     return true;