Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/objects/pmSourceExtendedPars.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceExtendedPars.h (modified) (1 diff)

branches/simtest_nebulous_branches/psModules/src/objects/pmSourceExtendedPars.h

@@ -15 +15 @@
 
 typedef struct {
-  psVector *radius;
-  psVector *flux;
-  psVector *variance;
+    psArray  *radii;                    // radii for raw radial profiles at evenly-spaced angles
+    psArray  *fluxes;                   // fluxes measured at above radii
+    psVector *theta;                    // angles corresponding to above radial profiles
+    psVector *isophotalRadii;           // isophotal radius for the above angles
+} pmSourceRadialFlux;
+
+typedef struct {
+    psVector *radiusElliptical;         // normalized radial coordinates for all relevant pixels
+    psVector *fluxElliptical;           // flux for the above radial coordinates
+} pmSourceEllipticalFlux;
+
+typedef struct {
+    psVector *binSB;                    // mean surface brightness within radial bins
+    psVector *binSBstdev;               // scatter of mean surface brightness within radial bins
+    psVector *binSBerror;               // formal error on mean surface brightness within radial bins
+    psVector *binSum;                   // sum of flux within radial bins
+    psVector *binFill;                  // fraction of area actually lit
+    psVector *radialBins;               // radii corresponding to above binnedFlux
+    psVector *area;                     // differential area of the non-overlapping radial bins
 } pmSourceRadialProfile;
 
 typedef struct {
-  psVector *flux;
-  psVector *fluxErr;
-  psVector *fluxVar;
-} pmSourceAnnuli;
+    float flux;
+    float fluxErr;
+    float radius;
+    float radiusErr;
+} pmSourceExtendedFlux;
 
 typedef struct {
-  float mag;
-  float magErr;
-  float rad;
-  float radErr;
-} pmSourceIsophotalValues;
-
-typedef struct {
-  float mag;
-  float magErr;
-  float rad;
-  float radErr;
-} pmSourcePetrosianValues;
-
-typedef struct {
-  float mag;
-  float magErr;
-  float rad;
-  float radErr;
-} pmSourceKronValues;
-
-typedef struct {
-  pmSourceRadialProfile   *profile;
-  pmSourceAnnuli          *annuli;
-  pmSourceIsophotalValues *isophot;
-  pmSourcePetrosianValues *petrosian;
-  pmSourceKronValues      *kron;
+    pmSourceRadialFlux     *radFlux;        // raw radial flux information
+    pmSourceEllipticalFlux *ellipticalFlux; // flux for elliptically-renormalized radii
+    pmSourceRadialProfile  *radProfile;     // surface brightness profile in specified fixed bins
+    pmSourceRadialProfile  *petProfile;     // surface brightness profile in petrosian bins
+    psEllipseAxes axes;                     // shape of elliptical contour
+    float petrosianFlux;
+    float petrosianFluxErr;
+    float petrosianRadius;
+    float petrosianRadiusErr;
+    float petrosianR90;
+    float petrosianR90Err;
+    float petrosianR50;
+    float petrosianR50Err;
 } pmSourceExtendedPars;
 
-pmSourceExtendedPars *pmSourceExtendedParsAlloc(void);
+pmSourceRadialFlux *pmSourceRadialFluxAlloc();
+bool psMemCheckSourceRadialFlux(psPtr ptr);
+
+pmSourceEllipticalFlux *pmSourceEllipticalFluxAlloc();
+bool psMemCheckSourceEllipticalFlux(psPtr ptr);
+
+// *** pmSourceRadialProfile describes the radial profile of a source in elliptical contours, and 
+// intermediate data used to measure the profile
+pmSourceRadialProfile *pmSourceRadialProfileAlloc();
+bool psMemCheckSourceRadialProfile(psPtr ptr);
+
+// *** pmSourceExtendedPars describes the possible collection of extended flux measurements for a source
+pmSourceExtendedPars *pmSourceExtendedParsAlloc (void);
 bool psMemCheckSourceExtendedPars(psPtr ptr);
-pmSourceRadialProfile *pmSourceRadialProfileAlloc(void);
-bool psMemCheckSourceRadialProfile(psPtr ptr);
-pmSourceIsophotalValues *pmSourceIsophotalValuesAlloc(void);
-bool psMemCheckSourceIsophotalValues(psPtr ptr);
-pmSourcePetrosianValues *pmSourcePetrosianValuesAlloc(void);
-bool psMemCheckSourcePetrosianValues(psPtr ptr);
-pmSourceKronValues *pmSourceKronValuesAlloc(void);
-bool psMemCheckSourceKronValues(psPtr ptr);
-pmSourceAnnuli *pmSourceAnnuliAlloc(void);
-bool psMemCheckSourceAnnuli(psPtr ptr);
+
+// *** pmSourceExtendedFlux describes the flux within an elliptical aperture of some kind 
+pmSourceExtendedFlux *pmSourceExtendedFluxAlloc(void);
+bool psMemCheckSourceExtendedFlux(psPtr ptr);
+
+// *** pmSourceRadialProfileSortPair is a utility function for sorting a pair of vectors
+bool pmSourceRadialProfileSortPair(psVector *index, psVector *extra);
+
+
 
 /// @}