Changeset 36747 for trunk/psModules

Timestamp:

May 13, 2014, 2:40:41 PM (12 years ago)

Author:

bills

Message:

change psphotFullForce galaxy shapes analysis to use different radius
trial values based on the signal to nosie of the source as measured
by psphotStack

Location:

trunk/psModules/src/objects

Files:

• pmSource.c (modified) (1 diff)
• pmSource.h (modified) (1 diff)
• pmSourceExtendedPars.h (modified) (1 diff)
• pmSourceIO_CFF.c (modified) (2 diffs)
• pmSourceIO_CMF.c.in (modified) (5 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -162 +162 @@
     source->sky              = NAN;
     source->skyErr           = NAN;    
+    source->extSN            = NAN;    
 
     source->region = psRegionSet(NAN, NAN, NAN, NAN);

trunk/psModules/src/objects/pmSource.h

@@ -113 +113 @@
     float sky;                          ///< The sky at the center of the object 
     float skyErr;                       ///< The sky error at the center of the object
+    float extSN;                        ///< for externally supplied source the kron signal to noise (used by full force)
 
     psRegion region;                    ///< area on image covered by selected pixels

trunk/psModules/src/objects/pmSourceExtendedPars.h

@@ -87 +87 @@
   psVector *dFlux;
   psVector *chisq;
-  int nPix;
+  int       nPix;
+  bool      reducedTrials;
+  float     fRmajorMin;
+  float     fRmajorMax;
+  float     fRmajorDel;
+  float     fRminorMin;
+  float     fRminorMax;
+  float     fRminorDel;
 } pmSourceGalaxyFits;
 

trunk/psModules/src/objects/pmSourceIO_CFF.c

@@ -109 +109 @@
         float kronRadius = psMetadataLookupF32 (&status, row, "KRON_RADIUS");
         float petRadius  = psMetadataLookupF32 (&status, row, "PETRO_RADIUS");
+        float SN         = psMetadataLookupF32 (&status, row, "SN");
         bool fitGalaxy   = psMetadataLookupU8 (&status, row, "FIT_GALAXY");
         bool psfStar     = psMetadataLookupU8 (&status, row, "PSF_STAR");
@@ -182 +183 @@
             source->peak->dx  = 0.0;
             source->peak->dy  = 0.0;
+
+            source->extSN     = SN;
 
             source->moments = pmMomentsAlloc ();

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -1445 +1445 @@
     psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "galaxy table extension", extname);
 
-    psMetadataAddStr (outhead, PS_LIST_TAIL, "HI", PS_META_REPLACE, "does this get through?", "THERE");
+    psF32 Q = psMetadataLookupF32(&status, recipe, "GALAXY_SHAPES_Q");
+    psMetadataAddF32 (outhead, PS_LIST_TAIL, "GALAXY_SHAPES_Q", PS_META_REPLACE, "", Q);
+
+    psF32 NSigma = psMetadataLookupF32(&status, recipe, "GALAXY_SHAPES_NSIGMA");
+    psMetadataAddF32 (outhead, PS_LIST_TAIL, "GALAXY_SHAPES_NSIGMA", PS_META_REPLACE, "", NSigma);
+
+    psF32 clampSN = psMetadataLookupF32(&status, recipe, "GALAXY_SHAPES_CLAMP_SN");
+    psMetadataAddF32 (outhead, PS_LIST_TAIL, "GALAXY_SHAPES_CLAMP_SN", PS_META_REPLACE, "", clampSN);
 
     // They are probably already in this order but ...
@@ -1485 +1492 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "Y_FIT",            0, "model y coordinate",             PAR[PM_PAR_YPOS]);
             psMetadataAddF32 (row, PS_LIST_TAIL, "NPIX",             0, "number of pixels for fits",      galaxyFits->nPix);
+            // psMetadataAddS32 (row, PS_LIST_TAIL, "REDUCED_TRIALS",   0, "source has reduced number of trials",      galaxyFits->reducedTrials);
 
             psVector *Flux = galaxyFits->Flux;
@@ -1493 +1501 @@
             psMetadataAddVector (row, PS_LIST_TAIL, "GAL_FLUX_ERR", PS_META_REPLACE, "error on normalization", dFlux);
             psMetadataAddVector (row, PS_LIST_TAIL, "GAL_CHISQ",    PS_META_REPLACE, "galaxy fit chisq", chisq);
+
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MAJOR_MIN",    0, "fractional major axis min",      galaxyFits->fRmajorMin);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MAJOR_MAX",    0, "fractional major axis max",      galaxyFits->fRmajorMax);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MAJOR_DEL",    0, "fractional major axis max",      galaxyFits->fRmajorDel);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MINOR_MIN",    0, "fractional minor axis min",      galaxyFits->fRminorMin);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MINOR_MAX",    0, "fractional minor axis max",      galaxyFits->fRminorMax);
+            psMetadataAddF32 (row, PS_LIST_TAIL, "FR_MINOR_DEL",    0, "fractional minor axis max",      galaxyFits->fRminorDel);
 
             psArrayAdd (table, 100, row);
@@ -1534 +1549 @@
         return false;
     }
+    if (!readout->analysis) {
+        readout->analysis = psMetadataAlloc();
+    }
+    psF32 Q = psMetadataLookupF32(&status, tableHeader, "GALAXY_SHAPES_Q");
+    // XXX: turn this into an assert once we're done
+    if (status) {
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "GALAXY_SHAPES_Q", PS_META_REPLACE, "", Q);
+
+        psF32 NSigma = psMetadataLookupF32(&status, tableHeader, "GALAXY_SHAPES_NSIGMA");
+        psAssert(status, "missing GALAXY_SHAPES_NSIGMA");
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "GALAXY_SHAPES_NSIGMA", PS_META_REPLACE, "", NSigma);
+
+        psF32 clampSN = psMetadataLookupF32(&status, tableHeader, "GALAXY_SHAPES_CLAMP_SN");
+        psAssert(status, "missing GALAXY_SHAPES_CLAMP_SN");
+        psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "GALAXY_SHAPES_CLAMP_SN", PS_META_REPLACE, "", clampSN);
+    }
 
     for (long i = 0; i < numSources; i++) {
@@ -1573 +1604 @@
             galaxyFits->nPix = psMetadataLookupF32(&status, row, "NPIX");
 
+            galaxyFits->fRmajorMin = psMetadataLookupF32(&status, row, "FR_MAJOR_MIN");
+            galaxyFits->fRmajorMax = psMetadataLookupF32(&status, row, "FR_MAJOR_MAX");
+            galaxyFits->fRmajorDel = psMetadataLookupF32(&status, row, "FR_MAJOR_DEL");
+            galaxyFits->fRminorMin = psMetadataLookupF32(&status, row, "FR_MINOR_MIN");
+            galaxyFits->fRminorMax = psMetadataLookupF32(&status, row, "FR_MINOR_MAX");
+            galaxyFits->fRminorDel = psMetadataLookupF32(&status, row, "FR_MINOR_DEL");
+
             psFree(galaxyFits->Flux);
             galaxyFits->Flux  = psMemIncrRefCounter(Flux);