Changeset 14806

Timestamp:

Sep 10, 2007, 2:08:40 PM (19 years ago)

Author:

Paul Price

Message:

Adding support for getting stamps from sources.

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (2 diffs)
• ppSubCamera.c (modified) (5 diffs)
• ppSubReadout.c (modified) (1 diff)

trunk/ppSub/src/ppSubArguments.c

@@ -18 +18 @@
     fprintf(stderr, "\nPan-STARRS PSF-matched image subtraction\n\n");
     fprintf(stderr, "Usage: %s INPUT.fits REFERENCE.fits OUTPUT_ROOT \n"
-            "\t[-psf REFERENCE.psf.fits]\n\n"
+            "\t[-psf REFERENCE.psf.fits] [-sources REFERENCE.cmf]\n\n"
             "This subtracts the convolved REFERENCE from the INPUT, by default.\n",
             program);
@@ -177 +177 @@
                       psArgumentGet(argc, argv, "-psf") ? true : false);
     pmConfigFileSetsMD(config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", NULL);
+    pmConfigFileSetsMD(config->arguments, &argc, argv, "PPSUB.SOURCES", "-sources", NULL);
 
     psMetadata *arguments = psMetadataAlloc(); // Command-line arguments

trunk/ppSub/src/ppSubCamera.c

@@ -28 +28 @@
     pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.MASK", "INPUT.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.MASK");
         return NULL;
     }
@@ -39 +39 @@
     pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.WEIGHT");
         return NULL;
     }
@@ -62 +62 @@
     pmFPAfile *refMask = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.MASK", "REF.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.MASK");
         return NULL;
     }
@@ -73 +73 @@
     pmFPAfile *refWeight = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.WEIGHT");
         return NULL;
     }
@@ -128 +128 @@
     psFree(view);
 
+    pmFPAfile *sources = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.SOURCES", "SOURCES");
+    if (!sources) {
+        psError(PS_ERR_IO, false, "Failed to load file definition PPSUB.SOURCES");
+        return false;
+    }
+    if (ref->type != PM_FPA_FILE_CMF) {
+        psError(PS_ERR_IO, true, "PPSUB.SOURCES is not of type CMF");
+        return false;
+    }
+
     // psPhot input
     if (psMetadataLookup(config->arguments, "PSPHOT.PSF")) {

trunk/ppSub/src/ppSubReadout.c

@@ -83 +83 @@
     }
 
-    if (!pmSubtractionMatch(outRO, refRO, inRO, footprint, regionSize, spacing, threshold, stampsName,
-                            NAN, type, size, order, widths, orders, inner, ringsOrder, binning, optimum,
-                            optWidths, optOrder, optThresh, iter, rej, maskBad, maskBlank)) {
+    psArray *sources = psMetadataLookupPtr(&mdok, refRO->analysis, "PSPHOT.SOURCES"); // Sources in image
+
+    if (!pmSubtractionMatch(outRO, refRO, inRO, footprint, regionSize, spacing, threshold, sources,
+                            stampsName, NAN, 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.");
         psFree(outRO);