Changeset 25989

Timestamp:

Nov 1, 2009, 4:03:29 PM (17 years ago)

Author:

eugene

Message:

psf clump region were being saved in the wrong location

File:

• trunk/psphot/src/psphotRoughClass.c (modified) (4 diffs)

trunk/psphot/src/psphotRoughClass.c

@@ -37 +37 @@
         }
     }
-    psMetadataAddS32 (recipe, PS_LIST_TAIL, "PSF.CLUMP.NREGIONS",  PS_META_REPLACE, "psf clump regions", nRegion);
+    psMetadataAddS32 (readout->analysis, PS_LIST_TAIL, "PSF.CLUMP.NREGIONS",  PS_META_REPLACE, "psf clump regions", nRegion);
 
     // optional printout of source moments only
@@ -51 +51 @@
 }
 
-bool psphotRoughClassRegion (int nRegion, psRegion *region, psArray *sources, psMetadata *target, psMetadata *recipe, const bool havePSF) {
+bool psphotRoughClassRegion (int nRegion, psRegion *region, psArray *sources, psMetadata *analysis, psMetadata *recipe, const bool havePSF) {
 
     bool status;
@@ -61 +61 @@
     assert (maskSat);
 
+    // the regions are saved on the readout->analysis metadata folder (passed to us as analysis)
     snprintf (regionName, 64, "PSF.CLUMP.REGION.%03d", nRegion);
-    psMetadata *regionMD = psMetadataLookupPtr (&status, target, regionName);
+    psMetadata *regionMD = psMetadataLookupPtr (&status, analysis, regionName);
     if (!regionMD) {
         // allocate the region metadata folder and add this region to it.
         regionMD = psMetadataAlloc();
-        psMetadataAddMetadata (target, PS_LIST_TAIL, regionName, PS_META_REPLACE, "psf clump region", regionMD);
+        psMetadataAddMetadata (analysis, PS_LIST_TAIL, regionName, PS_META_REPLACE, "psf clump region", regionMD);
         psFree (regionMD);
     }
@@ -74 +75 @@
         // determine the PSF parameters from the source moment values
         // XXX why not save the psfClump as a PTR?
-        psfClump = pmSourcePSFClump (region, sources, target);
+        psfClump = pmSourcePSFClump (region, sources, recipe);
         psMetadataAddF32 (regionMD, PS_LIST_TAIL, "PSF.CLUMP.X",  PS_META_REPLACE, "psf clump center", psfClump.X);
         psMetadataAddF32 (regionMD, PS_LIST_TAIL, "PSF.CLUMP.Y",  PS_META_REPLACE, "psf clump center", psfClump.Y);