Changeset 2751

Timestamp:

Dec 17, 2004, 11:39:39 AM (22 years ago)

Author:

Paul Price

Message:

Working well, and timing OK, but can yet be optimised.

Location:

trunk/stac/src

Files:

• Makefile (modified) (1 diff)
• stac.c (modified) (4 diffs)
• stacRejection.c (modified) (3 diffs)
• stacTransform.c (modified) (3 diffs)

trunk/stac/src/Makefile

@@ -1 +1 @@
 SHELL = /bin/sh
 CC = gcc
-CFLAGS += -O2 -g -std=c99 -I/home/mithrandir/price/psLib3/psLib/include -DCRFLUX -DTESTING
+CFLAGS += -O2 -g -std=c99 -I/home/mithrandir/price/psLib3/psLib/include # -DCRFLUX -DTESTING
 PSLIB += -L/home/mithrandir/price/psLib3/psLib/lib/ -lpslib -lgsl -lgslcblas -lfftw3f -lsla -lcfitsio -lm
 LDFLAGS += $(PSLIB)

trunk/stac/src/stac.c

@@ -2 +2 @@
 #include "pslib.h"
 #include "stac.h"
+#include <sys/time.h>
+
+double getTime(void)
+/* Gets the current time.  Got this from Nick Kaiser's fetchpix.c */
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return(tv.tv_sec + 1.e-6 * tv.tv_usec);
+}
 
 
 int main(int argc, char **argv)
 {
+
+    double startTime = getTime();
 
 #if 0
@@ -24 +35 @@
     psTraceSetLevel("stac.combine",10);
     psTraceSetLevel("stac.rejection",10);
+    psTraceSetLevel("stac.time",10);
+    
 
     // Set logging level
@@ -46 +59 @@
     psArray *transformedErrors = NULL;
     psArray *transformed = stacTransform(inputs, inverseMaps, errors, &transformedErrors, NULL, config);
+
+    psTrace("stac.time",1,"Transformation completed at %f seconds\n", getTime() - startTime);
 
     // Combine with rejection
@@ -87 +102 @@
     psFree(combined);
 
-    // Check memory for leaks, corruption
+    psTrace("stac.time",1,"Combination completed at %f seconds\n", getTime() - startTime);
+
+   // Check memory for leaks, corruption
     stacCheckMemory();
 }

trunk/stac/src/stacRejection.c

@@ -162 +162 @@
 #endif
 
+#ifdef TESTING
                 // Check gradient
                 float meanGrads = 0.0;
@@ -184 +185 @@
                     meanGrads = 0;
                 }
+#else
+                float meanGrads = 10000.0;
+#endif
+
                 
 #ifdef TESTING
@@ -197 +202 @@
                         fprintf(crs, "%d %d --> %f %f %f\n", x, y, ((psImage*)(inputs->data[i]))->data.F32[y][x],
                                 maskVal, stacGradient(inputs->data[i], x, y));
+#endif
                     }
-#endif
                 } else {
                     mask->data.U8[y][x] = 0;

trunk/stac/src/stacTransform.c

@@ -176 +176 @@
         psImage *outError = psImageAlloc(nx, ny, PS_TYPE_F32);
         psTrace("stac.transform", 5, "Allocating space for transformed image, %dx%d\n", nx, ny);
+
+#if 0
+        // No need for initialisation, since we iterate over the entire output image.
         for (int y = 0; y < ny; y++) {
             for (int x = 0; x < nx; x++) {
@@ -182 +185 @@
             }
         }
+#endif
 
         // Mask
@@ -201 +205 @@
             for (int x = 0; x < nx; x++) {
                 // Transform!
-                // Could no doubt make this quicker by calculating derivatives and incrementing by those.
                 sky->x = (double)x + 0.5;
                 sky->y = (double)y + 0.5;