Changeset 3660

Timestamp:

Apr 4, 2005, 6:15:21 PM (21 years ago)

Author:

Paul Price

Message:

Adding shiftSize to calculate (without doing the whole stac procedure) the size of the output image. Moving the help stuff out to separate files

Location:

trunk/stac/src

Files:

• Makefile (modified) (3 diffs)
• shiftSize.c (added)
• shiftSizeHelp.c (added)
• stac.c (modified) (2 diffs)
• stac.h (modified) (1 diff)
• stacConfig.c (modified) (1 diff)
• stacHelp.c (added)

trunk/stac/src/Makefile

@@ -6 +6 @@
 
 STAC = stac.o stacConfig.o stacRead.o stacErrorImages.o stacTransform.o stacCheckMemory.o \
-        stacCombine.o stacInvertMaps.o stacRejection.o stacAreaOfInterest.o stacSize.o stacScales.o
+        stacCombine.o stacInvertMaps.o stacRejection.o stacAreaOfInterest.o stacSize.o stacScales.o \
+        stacHelp.o
 
-SHIFT = shift.o stacConfig.o stacRead.o stacErrorImages.o stacTransform.o stacCheckMemory.o \
+SHIFT = shift.o stacRead.o stacErrorImages.o stacTransform.o stacCheckMemory.o \
         stacCombine.o stacInvertMaps.o stacSize.o
 
-FITTRANS = fitTrans.o fitTransConfig.o fitTransRead.o stacCheckMemory.o fitTransSolve.o
-
-TEST_SHIFT = testShift.o stacConfig.o stacRead.o stacErrorImages.o stacTransform.o stacCheckMemory.o \
-        stacInvertMaps.o
-
-PHOTSCALE = photScale.o
+SHIFTSIZE = shiftSize.o shiftSizeHelp.o stacWrite.o stacConfig.o stacRead.o stacCheckMemory.o stacSize.o
 
 .PHONY: tags clean empty test profile optimise
@@ -29 +25 @@
                 $(CC) $(CFLAGS) -o $@ $(SHIFT) $(LDFLAGS) $(OPTFLAGS)
 
-photScale:      $(PHOTSCALE)
-                $(CC) $(CFLAGS) -o $@ $(PHOTSCALE) $(LDFLAGS) $(OPTFLAGS)
-
-calcGrad:       calcGrad.o
-                $(CC) $(CFLAGS) -o $@ calcGrad.o $(LDFLAGS) $(OPTFLAGS)
-
-median:         median.o
-                $(CC) $(CFLAGS) -o $@ median.o $(LDFLAGS) $(OPTFLAGS)
-
-getPixels:      getPixels.o
-                $(CC) $(CFLAGS) -o $@ getPixels.o $(LDFLAGS) $(OPTFLAGS)
-
-fitTrans:       $(FITTRANS)
-                $(CC) $(CFLAGS) -o $@ $(FITTRANS) $(LDFLAGS) $(OPTFLAGS)
-
-testShift:      $(TEST_SHIFT)
-                $(CC) $(CFLAGS) -o $@ $(TEST_SHIFT) $(LDFLAGS) $(OPTFLAGS)
+shiftSize:      $(SHIFTSIZE)
+                $(CC) $(CFLAGS) -o $@ $(SHIFTSIZE) $(LDFLAGS) $(OPTFLAGS)
 
 clean:
@@ -66 +47 @@
                 -$(RM) test_[0-3].fits.rejmap
                 -$(RM) leaks.dat
-#               ./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
                 ./stac -v testout.fits test_0.fits test_1.fits test_2.fits test_3.fits
 

trunk/stac/src/stac.c

@@ -27 +27 @@
     // Set trace levels
     psTraceSetLevel(".",0);
-    psTraceSetLevel(".psLib", 0);
     psTraceSetLevel("stac.checkMemory",10);
     psTraceSetLevel("stac.config",10);
@@ -55 +54 @@
     psTrace("stac.time", 1, "I/O completed at %f seconds\n", getTime() - startTime);
 
-    // Get size
-    stacSize(config, inputs, maps);
+    // Get size, if not input
+    if (config->outnx == 0 || config->outny == 0) {
+        stacSize(config, inputs, maps);
+    }
 
     // Invert maps

trunk/stac/src/stac.h

@@ -217 +217 @@
     );
 
+
+
+/************************************************************************************************************/
+
+// stacWrite.c
+
+// Write maps out
+bool stacWriteMaps(const psArray *maps, // Maps to write
+                   const stacConfig *config // Configuration
+    );
+
+/************************************************************************************************************/
+
 #endif

trunk/stac/src/stacConfig.c

@@ -4 +4 @@
 #include <getopt.h>
 #include <string.h>
+#include "pslib.h"
 #include "stac.h"
-
-void help(const char *name)
-{
-    fprintf (stderr, "STAC: Simultaneous Telescope Array Combination\n"
-             "Usage: %s [-h] [-v] [-g GAIN] [-r RN] [-o NX NY] [-S] [-s SAT] [-b BAD] [-p FILE MAP] [-a APER] [-k REJ] [-n NREJECT] [-k FRAC] [-G GRAD] OUT IN1 IN2...\n"
-             "where\n"
-             "\t-h           Help (this info)\n"
-             "\t-v           Increase verbosity level\n"
-             "\t-g           Gain (e/ADU) for detectors\n"
-             "\t-r           Read noise (e) for detectors\n"
-             "\t-o NX NY     Size of output image (512, 512)\n"
-             "\t-S           Save shifted images (false)\n"
-             "\t-s SAT       Saturation level (65535)\n"
-             "\t-b BAD       Bad level (0)\n"
-             "\t-p FILE MAP  Specify file containing star coordinates, with map\n"
-             "\t-a APER      Aperture size to use for photometry (3 pix)\n"
-             "\t-k REJ       Rejection level (k-sigma; 3.5)\n"
-             "\t-n NREJECT   Number of rejection iterations (2)\n"
-             "\t-f FRAC      Fraction of pixel to be marked before considered bad (0.5)\n"
-             "\t-d GRAD      Gradient threshold for pixel to be marked (0.0)\n"
-             "\tOUT          Output image\n"
-             "\tIN1, IN2...  Input images, which have associated .map files.\n",
-             name
-        );
-}
-
 
 stacConfig *stacConfigAlloc(void)