Changeset 2711

Timestamp:

Dec 13, 2004, 6:31:12 PM (22 years ago)

Author:

Paul Price

Message:

Seems to be working well. Writing up.

Location:

trunk/stac/src

Files:

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

trunk/stac/src/Makefile

@@ -1 +1 @@
 SHELL = /bin/sh
 CC = gcc
-CFLAGS += -O2 -g -std=c99 -I/home/mithrandir/price/psLib3/psLib/include -DCRFLUX
+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)
@@ -24 +24 @@
                 $(CC) $(CFLAGS) -o $@ median.o $(LDFLAGS) $(OPTFLAGS)
 
+getPixels:      getPixels.o
+                $(CC) $(CFLAGS) -o $@ getPixels.o $(LDFLAGS) $(OPTFLAGS)
+
 
 clean:
@@ -41 +44 @@
                 -$(RM) test_[0-3].fits.shifterr.*
                 -$(RM) leaks.dat
-                ./stac -v -k 3 -f 0.7 -G 0.77 testout.fits test_0.fits test_1.fits test_2.fits test_3.fits
+                ./stac -v -k 2.5 -f 0.5 -G 0.96 testout.fits test_0.fits test_1.fits test_2.fits test_3.fits
 
 # Run profiling.

trunk/stac/src/stac.c

@@ -49 +49 @@
     // Combine with rejection
     psArray *rejected = NULL;
-    psImage *combined = stacCombine(transformed, transformedErrors, 1,  &rejected, config);
+    psImage *combined = stacCombine(transformed, transformedErrors, 2,  &rejected, config);
 
 #ifdef TESTING

trunk/stac/src/stacConfig.c

@@ -38 +38 @@
     config->inputs = NULL;
     config->output = NULL;
-    config->outnx = 1024;
-    config->outny = 1024;
+    config->outnx = 512;
+    config->outny = 512;
     config->saturated = 65536.0;
     config->bad = 0.0;

trunk/stac/src/stacTransform.c

@@ -206 +206 @@
                 (void)psPlaneTransformApply(detector, map, sky);
 
+                // Change PS_INTERPOLATE_BILINEAR to best available technique.
                 outImage->data.F32[y][x] = (psF32)psImagePixelInterpolate(image, detector->x + 0.5,
                                                                           detector->y + 0.5, mask, 1, 0.0,