Changeset 14811

Timestamp:

Sep 10, 2007, 2:44:14 PM (19 years ago)

Author:

Paul Price

Message:

Adding ability to get stamps from sources.

Location:

trunk/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackArguments.c (modified) (2 diffs)
• ppStackCamera.c (modified) (1 diff)
• ppStackMatch.c (modified) (2 diffs)
• ppStackReadout.c (modified) (2 diffs)

trunk/ppStack/src/ppStack.h

@@ -37 +37 @@
 bool ppStackMatch(pmReadout *output,    ///< Convolved readout
                   const pmReadout *input, ///< Readout to be convolved
+                  const pmReadout *sourcesRO, ///< Readout with sources
                   const pmConfig *config ///< Configuration
     );

trunk/ppStack/src/ppStackArguments.c

@@ -19 +19 @@
 {
     fprintf(stderr, "\nPan-STARRS Image combination\n\n");
-    fprintf(stderr, "Usage: %s INPUTS.mdc OUTPUT_ROOT -target FWHM -stamps FILENAME\n"
+    fprintf(stderr, "Usage: %s INPUTS.mdc OUTPUT_ROOT [-target FWHM] [-sources STAMPS.cmf]\n"
             "where INPUTS.mdc contains various METADATAs, each with:\n"
             "\tIMAGE(STR):     Image filename\n"
@@ -101 +101 @@
     assert(config);
 
+    pmConfigFileSetsMD(config->arguments, &argc, argv, "PPSTACK.SOURCES", "-sources", NULL);
+
     psMetadata *arguments = psMetadataAlloc(); // Command-line arguments
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stamps", 0, "Stamps file with x,y,flux per line", NULL);

trunk/ppStack/src/ppStackCamera.c

@@ -214 +214 @@
     }
 
+    // Sources for use as stamps
+    bool status = false;                // Found the file?
+    pmFPAfile *sources = pmFPAfileDefineFromArgs(&status, config, "PPSTACK.SOURCES", "PPSTACK.SOURCES");
+    if (!status) {
+        psError(PS_ERR_IO, false, "Failed to load file definition PPSTACK.SOURCES");
+        return false;
+    }
+    if (sources && sources->type != PM_FPA_FILE_CMF) {
+        psError(PS_ERR_IO, true, "PPSTACK.SOURCES is not of type CMF");
+        return false;
+    }
+
     // For photometry, we operate on the chip-mosaicked image
     // we create a copy of the mosaicked image for psphot so we can write out a clean image

trunk/ppStack/src/ppStackMatch.c

@@ -11 +11 @@
 //#define TESTING
 
-bool ppStackMatch(pmReadout *output, const pmReadout *input, const pmConfig *config)
+bool ppStackMatch(pmReadout *output, const pmReadout *input, const pmReadout *sourcesRO,
+                  const pmConfig *config)
 {
     // Look up appropriate values from the ppSub recipe
@@ -51 +52 @@
     }
 
+    psArray *sources = psMetadataLookupPtr(&mdok, sourcesRO->analysis, "PSPHOT.SOURCES"); // Sources in image
+
     // Do the image matching
-    if (!pmSubtractionMatch(output, input, NULL, footprint, regionSize, spacing, threshold, stampsName,
-                            target, type, size, order, widths, orders, inner, ringsOrder, binning, optimum,
-                            optWidths, optOrder, optThresh, iter, rej, maskBad, maskBlank)) {
+    if (!pmSubtractionMatch(output, input, NULL, footprint, regionSize, spacing, threshold, sources,
+                            stampsName, target, type, size, order, widths, orders, inner, ringsOrder,
+                            binning, optimum, optWidths, optOrder, optThresh, iter, rej, maskBad,
+                            maskBlank)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to match images.");
         return false;

trunk/ppStack/src/ppStackReadout.c

@@ -34 +34 @@
     // Get the input sources
     psArray *stack = psArrayAllocEmpty(ARRAY_BUFFER); // The stack of inputs
+    pmReadout *sources = pmFPAfileThisReadout(config->files, view, "PPSTACK.SOURCES"); // Sources for stamps
     psMetadataIterator *fileIter = psMetadataIteratorAlloc(config->files, PS_LIST_HEAD,
                                                            "^PPSTACK.INPUT$"); // Iterator over input files
@@ -82 +83 @@
         // Generate convolved version of input
         pmReadout *convolved = pmReadoutAlloc(NULL); // Convolved version of input readout
-        if (!ppStackMatch(convolved, ro, config)) {
+        if (!ppStackMatch(convolved, ro, sources, config)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to match image %d.", fileNum);
             psFree(stats);