Changeset 31521

Timestamp:

May 10, 2011, 6:46:00 PM (15 years ago)

Author:

eugene

Message:

add MIN SX,SY for psf clump; do not error on missing FPA.OBS (why is it missing?)

Location:

branches/eam_branches/ipp-20110505/psModules/src

Files:

• camera/pmFPAfile.c (modified) (1 diff)
• objects/pmSource.c (modified) (2 diffs)
• objects/pmSource.h (modified) (1 diff)
• objects/pmSourceIO.c (modified) (1 diff)

branches/eam_branches/ipp-20110505/psModules/src/camera/pmFPAfile.c

@@ -201 +201 @@
     newName = psStringCopy(rule);
 
+    bool status = false;
     if (strstr(newName, "{FPA.OBS}")) {
-        char *name = psMetadataLookupStr(NULL, fpa->concepts, "FPA.OBS");
+        char *name = psMetadataLookupStr(&status, fpa->concepts, "FPA.OBS");
         if (name) {
             psStringSubstitute(&newName, name, "{FPA.OBS}");
-        }
+        } 
     }
     if (strstr(newName, "{FPA.NAME}")) {

branches/eam_branches/ipp-20110505/psModules/src/objects/pmSource.c

@@ -362 +362 @@
 *****************************************************************************/
 
-pmPSFClump pmSourcePSFClump(psImage **savedImage, psRegion *region, psArray *sources, float PSF_SN_LIM, float PSF_CLUMP_GRID_SCALE, psF32 SX_MAX, psF32 SY_MAX, psF32 AR_MAX)
+pmPSFClump pmSourcePSFClump(psImage **savedImage, psRegion *region, psArray *sources, float PSF_SN_LIM, float PSF_CLUMP_GRID_SCALE, psF32 SX_MAX, psF32 SY_MAX, psF32 SX_MIN, psF32 SY_MIN, psF32 AR_MAX)
 {
     psTrace("psModules.objects", 10, "---- begin ----\n");
@@ -422 +422 @@
 
             // Sx,Sy are limited at 0.  a peak at 0,0 is artificial
-            if (fabs(Mxx) < 0.05 || fabs(Myy < 0.05)) {
+            if (fabs(Mxx) < SX_MIN || fabs(Myy < SY_MIN)) {
                 psTrace("psModules.objects", 10,
                         "Rejecting source from clump because of low moments (%f,%f)\n",

branches/eam_branches/ipp-20110505/psModules/src/objects/pmSource.h

@@ -219 +219 @@
     psF32 SX_MAX, 
     psF32 SY_MAX, 
+    psF32 SX_MIN, 
+    psF32 SY_MIN, 
     psF32 AR_MAX
 );

branches/eam_branches/ipp-20110505/psModules/src/objects/pmSourceIO.c

@@ -727 +727 @@
 
     psMetadata *fileData = psMetadataLookupMetadata(NULL, file->format, "FILE"); // File information
-    const char *fpaNameHdr = psMetadataLookupStr(NULL, fileData, "FPA.OBS");
+    const char *fpaNameHdr = psMetadataLookupStr(&status, fileData, "FPA.OBS");
     if (fpaNameHdr && strlen(fpaNameHdr) > 0) {
-        const char *fpaName = psMetadataLookupStr(NULL, fpa->concepts, "FPA.OBS");
-        psMetadataAddStr(outhead, PS_LIST_TAIL, fpaNameHdr, PS_META_REPLACE,
-                         "FPA observation identifier", fpaName);
+        const char *fpaName = psMetadataLookupStr(&status, fpa->concepts, "FPA.OBS");
+        if (fpaName) {
+            psMetadataAddStr(outhead, PS_LIST_TAIL, fpaNameHdr, PS_META_REPLACE, "FPA observation identifier", fpaName);
+        }
     }