Changeset 23763

Timestamp:

Apr 8, 2009, 5:11:55 PM (17 years ago)

Author:

Paul Price

Message:

Copy concepts to inverse file, so that photcode etc can be set.

Location:

trunk/ppSub/src

Files:

• ppSubMakePSF.c (modified) (2 diffs)
• ppSubReadoutInverse.c (modified) (1 diff)

trunk/ppSub/src/ppSubMakePSF.c

@@ -41 +41 @@
     }
 
-    psMetadata *psphotRecipe = psMetadataLookupMetadata(NULL, config->recipes, PSPHOT_RECIPE);// psphot recipe
-    psAssert(recipe, "We checked this earlier, so it should be here.");
-
     bool reverse = psMetadataLookupBool(NULL, config->arguments, "REVERSE"); // Reverse sense of subtraction?
 
@@ -82 +79 @@
     }
 
-    // Record the FWHM in the output header
-    pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); // Output readout
-    psFree(view);
-    pmHDU *hdu = pmHDUFromCell(outRO->parent); // HDU with header
-    psMetadataItemSupplement(hdu->header, psphotRecipe, "FWHM_MAJ");
-    psMetadataItemSupplement(hdu->header, psphotRecipe, "FWHM_MIN");
-
     // Get rid of the generated header; it will be regenerated by the real photometry run
     psMetadataRemoveKey(photRO->analysis, "PSPHOT.HEADER");
 
-    data->psf = psMemIncrRefCounter(psMetadataLookupPtr(NULL, photRO->parent->parent->analysis,
-                                                        "PSPHOT.PSF"));
+    if (!data->quality) {
+        data->psf = psMemIncrRefCounter(psMetadataLookupPtr(NULL, photRO->parent->parent->analysis,
+                                                            "PSPHOT.PSF"));
+    }
+
+    psFree(view);
 
     return true;

trunk/ppSub/src/ppSubReadoutInverse.c

@@ -24 +24 @@
     invRO->data_exists = invRO->parent->data_exists = invRO->parent->parent->data_exists = true;
 
+    pmConceptsCopyFPA(invRO->parent->parent->parent, outRO->parent->parent->parent, true, true);
+
     return true;
 }