Index: branches/pap/psModules/src/objects/pmSourceExtendedPars.h
===================================================================
--- branches/pap/psModules/src/objects/pmSourceExtendedPars.h	(revision 27708)
+++ branches/pap/psModules/src/objects/pmSourceExtendedPars.h	(revision 28003)
@@ -19,30 +19,49 @@
     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 *radialBins;		// radii corresponding to above binnedBlux
+    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
-
-    psEllipseAxes axes;			// shape of elliptical contour
 } pmSourceRadialProfile;
 
 typedef struct {
-  float flux;
-  float fluxErr;
-  float radius;
-  float radiusErr;
+    float flux;
+    float fluxErr;
+    float radius;
+    float radiusErr;
 } pmSourceExtendedFlux;
 
 typedef struct {
-  pmSourceRadialProfile   *profile;
-  pmSourceExtendedFlux    *petrosian_50;
-  pmSourceExtendedFlux    *petrosian_80;
+    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;
+
+pmSourceRadialFlux *pmSourceRadialFluxAlloc();
+bool psMemCheckSourceRadialFlux(psPtr ptr);
+
+pmSourceEllipticalFlux *pmSourceEllipticalFluxAlloc();
+bool psMemCheckSourceEllipticalFlux(psPtr ptr);
 
 // *** pmSourceRadialProfile describes the radial profile of a source in elliptical contours, and 
@@ -50,7 +69,4 @@
 pmSourceRadialProfile *pmSourceRadialProfileAlloc();
 bool psMemCheckSourceRadialProfile(psPtr ptr);
-
-// *** pmSourceRadialProfileFreeVectors frees the intermediate data values
-bool pmSourceRadialProfileFreeVectors(pmSourceRadialProfile *profile);
 
 // *** pmSourceExtendedPars describes the possible collection of extended flux measurements for a source
@@ -65,4 +81,6 @@
 bool pmSourceRadialProfileSortPair(psVector *index, psVector *extra);
 
+
+
 /// @}
 # endif /* PM_SOURCE_H */