Changeset 28030

Timestamp:

May 19, 2010, 2:09:25 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/czw_branch/20100427/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAMosaic.c (modified) (1 diff)
• src/objects/Makefile.am (modified) (1 diff)
• src/objects/pmPhotObj.c (modified) (1 diff)
• src/objects/pmPhotObj.h (modified) (1 diff)
• src/objects/pmSource.c (modified) (2 diffs)
• src/objects/pmSource.h (modified) (1 diff)
• src/objects/pmSourceExtendedPars.c (modified) (1 diff)
• src/objects/pmSourceExtendedPars.h (modified) (2 diffs)
• src/objects/pmSourceIO.c (modified) (5 diffs)
• src/objects/pmSourceIO.h (modified) (2 diffs)
• src/objects/pmSourceIO_CMF_PS1_DV1.c (modified) (1 diff)
• src/objects/pmSourceIO_CMF_PS1_SV1.c (copied) (copied from trunk/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c )

branches/czw_branch/20100427/psModules/src/camera/pmFPAMosaic.c

@@ -595 +595 @@
 
     if (cell->readouts->n > 1) {
-        psWarning("Cell contains more than one readout (%ld) --- mosaicking only the first.\n",
-                  cell->readouts->n);
+        psWarning("Skipping video cell for mosaic.\n");
+        return true;
     }
 

branches/czw_branch/20100427/psModules/src/objects/Makefile.am

@@ -43 +43 @@
         pmSourceIO_CMF_PS1_V1.c \
         pmSourceIO_CMF_PS1_V2.c \
+        pmSourceIO_CMF_PS1_SV1.c \
         pmSourceIO_CMF_PS1_DV1.c \
         pmSourceIO_MatchedRefs.c \

branches/czw_branch/20100427/psModules/src/objects/pmPhotObj.c

@@ -58 +58 @@
     if (!object->sources) {
         object->sources = psArrayAllocEmpty(1);
-        object->x = source->peak->xf;
-        object->y = source->peak->yf;
+        object->x  = source->peak->xf;
+        object->y  = source->peak->yf;
+        object->SN = source->peak->SN;
+    } else {
+        object->SN = PS_MAX(object->SN, source->peak->SN);
     }
     psArrayAdd (object->sources, 1, source);
     return true;
 }
+
+// sort by SN (descending)
+int pmPhotObjSortBySN (const void **a, const void **b)
+{
+    pmPhotObj *objA = *(pmPhotObj **)a;
+    pmPhotObj *objB = *(pmPhotObj **)b;
+
+    psF32 fA = objA->SN;
+    psF32 fB = objB->SN;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (-1);
+    if (diff < FLT_EPSILON) return (+1);
+    return (0);
+}

branches/czw_branch/20100427/psModules/src/objects/pmPhotObj.h

@@ -39 +39 @@
     float x;
     float y;
+    float SN;                           // max of peak->SN for all matched sources
 } pmPhotObj;
 
+pmPhotObj *pmPhotObjAlloc(void);
+
 bool pmPhotObjAddSource(pmPhotObj *object, pmSource *source);
-pmPhotObj *pmPhotObjAlloc(void);
+
+int pmPhotObjSortBySN (const void **a, const void **b);
 
 /// @}

branches/czw_branch/20100427/psModules/src/objects/pmSource.c

@@ -54 +54 @@
     psFree(tmp->moments);
     psFree(tmp->diffStats);
+    psFree(tmp->radial);
     psFree(tmp->blends);
     psTrace("psModules.objects", 10, "---- end ----\n");
@@ -116 +117 @@
     source->extpars = NULL;
     source->diffStats = NULL;
+    source->radial = NULL;
 
     source->region = psRegionSet(NAN, NAN, NAN, NAN);

branches/czw_branch/20100427/psModules/src/objects/pmSource.h

@@ -91 +91 @@
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
+    pmSourceRadialApertures *radial;    ///< radial flux in circular apertures
     int imageID;
 };

branches/czw_branch/20100427/psModules/src/objects/pmSourceExtendedPars.c

@@ -65 +65 @@
 }
 
+// pmSourceRadialApertures carries the raw radial flux information, including angular bins
+static void pmSourceRadialAperturesFree(pmSourceRadialApertures *radial)
+{
+    if (!radial) return;
+    psFree(radial->flux);
+    psFree(radial->fluxErr);
+    psFree(radial->fill);
+}
+
+pmSourceRadialApertures *pmSourceRadialAperturesAlloc()
+{
+    pmSourceRadialApertures *radial = (pmSourceRadialApertures *)psAlloc(sizeof(pmSourceRadialApertures));
+    psMemSetDeallocator(radial, (psFreeFunc) pmSourceRadialAperturesFree);
+
+    radial->flux = NULL;
+    radial->fluxErr = NULL;
+    radial->fill = NULL;
+    return radial;
+}
+
+bool psMemCheckSourceRadialApertures(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmSourceRadialAperturesFree);
+}
+
 // pmSourceEllipticalFlux carries the elliptical renormalized radial flux info
 static void pmSourceEllipticalFluxFree(pmSourceEllipticalFlux *flux)

branches/czw_branch/20100427/psModules/src/objects/pmSourceExtendedPars.h

@@ -20 +20 @@
     psVector *isophotalRadii;           // isophotal radius for the above angles
 } pmSourceRadialFlux;
+
+typedef struct {
+    psVector *flux;                     // fluxes measured at above radii
+    psVector *fluxErr;                  // formal error on the fluxes (sqrt\sum(variance))
+    psVector *fill;                     // angles corresponding to above radial profiles
+} pmSourceRadialApertures;
 
 typedef struct {
@@ -62 +68 @@
 bool psMemCheckSourceRadialFlux(psPtr ptr);
 
+pmSourceRadialApertures *pmSourceRadialAperturesAlloc();
+bool psMemCheckSourceRadialApertures(psPtr ptr);
+
 pmSourceEllipticalFlux *pmSourceEllipticalFluxAlloc();
 bool psMemCheckSourceEllipticalFlux(psPtr ptr);

branches/czw_branch/20100427/psModules/src/objects/pmSourceIO.c

@@ -539 +539 @@
                 status &= pmSourcesWrite_CMF_PS1_V2 (file->fits, readout, sources, file->header, outhead, dataname);
             }
+            if (!strcmp (exttype, "PS1_SV1")) {
+                status &= pmSourcesWrite_CMF_PS1_SV1 (file->fits, readout, sources, file->header, outhead, dataname, recipe);
+            }
             if (!strcmp (exttype, "PS1_DV1")) {
                 status &= pmSourcesWrite_CMF_PS1_DV1 (file->fits, readout, sources, file->header, outhead, dataname);
@@ -556 +559 @@
                     status &= pmSourcesWrite_CMF_PS1_V2_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
                 }
+                if (!strcmp (exttype, "PS1_SV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_SV1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
                 if (!strcmp (exttype, "PS1_DV1")) {
                     status &= pmSourcesWrite_CMF_PS1_DV1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
@@ -573 +579 @@
                     status &= pmSourcesWrite_CMF_PS1_V2_XFIT (file->fits, readout, sources, xfitname);
                 }
+                if (!strcmp (exttype, "PS1_SV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_SV1_XFIT (file->fits, readout, sources, xfitname);
+                }
                 if (!strcmp (exttype, "PS1_DV1")) {
                     status &= pmSourcesWrite_CMF_PS1_DV1_XFIT (file->fits, readout, sources, xfitname);
@@ -981 +990 @@
         // we need to find the corresponding table EXTNAME.
         // first check the header
-        char *extdata = psMetadataLookupStr (NULL, hdu->header, "EXTDATA");
+        char *extdata = psMetadataLookupStr (&status, hdu->header, "EXTDATA");
         if (extdata) {
             // if EXTDATA is defined in the header, use that value for 'dataname'
@@ -1023 +1032 @@
             if (!strcmp (exttype, "PS1_V2")) {
                 sources = pmSourcesRead_CMF_PS1_V2 (file->fits, hdu->header);
+            }
+            if (!strcmp (exttype, "PS1_SV1")) {
+                sources = pmSourcesRead_CMF_PS1_SV1 (file->fits, hdu->header);
             }
             if (!strcmp (exttype, "PS1_DV1")) {

branches/czw_branch/20100427/psModules/src/objects/pmSourceIO.h

@@ -43 +43 @@
 bool pmSourcesWrite_CMF_PS1_V2_XFIT (psFits *fits, pmReadout *readout, psArray *sources, char *extname);
 
+bool pmSourcesWrite_CMF_PS1_SV1 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, psMetadata *recipe);
+bool pmSourcesWrite_CMF_PS1_SV1_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
+bool pmSourcesWrite_CMF_PS1_SV1_XFIT (psFits *fits, pmReadout *readout, psArray *sources, char *extname);
+
 bool pmSourcesWrite_CMF_PS1_DV1 (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname);
 bool pmSourcesWrite_CMF_PS1_DV1_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
@@ -57 +61 @@
 psArray *pmSourcesRead_CMF_PS1_V1 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_CMF_PS1_V2 (psFits *fits, psMetadata *header);
+psArray *pmSourcesRead_CMF_PS1_SV1 (psFits *fits, psMetadata *header);
 psArray *pmSourcesRead_CMF_PS1_DV1 (psFits *fits, psMetadata *header);
 

branches/czw_branch/20100427/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

@@ -175 +175 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",     PS_DATA_F32, "PSF fit instrumental magnitude",            source->psfFlux);
-        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",       source->psfFluxErr);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
+        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
         psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              apRadius);