Changeset 17460

Timestamp:

Apr 21, 2008, 8:19:14 AM (18 years ago)

Author:

eugene

Message:

convert to FFT for grow (should be dynamic based on circle size

File:

• branches/eam_branch_20080413/psphot/src/pmFootprintArrayGrow.c (modified) (4 diffs)

branches/eam_branch_20080413/psphot/src/pmFootprintArrayGrow.c

@@ -8 +8 @@
     assert (footprints->n == 0 || pmFootprintTest(footprints->data[0]));
 
+    psTimerStart ("grow");
+
     if (footprints->n == 0) {           // we don't know the size of the footprint's region
         return psArrayAlloc(0);
@@ -16 +18 @@
      */
     psImage *idImage = pmSetFootprintArrayIDs(footprints, true);
+    psLogMsg ("psphot", PS_LOG_DETAIL, "set footprint array IDs: %f sec\n", psTimerMark ("grow"));
+
     if (r <= 0) {
         r = 1;                          // r == 1 => no grow
@@ -32 +36 @@
     }
 
+# if (1)    
+    psImage *f32ImageIn = psImageCopy (NULL, idImage, PS_TYPE_F32);
+    psImage *f32ImageOut = psImageConvolveFFT(NULL, f32ImageIn, NULL, 0, circle);
+    psImage *grownIdImage = psImageCopy (NULL, f32ImageOut, PS_TYPE_S32);
+    psFree (f32ImageIn);
+    psFree (f32ImageOut);
+# else
     psImage *grownIdImage = psImageConvolveDirect(NULL, idImage, circle); // Here's the actual grow step
+# endif
+
+    psLogMsg ("psphot", PS_LOG_DETAIL, "convolved with grow disc: %f sec\n", psTimerMark ("grow"));
     psFree(circle);     
 
     psArray *grown = pmFootprintsFind(grownIdImage, 0.5, 1); // and here we rebuild the grown footprints
+    psLogMsg ("psphot", PS_LOG_DETAIL, "found grown footprints: %f sec\n", psTimerMark ("grow"));
+
     assert (grown != NULL);
     psFree(idImage); psFree(grownIdImage);
@@ -46 +62 @@
     psFree((psArray *)peaks);
 
+    psLogMsg ("psphot", PS_LOG_DETAIL, "finished grow: %f sec\n", psTimerMark ("grow"));
+
     return grown;