Changeset 4189

Timestamp:

Jun 9, 2005, 7:22:03 AM (21 years ago)

Author:

eugene

Message:

cleaning arg parsing, adding noise/mask images

Location:

trunk/psphot/src

Files:

• find_peaks.c (modified) (1 diff)
• load_args.c (added)
• psphot.c (modified) (3 diffs)
• setup.c (modified) (3 diffs)

trunk/psphot/src/find_peaks.c

@@ -19 +19 @@
     psImageSmooth (smooth, SIGMA, NSIGMA);
 
-    // XXX missing pslib functions:
-    // kernel = psKernelParts ();
-    // smooth = psImageConvolve (smooth, image, kernel, PS_PARTS);
+    psLogMsg ("psphot", 4, "smooth: %f sec\n", psTimerMark ("psphot"));
 
-    psLogMsg ("psphot", 4, "smooth: %f sec\n", psTimerMark ("psphot"));
 
     // find the peaks in the smoothed image 

trunk/psphot/src/psphot.c

@@ -7 +7 @@
     psMetadata *header  = NULL;         // input image header
     psImage    *image   = NULL;         // input image data
+    psImage    *noise   = NULL;         // input image data
+    psImage    *mask    = NULL;         // input image data
     psArray    *sources = NULL;
     psArray    *peaks   = NULL;         // a list of pmPeaks 
@@ -14 +16 @@
     psLogArguments (&argc, argv);
     psTraceArguments (&argc, argv);
-    if (argc != 4) usage ();
+    config = load_args (&argc, argv);
 
     // load input data (image and config)
-    setup (&image, &header, &config, argv);
+    // create or load mask and noise images
+    setup (&image, &mask, &noise, &header, config);
 
     // measure image stats for initial guess 
@@ -58 +61 @@
 }
 
-int usage () {
-
-    fprintf (stderr, "USAGE: psphot (image.fits) (output.fits) (config)\n");
-    exit (2);
-}
-
 void dump_image (psImage *image, char *filename) {
 

trunk/psphot/src/setup.c

@@ -1 +1 @@
 # include "psphot.h"
 
-bool setup (psImage **image, psMetadata **header, psMetadata **config, char **argv) 
+bool setup (psImage **image, psImage **mask, psImage **noise, psMetadata **header, psMetadata **config) 
 {
     int       Nfail;
@@ -9 +9 @@
     psTimerStart ("psphot");
 
-    *config = psMetadataParseConfig (NULL, &Nfail, argv[3], FALSE);
-
-    file   = psFitsAlloc (argv[1]);
+    char *input = pmConfigLookupSTR (&status, *config, *header, "INPUT");
+    file = psFitsAlloc (input);
 
     *header = psMetadataAlloc ();
@@ -27 +26 @@
     psMetadataAdd (*config, PS_LIST_TAIL, "GAIN",    PS_META_F32 | PS_META_REPLACE, "gain value used", GAIN);
 
+    // load the noise image if it exists, otherwise build from input
+    char *noiseName = pmConfigLookupSTR (&status, *config, *header, "NOISE");
+    if (status == true) {
+      file = psFitsAlloc (noiseName);
+      *noise  = psFitsReadImage  (*noise, file, region, 0);
+      psFree (file);
+    } else {
+      *value = psScalar (1.0 / GAIN);
+      *noise = BinaryOp (NULL, *image, '/', value);
+      psFree (value);
+
+      *value = psScalar (PS_SQR(RDNOISE/GAIN));
+      *noise = BinaryOp (*noise, *noise, '+', value);
+      psFree (value);
+    }
+
+    char *maskName = pmConfigLookupSTR (&status, *config, *header, "MASK");
+    if (status == true) {
+      file = psFitsAlloc (maskName);
+      *mask  = psFitsReadImage  (*mask, file, region, 0);
+      psFree (file);
+    } else {
+      *mask = psImageAlloc (image->numCols, image->numRows, PS_TYPE_U8);
+    }
+
     psLogMsg ("psphot", 3, "load data: %f sec\n", psTimerMark ("psphot"));