Changeset 36625

Timestamp:

Apr 1, 2014, 10:58:12 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk (lensing parameters)

Location:

branches/eam_branches/ipp-20140206/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• camera/pmReadoutFake.c (modified) (1 diff)
• extras/pmThreadTools.c (modified) (1 diff)
• extras/pmVisual.c (modified) (1 diff)
• imcombine/pmPSFEnvelope.c (modified) (1 diff)
• imcombine/pmSubtractionSimple.c (modified) (1 diff)
• imcombine/pmSubtractionStamps.c (modified) (1 diff)
• objects (modified) (1 prop)
• objects/Makefile.am (modified) (5 diffs)
• objects/mksource.pl (modified) (1 diff)
• objects/models/pmModel_DEV.c (modified) (1 diff)
• objects/models/pmModel_EXP.c (modified) (1 diff)
• objects/models/pmModel_GAUSS.c (modified) (1 diff)
• objects/models/pmModel_PGAUSS.c (modified) (1 diff)
• objects/models/pmModel_PS1_V1.c (modified) (1 diff)
• objects/models/pmModel_QGAUSS.c (modified) (1 diff)
• objects/models/pmModel_RGAUSS.c (modified) (1 diff)
• objects/models/pmModel_SERSIC.c (modified) (1 diff)
• objects/models/pmModel_TRAIL.c (modified) (1 diff)
• objects/pmDetEff.c (modified) (1 diff)
• objects/pmGrowthCurve.c (modified) (1 diff)
• objects/pmGrowthCurveGenerate.c (modified) (1 diff)
• objects/pmModelUtils.c (modified) (1 diff)
• objects/pmMoments.h (modified) (1 diff)
• objects/pmPCM_MinimizeChisq.c (modified) (1 diff)
• objects/pmPCMdata.c (modified) (1 diff)
• objects/pmPSF.c (modified) (1 diff)
• objects/pmPSF_IO.c (modified) (1 diff)
• objects/pmPSFtry.c (modified) (1 diff)
• objects/pmPSFtryFitEXT.c (modified) (1 diff)
• objects/pmPSFtryFitPSF.c (modified) (2 diffs)
• objects/pmPSFtryMakePSF.c (modified) (1 diff)
• objects/pmPSFtryMetric.c (modified) (1 diff)
• objects/pmPSFtryModel.c (modified) (2 diffs)
• objects/pmPhotObj.c (modified) (1 diff)
• objects/pmSource.c (modified) (4 diffs)
• objects/pmSource.h (modified) (1 diff)
• objects/pmSourceContour.c (modified) (1 diff)
• objects/pmSourceExtendedPars.h (modified) (1 diff)
• objects/pmSourceFitModel.c (modified) (1 diff)
• objects/pmSourceFitPCM.c (modified) (1 diff)
• objects/pmSourceFitSet.c (modified) (1 diff)
• objects/pmSourceGroups.c (modified) (1 diff)
• objects/pmSourceIO.c (modified) (7 diffs)
• objects/pmSourceIO.h (modified) (1 diff)
• objects/pmSourceIO_CFF.c (modified) (1 diff)
• objects/pmSourceIO_CMF.c.in (modified) (2 diffs)
• objects/pmSourceIO_CMP.c (modified) (1 diff)
• objects/pmSourceIO_MatchedRefs.c (modified) (1 diff)
• objects/pmSourceIO_OBJ.c (modified) (1 diff)
• objects/pmSourceIO_PS1_CAL_0.c (modified) (1 diff)
• objects/pmSourceIO_PS1_DEV_0.c (modified) (1 diff)
• objects/pmSourceIO_PS1_DEV_1.c (modified) (1 diff)
• objects/pmSourceIO_RAW.c (modified) (1 diff)
• objects/pmSourceIO_SMPDATA.c (modified) (1 diff)
• objects/pmSourceIO_SX.c (modified) (1 diff)
• objects/pmSourceLensing.c (copied) (copied from trunk/psModules/src/objects/pmSourceLensing.c )
• objects/pmSourceLensing.h (copied) (copied from trunk/psModules/src/objects/pmSourceLensing.h )
• objects/pmSourceMatch.c (modified) (1 diff)
• objects/pmSourceMoments.c (modified) (2 diffs)
• objects/pmSourceOutputs.c (modified) (1 diff)
• objects/pmSourcePhotometry.c (modified) (1 diff)
• objects/pmSourcePlotApResid.c (modified) (1 diff)
• objects/pmSourcePlotMoments.c (modified) (1 diff)
• objects/pmSourcePlotPSFModel.c (modified) (1 diff)
• objects/pmSourceSky.c (modified) (1 diff)
• objects/pmSourceUtils.c (modified) (1 diff)
• objects/pmSourceVisual.c (modified) (1 diff)
• psmodules.h (modified) (1 diff)

branches/eam_branches/ipp-20140206/psModules/src/camera/pmFPAfileIO.c

@@ -39 +39 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/camera/pmReadoutFake.c

@@ -27 +27 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/extras/pmThreadTools.c

@@ -37 +37 @@
 #include "pmSourcePhotometry.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/extras/pmVisual.c

@@ -41 +41 @@
 // #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+// #include "pmSourceLensing.h"
 // #include "pmSource.h"
 // #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/imcombine/pmPSFEnvelope.c

@@ -27 +27 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/imcombine/pmSubtractionSimple.c

@@ -34 +34 @@
 #include "pmSourceSatstar.h"
 
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/imcombine/pmSubtractionStamps.c

@@ -26 +26 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/objects

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c

branches/eam_branches/ipp-20140206/psModules/src/objects/Makefile.am

@@ -49 +49 @@
         pmSourceIO_CMF_PS1_V3.c \
         pmSourceIO_CMF_PS1_V4.c \
+        pmSourceIO_CMF_PS1_V5.c \
         pmSourceIO_CMF_PS1_SV1.c \
         pmSourceIO_CMF_PS1_SV2.c \
@@ -76 +77 @@
         pmGrowthCurve.c \
         pmSourceMatch.c \
+        pmSourceLensing.c \
         pmDetEff.c \
         pmSourceGroups.c \
@@ -125 +127 @@
         pmGrowthCurveGenerate.h \
         pmSourceMatch.h \
+        pmSourceLensing.h \
         pmDetEff.h \
         pmSourceGroups.h \
@@ -145 +148 @@
 pmSourceIO_CMF_PS1_V3.c \
 pmSourceIO_CMF_PS1_V4.c \
+pmSourceIO_CMF_PS1_V5.c \
 pmSourceIO_CMF_PS1_DV1.c \
 pmSourceIO_CMF_PS1_DV2.c \
@@ -163 +167 @@
         mksource.pl pmSourceIO_CMF.c.in PS1_V4 pmSourceIO_CMF_PS1_V4.c
 
+pmSourceIO_CMF_PS1_V5.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V5 pmSourceIO_CMF_PS1_V5.c
+
 pmSourceIO_CMF_PS1_DV1.c : pmSourceIO_CMF.c.in mksource.pl
         mksource.pl pmSourceIO_CMF.c.in PS1_DV1 pmSourceIO_CMF_PS1_DV1.c

branches/eam_branches/ipp-20140206/psModules/src/objects/mksource.pl

@@ -19 +19 @@
                "PS1_V3", 3,
                "PS1_V4", 4,
+               "PS1_V5", 5,
     );
 %cmfmodes_dv = ("PS1_DV1", 1,

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_DEV.c

@@ -43 +43 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_EXP.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_GAUSS.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_PS1_V1.c

@@ -42 +42 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -42 +42 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_RGAUSS.c

@@ -41 +41 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_SERSIC.c

@@ -50 +50 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/models/pmModel_TRAIL.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmDetEff.c

@@ -24 +24 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmGrowthCurve.c

@@ -37 +37 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmGrowthCurveGenerate.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmModelUtils.c

@@ -39 +39 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmMoments.h

@@ -44 +44 @@
     float Myyyy;   ///< fourth moment
 
+  // float wSum;    ///< window-weighted sum (NOT needed by lensing)
+
     float Sum;    ///< Pixel sum above sky (background).
     float Peak;   ///< Peak counts above sky.

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -38 +38 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPCMdata.c

@@ -38 +38 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSF.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSF_IO.c

@@ -54 +54 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtry.c

@@ -36 +36 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtryFitEXT.c

@@ -36 +36 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceUtils.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtryFitPSF.c

@@ -34 +34 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -120 +121 @@
     pmSourceVisualShowModelFits (psfTry->psf, psfTry->sources, maskVal);
 
-    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n);
+    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources (%d x %d model)\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n, psfTry->psf->trendNx, psfTry->psf->trendNy);
     psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, psfTry->sources->n);
 

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtryMakePSF.c

@@ -35 +35 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtryMetric.c

@@ -35 +35 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPSFtryModel.c

@@ -36 +36 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -111 +112 @@
 
     // set the max order (0 = constant) which the number of psf stars can support:
+    int MaxOrderForStars = 0;
+
+    // we require only 3 stars for n = 0, increase stars / cell for higher order
+    if (sources->n >=  16) MaxOrderForStars = 1; //  4 cells, 4 per cell
+    if (sources->n >=  54) MaxOrderForStars = 2; //  9 cells, 6 per cell
+    if (sources->n >= 128) MaxOrderForStars = 3; // 16 cells, 8 per cell
+    if (sources->n >= 300) MaxOrderForStars = 4; // 25 cells, 12 per cell
+    if (sources->n >  576) MaxOrderForStars = 5; // 36 cells, 16 per cell
+
     // rule of thumb: require 3 stars per 'cell' (order+1)^2
-    int MaxOrderForStars = 0;
-    if (sources->n >= 12) MaxOrderForStars = 1; // 4 cells
-    if (sources->n >= 27) MaxOrderForStars = 2; // 9 cells
-    if (sources->n >= 48) MaxOrderForStars = 3; // 16 cells
-    if (sources->n >  75) MaxOrderForStars = 4; // 25 cells
+    // if (sources->n >= 12) MaxOrderForStars = 1; // 4 cells
+    // if (sources->n >= 27) MaxOrderForStars = 2; // 9 cells
+    // if (sources->n >= 48) MaxOrderForStars = 3; // 16 cells
+    // if (sources->n >= 75) MaxOrderForStars = 4; // 25 cells
+    // if (sources->n > 108) MaxOrderForStars = 5; // 36 cells
 
     int orderMax = PS_MAX (options->psfTrendNx, options->psfTrendNy);

branches/eam_branches/ipp-20140206/psModules/src/objects/pmPhotObj.c

@@ -36 +36 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSource.c

@@ -41 +41 @@
 #include "pmSourcePhotometry.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 
@@ -68 +69 @@
     psFree(tmp->galaxyFits);
     psFree(tmp->radialAper);
+    psFree(tmp->lensingOBJ);
+    psFree(tmp->lensingPSF);
     psTrace("psModules.objects", 10, "---- end ----\n");
 }
@@ -166 +169 @@
     source->diffStats = NULL;
     source->galaxyFits = NULL;
+    source->lensingOBJ = NULL;
+    source->lensingPSF = NULL;
     source->radialAper = NULL;
     source->parent = NULL;
@@ -249 +254 @@
 
     source->region           = in->region;
+
+    // XXX I am not copying the pointers to things like the blends, satstar profile, galaxyFits, etc
 
     return(source);

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSource.h

@@ -120 +120 @@
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
     pmSourceGalaxyFits *galaxyFits;     ///< fits to galaxy models (psphotFullForce only)
+    pmSourceLensing *lensingOBJ;        ///< lensing moments parameters (per object)
+    pmSourceLensing *lensingPSF;        ///< lensing moments parameters (psf, interpolated)
     psArray *radialAper;                ///< radial flux in circular apertures
     pmSource *parent;                   ///< reference to the master source from which this is derived

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceContour.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceExtendedPars.h

@@ -118 +118 @@
 pmSourceGalaxyFits *pmSourceGalaxyFitsAlloc (void);
 
-
 /// @}
 # endif /* PM_SOURCE_H */

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceFitModel.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourcePhotometry.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceFitPCM.c

@@ -38 +38 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourcePhotometry.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceFitSet.c

@@ -39 +39 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourcePhotometry.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceGroups.c

@@ -25 +25 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO.c

@@ -47 +47 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -597 +598 @@
             PM_SOURCES_WRITE("PS1_V3",    CMF_PS1_V3);
             PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
+            PM_SOURCES_WRITE("PS1_V5",    CMF_PS1_V5);
             PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
@@ -1116 +1118 @@
             PM_SOURCES_READ_PSF("PS1_V3",    CMF_PS1_V3);
             PM_SOURCES_READ_PSF("PS1_V4",    CMF_PS1_V4);
+            PM_SOURCES_READ_PSF("PS1_V5",    CMF_PS1_V5);
             PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
             PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
@@ -1389 +1392 @@
         PM_SOURCES_READ_XSRC("PS1_V3",    CMF_PS1_V3);
         PM_SOURCES_READ_XSRC("PS1_V4",    CMF_PS1_V4);
+        PM_SOURCES_READ_XSRC("PS1_V5",    CMF_PS1_V5);
         PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
@@ -1428 +1432 @@
         PM_SOURCES_READ_XFIT("PS1_V3",    CMF_PS1_V3);
         PM_SOURCES_READ_XFIT("PS1_V4",    CMF_PS1_V4);
+        PM_SOURCES_READ_XFIT("PS1_V5",    CMF_PS1_V5);
         PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
@@ -1466 +1471 @@
         PM_SOURCES_READ_XRAD("PS1_V3",    CMF_PS1_V3);
         PM_SOURCES_READ_XRAD("PS1_V4",    CMF_PS1_V4);
+        PM_SOURCES_READ_XRAD("PS1_V5",    CMF_PS1_V5);
         PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
@@ -1504 +1510 @@
         PM_SOURCES_READ_XGAL("PS1_V3",    CMF_PS1_V3);
         PM_SOURCES_READ_XGAL("PS1_V4",    CMF_PS1_V4);
+        PM_SOURCES_READ_XGAL("PS1_V5",    CMF_PS1_V5);
         PM_SOURCES_READ_XGAL("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO.h

@@ -37 +37 @@
 MK_PROTO(CMF_PS1_V3);
 MK_PROTO(CMF_PS1_V4);
+MK_PROTO(CMF_PS1_V5);
 MK_PROTO(CMF_PS1_SV1);
 MK_PROTO(CMF_PS1_SV2);

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_CFF.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -178 +179 @@
         @>PS1_V2,PS1_SV?@         psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_M4C",      PS_DATA_F32, "fourth momemt cos theta",                    moments.M_c4);
         @>PS1_V2,PS1_SV?@         psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_M4S",      PS_DATA_F32, "fourth momemt sin theta",                    moments.M_s4);
+
+        // Lensing parameters:
+        if (source->lensingOBJ && source->lensingOBJ->smear) {
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X11);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X12);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X22);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SM_OBJ",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->e1);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SM_OBJ",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->e2);
+        }
+
+        if (source->lensingOBJ && source->lensingOBJ->shear) {
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X11);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X12);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X22);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SH_OBJ",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->e1); 
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_OBJ",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->e2); 
+        }
+
+        if (source->lensingOBJ && source->lensingPSF->smear) {
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X11);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X12);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X22);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SM_PSF",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->e1); 
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SM_PSF",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->e2); 
+        }
+
+        if (source->lensingOBJ && source->lensingPSF->shear) {
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X11);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X12);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X22);
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e1); 
+          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e2); 
+        }
 
         @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_R1",       PS_DATA_F32, "first radial moment",                        moments.Mrf);

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_CMP.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_MatchedRefs.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_OBJ.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_RAW.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_SMPDATA.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceIO_SX.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceMatch.c

@@ -25 +25 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceMoments.c

@@ -42 +42 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 
@@ -435 +436 @@
         }
     }
+    // NOT needed : source->moments->wSum = Sum;
+
     source->moments->Mxx = XX/Sum;
     source->moments->Mxy = XY/Sum;

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceOutputs.c

@@ -33 +33 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourcePhotometry.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourcePlotApResid.c

@@ -42 +42 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourcePlotMoments.c

@@ -45 +45 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourcePlotPSFModel.c

@@ -46 +46 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceSky.c

@@ -41 +41 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceUtils.c

@@ -41 +41 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 

branches/eam_branches/ipp-20140206/psModules/src/objects/pmSourceVisual.c

@@ -23 +23 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"

branches/eam_branches/ipp-20140206/psModules/src/psmodules.h

@@ -135 +135 @@
 #include <pmSourceSatstar.h>
 #include <pmSourceDiffStats.h>
+#include <pmSourceLensing.h>
 #include <pmSource.h>
 #include <pmSourceFitModel.h>

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c