Changeset 37466

Timestamp:

Oct 8, 2014, 10:12:08 AM (12 years ago)

Author:

bills

Message:

Initial check in of psphot galaxy parameter measurements.

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (3 diffs)
• psModules/src/objects/pmSourceExtendedPars.c (modified) (1 diff)
• psModules/src/objects/pmSourceExtendedPars.h (modified) (1 diff)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs)
• psphot/src/Makefile.am (modified) (1 diff)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotGalaxyParams.c (added)
• psphot/src/psphotReadout.c (modified) (1 diff)
• psphot/src/psphotSetThreads.c (modified) (1 diff)
• psphot/src/psphotStackReadout.c (modified) (1 diff)

trunk/ippconfig/recipes/psphot.config

@@ -233 +233 @@
 # Extended source fit parameters
 # these models are used for high-quality shape analysis after all sources have been removed
-EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended sourc fits?
-EXTENDED_SOURCE_FITS_INTERACTIVE    BOOL  FALSE  # perform the detailed extended sourc fits?
+EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended source fits?
+EXTENDED_SOURCE_FITS_INTERACTIVE    BOOL  FALSE  # perform the detailed extended source fits?
 EXTENDED_SOURCE_FITS_POISSON        BOOL  FALSE   # use poisson errors for extended source models
+EXTENDED_SOURCE_GALAXY_PARAMS       BOOL  FALSE  # measure galaxy parameters
 
 EXTENDED_SOURCE_MODELS_SELECTION    STR   ALL
@@ -479 +480 @@
 STACKPHOT                             METADATA
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_GALAXY_PARAMS       BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   10.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
@@ -494 +496 @@
   RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
-  OUTPUT.FORMAT                       STR   PS1_SV3
+  OUTPUT.FORMAT                       STR   PS1_SV4
 
   # subtract radial profiles for extremely bright stars?

trunk/psModules/src/objects/pmSourceExtendedPars.c

@@ -226 +226 @@
     pars->petrosianR50 = NAN;
     pars->petrosianR50Err = NAN;
+    pars->ghalfLightRadius = NAN;
+    pars->gRT = NAN;
+    pars->gRA = NAN;
+    pars->gS2 = NAN;
+    pars->gA = NAN;
+    pars->gbumpy = NAN;
     return pars;
 }

trunk/psModules/src/objects/pmSourceExtendedPars.h

@@ -65 +65 @@
     float petrosianR50Err;
     float petrosianFill;
+    float ghalfLightRadius;                 
+    float gRT;                           // total residual (from eliptically symmetric model) Simard 2002
+    float gRA;                           // assymetric residual (from eliptically symmetric model) Simard 2002
+    float gS2;                           // (un) smoothness  (Simard, 2011 Cheng 2011)
+    float gA;                            // assymetry index (Gyory & Bell 2010)
+    float gbumpy;                        // Blakeslee bumpiness
 } pmSourceExtendedPars;
 

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

@@ -639 +639 @@
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_RADIUS_90_ERR", PS_DATA_F32, "Petrosian R90 Error (pix)", extpars->petrosianR90Err);
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_FILL",          PS_DATA_F32, "Petrosian Fill Factor", extpars->petrosianFill);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "HALF_LIGHT_RADIUS", 0, "Half Light Radius", extpars->ghalfLightRadius);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_RT", 0, "total residual Sersic Model", extpars->gRT);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_RA", 0, "assymetric residual Sersic Model", extpars->gRA);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_S2", 0, "(un)smoothness paramter residual Sersic Model", extpars->gS2);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_A", 0, "assymetry index", extpars->gA);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_BUMPY", 0, "bumpiness", extpars->gbumpy);
             } else {
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_MAG",        PS_DATA_F32, "Petrosian Magnitude",       NAN);
@@ -649 +655 @@
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_RADIUS_90_ERR", PS_DATA_F32, "Petrosian R90 Error (pix)",NAN); 
                 psMetadataAdd (row, PS_LIST_TAIL, "PETRO_FILL",          PS_DATA_F32, "Petrosian Fill Factor", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "HALF_LIGHT_RADIUS", 0, "Half Light Radius", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_RT", 0, "total residual Sersic Model", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_RA", 0, "assymetric residual Sersic Model", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_S2", 0, "(un)smoothness paramter residual Sersic Model", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_A", 0, "assymetry index", NAN);
+                @>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "G_BUMPY", 0, "bumpiness", NAN);
             }
         }

trunk/psphot/src/Makefile.am

@@ -260 +260 @@
         psphotSetNFrames.c             \
         psphotSourceMemory.c           \
-        psphotChipParams.c
+        psphotChipParams.c              \
+        psphotGalaxyParams.c
 
 # not currently used

trunk/psphot/src/psphot.h

@@ -137 +137 @@
 bool            psphotExtendedSourceFitsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
 bool            psphotExtendedSourceFits_Threaded (psThreadJob *job);
+
+bool            psphotGalaxyParams (pmConfig *config, const pmFPAview *view, const char *filerule);
+bool            psphotGalaxyParamsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
+bool            psphotGalaxyParams_Threaded (psThreadJob *job);
 
 bool            psphotApResid (pmConfig *config, const pmFPAview *view, const char *filerule);

trunk/psphot/src/psphotReadout.c

@@ -325 +325 @@
     psphotExtendedSourceAnalysis (config, view, filerule); // pass 1 (detections->allSources)
     psphotExtendedSourceFits (config, view, filerule); // pass 1 (detections->allSources)
+    // measure some parameters for galaxy science
+    psphotGalaxyParams (config, view, filerule);
     psphotRadialApertures(config, view, filerule, 0);
 

trunk/psphot/src/psphotSetThreads.c

@@ -92 +92 @@
     psFree(task);
 
+    task = psThreadTaskAlloc("PSPHOT_GALAXY_PARAMS", 8);
+    task->function = &psphotGalaxyParams_Threaded;
+    psThreadTaskAdd(task);
+    psFree(task);
+
     return true;
 }

trunk/psphot/src/psphotStackReadout.c

@@ -342 +342 @@
     psphotExtendedSourceFits (config, view, STACK_RAW); // pass 1 (detections->allSources)
 
+    // measure some parameters for galxy science
+    psphotGalaxyParams (config, view, STACK_RAW); // pass 1 (detections->allSources)
     // create source children for the OUT filerule (for radial aperture photometry and output) 
     // NOTE: The new source children have image arrays pointing to the readout associated with