Changeset 36319 for branches/eam_branches/ipp-20130904/psLib/test/imageops/tap_psImageConvolve2dCache.c

Timestamp:

Nov 28, 2013, 4:10:42 AM (13 years ago)

Author:

eugene

Message:

extended 2d cached-convolution to 15 pix radius

File:

• branches/eam_branches/ipp-20130904/psLib/test/imageops/tap_psImageConvolve2dCache.c (modified) (7 diffs)

branches/eam_branches/ipp-20130904/psLib/test/imageops/tap_psImageConvolve2dCache.c

@@ -14 +14 @@
 #include "pstap.h"
 
-bool tap_convolve_delta (int Nx, int Ny, int Xo, int Yo, float sigma, float kappa);
+bool tap_convolve_delta (int Nx, int Ny, int Xo, int Yo, float Nsigma, float sigma, float kappa);
 
 int main(int argc, char **argv) {
@@ -23 +23 @@
 
     // generate an image to convolve
-    tap_convolve_delta (301, 301, 150, 150, 2.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 200, 2.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 100, 2.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 200, 2.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 100, 2.0, 1.0);
+    tap_convolve_delta (301, 301, 150, 150, 3.0, 2.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 3.0, 2.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 3.0, 2.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 3.0, 2.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 3.0, 2.0, 1.0);
 
-    tap_convolve_delta (301, 301, 150, 150, 3.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 200, 3.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 100, 3.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 200, 3.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 100, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 150, 150, 3.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 3.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 3.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 3.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 3.0, 3.0, 1.0);
 
-    tap_convolve_delta (301, 301, 150, 150, 1.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 200, 1.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 100, 1.0, 1.0);
-    tap_convolve_delta (301, 301, 200, 200, 1.0, 1.0);
-    tap_convolve_delta (301, 301, 100, 100, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 150, 150, 3.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 3.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 3.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 3.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 3.0, 1.0, 1.0);
 
-    tap_convolve_delta (301, 301, 150, 150, 2.0, 2.0);
-    tap_convolve_delta (301, 301, 100, 200, 2.0, 2.0);
-    tap_convolve_delta (301, 301, 200, 100, 2.0, 2.0);
-    tap_convolve_delta (301, 301, 200, 200, 2.0, 2.0);
-    tap_convolve_delta (301, 301, 100, 100, 2.0, 2.0);
+    tap_convolve_delta (301, 301, 150, 150, 3.0, 2.0, 2.0);
+    tap_convolve_delta (301, 301, 100, 200, 3.0, 2.0, 2.0);
+    tap_convolve_delta (301, 301, 200, 100, 3.0, 2.0, 2.0);
+    tap_convolve_delta (301, 301, 200, 200, 3.0, 2.0, 2.0);
+    tap_convolve_delta (301, 301, 100, 100, 3.0, 2.0, 2.0);
+
+    tap_convolve_delta (301, 301, 150, 150, 4.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 4.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 4.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 4.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 4.0, 3.0, 1.0);
+
+    tap_convolve_delta (301, 301, 150, 150, 5.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 5.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 5.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 5.0, 3.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 5.0, 3.0, 1.0);
+
+    tap_convolve_delta (301, 301, 150, 150, 5.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 200, 5.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 100, 5.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 200, 200, 5.0, 1.0, 1.0);
+    tap_convolve_delta (301, 301, 100, 100, 5.0, 1.0, 1.0);
 
     ok(!psMemCheckLeaks (id, NULL, stdout, false), "no memory leaks");
@@ -52 +70 @@
 }
 
-bool tap_convolve_delta (int Nx, int Ny, int Xo, int Yo, float sigma, float kappa) {
+bool tap_convolve_delta (int Nx, int Ny, int Xo, int Yo, float Nsigma, float sigma, float kappa) {
 
     bool status;
@@ -60 +78 @@
     input->data.F32[Yo][Xo] = 1.0;
 
-    psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheAlloc (3.0);
+    psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheAlloc (Nsigma);
     ok(smdata, "init smdata");
     ok(!smdata->radflux, "init radflux to NULL");
-    ok(smdata->Nsigma == 3, "init Nsigma to 3");
+    ok(smdata->Nsigma == Nsigma, "init Nsigma");
     
     status = psImageSmooth2dCacheKernel_PS1_V1 (smdata, sigma, kappa);
@@ -71 +89 @@
     ok(status, "smoothed image");
     
-    float s = 0.0;
+    double s = 0.0;
 
     psImage *model = psImageAlloc (Nx, Ny, PS_TYPE_F32);
@@ -77 +95 @@
     for (int iy = 0; iy < model->numRows; iy++) {
         for (int ix = 0; ix < model->numCols; ix++) {
-            float z = PS_SQR((ix + 0.5 - Xo - 0.5) / sigma) + PS_SQR((iy + 0.5 - Yo - 0.5) / sigma);
-            if (z > PS_SQR(smdata->Nsigma)) continue;
+            float z = 0.5*PS_SQR((ix + 0.5 - Xo - 0.5) / sigma) + 0.5*PS_SQR((iy + 0.5 - Yo - 0.5) / sigma);
+            if (z > 0.5*PS_SQR(smdata->Nsigma)) continue;
            
             float f = 1.0 / (1.0 + z*kappa + pow(z, 1.666));
@@ -101 +119 @@
         }
     }
-    ok (fabs(min_df) < 1e-5, "minor deviations");
-    ok (fabs(max_df) < 1e-5, "minor deviations");
+    ok (fabs(min_df) < 3e-5, "minor deviations");
+    ok (fabs(max_df) < 3e-5, "minor deviations");
 
-    if ((fabs(min_df) >= 1e-5) || (fabs(max_df) >= 1e-5)) {
+    if ((fabs(min_df) >= 3e-5) || (fabs(max_df) >= 3e-5)) {
         psFits *fits = NULL;
         fits = psFitsOpen ("input.fits", "w");