Changeset 23758

Timestamp:

Apr 8, 2009, 4:23:12 PM (17 years ago)

Author:

Paul Price

Message:

Fixing bad PHOTCODEs due to concepts not being set. Concepts for the convolved images weren't being inherited from the inputs, so added pmConceptsCopyFPA calls. Concepts for the photometry images weren't being inherited, so using pmFPACopy instead of copying the readout only.

Location:

trunk/ppSub/src

Files:

• ppSubMakePSF.c (modified) (2 diffs)
• ppSubMatchPSFs.c (modified) (1 diff)
• ppSubReadoutPhotometry.c (modified) (1 diff)

trunk/ppSub/src/ppSubMakePSF.c

@@ -58 +58 @@
     }
 
-#if 1
     pmFPAfile *photFile = psMetadataLookupPtr(&mdok, config->files, "PSPHOT.INPUT"); // Photometry file
-#if 0
-    pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
-    pmReadout *template = minuend;
-    if (!photRO) {
-        pmCell *cell = pmFPAviewThisCell(view, photFile->fpa); // Cell to photometer
-        photRO = pmReadoutAlloc(cell); // Output readout: subtraction
-    }
-    photRO->image = psImageCopy(photRO->image, template->image, PS_TYPE_F32);
-    if (template->variance) {
-        photRO->variance = psImageCopy(photRO->variance, template->variance, PS_TYPE_F32);
-    } else {
-        psFree(photRO->variance);
-        photRO->variance = NULL;
-    }
-    if (template->mask) {
-        photRO->mask = psImageCopy(photRO->mask, template->mask, PS_TYPE_IMAGE_MASK);
-    } else {
-        psFree(photRO->mask);
-        photRO->mask = NULL;
-    }
-#else
     if (!pmFPACopy(photFile->fpa, minuendFile->fpa)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to copy FPA for photometry");
@@ -90 +68 @@
         psMetadataRemoveKey(photRO->analysis, "PSPHOT.SOURCES");
     }
-#endif
-
-
-#else
-    // Supply the minuend pmFPAfile to psphot as PSPHOT.INPUT:
-    psMetadataAddPtr(config->files, PS_LIST_TAIL, "PSPHOT.INPUT", PS_DATA_UNKNOWN | PS_META_REPLACE,
-                     "psphot input: view on another pmFPAfile", minuendFile);
-#endif
 
     // Extract the loaded sources from the associated readout, and generate PSF

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -171 +171 @@
     }
 
+    pmConceptsCopyFPA(inConv->parent->parent->parent, inRO->parent->parent->parent, true, true);
+    pmConceptsCopyFPA(refConv->parent->parent->parent, refRO->parent->parent->parent, true, true);
+
     psImageCovarianceTransfer(inConv->variance, inConv->covariance);
     psImageCovarianceTransfer(refConv->variance, refConv->covariance);

trunk/ppSub/src/ppSubReadoutPhotometry.c

@@ -67 +67 @@
 
     pmFPAfile *photFile = psMetadataLookupPtr(&mdok, config->files, "PSPHOT.INPUT"); // Photometry file
+    pmFPAfile *inFile = psMetadataLookupPtr(&mdok, config->files, name); // Input file
+    if (!pmFPACopy(photFile->fpa, inFile->fpa)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy FPA for photometry");
+        psFree(view);
+        return false;
+    }
     pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout to photometer
-    if (!photRO) {
-        pmCell *cell = pmFPAviewThisCell(view, photFile->fpa); // Cell to photometer
-        photRO = pmReadoutAlloc(cell); // Output readout: subtraction
+    if (psMetadataLookup(photRO->analysis, "PSPHOT.SOURCES")) {
+        psMetadataRemoveKey(photRO->analysis, "PSPHOT.SOURCES");
     }
-    photRO->image = psImageCopy(photRO->image, inRO->image, PS_TYPE_F32);
-    if (inRO->variance) {
-        photRO->variance = psImageCopy(photRO->variance, inRO->variance, PS_TYPE_F32);
-    } else {
-        psFree(photRO->variance);
-        photRO->variance = NULL;
-    }
-    if (inRO->mask) {
-        photRO->mask = psImageCopy(photRO->mask, inRO->mask, PS_TYPE_IMAGE_MASK);
-    } else {
-        psFree(photRO->mask);
-        photRO->mask = NULL;
-    }
+
     psMetadataAddPtr(photRO->parent->parent->analysis, PS_LIST_TAIL, "PSPHOT.PSF",
                      PS_META_REPLACE | PS_DATA_UNKNOWN, "Point-spread function", data->psf);