Changeset 38057 for branches/eam_branches/ipp-20150112/psphot/src/psphotLensing.c

Timestamp:

Mar 29, 2015, 5:55:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotLensing.c (modified) (9 diffs)

branches/eam_branches/ipp-20150112/psphot/src

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp

branches/eam_branches/ipp-20150112/psphot/src/psphotLensing.c

@@ -138 +138 @@
     psVector *psf_e1sh = psVectorAllocEmpty (300, PS_TYPE_F32);
     psVector *psf_e2sh = psVectorAllocEmpty (300, PS_TYPE_F32);
+    psVector *psf_e1   = psVectorAllocEmpty (300, PS_TYPE_F32);
+    psVector *psf_e2   = psVectorAllocEmpty (300, PS_TYPE_F32);
     psVector *xPos     = psVectorAllocEmpty (300, PS_TYPE_F32);
     psVector *yPos     = psVectorAllocEmpty (300, PS_TYPE_F32);
@@ -178 +180 @@
 
         pmModel *model = source->modelPSF;
+
+        float R  = source->moments->Mxx + source->moments->Myy;
+        source->lensingOBJ->e1 = (source->moments->Mxx - source->moments->Myy) / R;
+        source->lensingOBJ->e2 = 2*source->moments->Mxy / R;
 
         psVectorAppend (xPos, model->params->data.F32[PM_PAR_XPOS]);
@@ -191 +197 @@
         psVectorAppend (psf_e1sh, source->lensingOBJ->shear->e1);
         psVectorAppend (psf_e2sh, source->lensingOBJ->shear->e2);
+        psVectorAppend (psf_e1,   source->lensingOBJ->e1);
+        psVectorAppend (psf_e2,   source->lensingOBJ->e2);
         Npsf ++;
     }
@@ -247 +255 @@
     pmTrend2D *trend_e2sh = pmTrend2DAlloc (PM_TREND_MAP, readout->image, Nx, Ny, stats);
 
+    pmTrend2D *trend_e1   = pmTrend2DAlloc (PM_TREND_MAP, readout->image, Nx, Ny, stats);
+    pmTrend2D *trend_e2   = pmTrend2DAlloc (PM_TREND_MAP, readout->image, Nx, Ny, stats);
+
     bool goodFit = false;
     if (!pmTrend2DFit (&goodFit, trendX11sm, NULL, 0xff, xPos, yPos, psfX11sm, NULL)) { psWarning ("failed to measure X11 smear trend"); }
@@ -259 +270 @@
     if (!pmTrend2DFit (&goodFit, trend_e1sh, NULL, 0xff, xPos, yPos, psf_e1sh, NULL)) { psWarning ("failed to measure  e1 shear trend"); }
     if (!pmTrend2DFit (&goodFit, trend_e2sh, NULL, 0xff, xPos, yPos, psf_e2sh, NULL)) { psWarning ("failed to measure  e2 shear trend"); }
+
+    if (!pmTrend2DFit (&goodFit, trend_e1,   NULL, 0xff, xPos, yPos, psf_e1,   NULL)) { psWarning ("failed to measure  e1 trend"); }
+    if (!pmTrend2DFit (&goodFit, trend_e2,   NULL, 0xff, xPos, yPos, psf_e2,   NULL)) { psWarning ("failed to measure  e2 trend"); }
 
     // evaluate the PSF trend maps at the location of all sources
@@ -295 +309 @@
         smear->e1  = pmTrend2DEval (trend_e1sm, xPos, yPos);
         smear->e2  = pmTrend2DEval (trend_e2sm, xPos, yPos);
+
+        lensing->e1  = pmTrend2DEval (trend_e1, xPos, yPos);
+        lensing->e2  = pmTrend2DEval (trend_e2, xPos, yPos);
     }
 
@@ -309 +326 @@
     psFree (trend_e2sh);
 
+    psFree (trend_e1);
+    psFree (trend_e2);
+
     psFree (psfX11sm);
     psFree (psfX12sm);
@@ -314 +334 @@
     psFree (psf_e1sm);
     psFree (psf_e2sm);
+
     psFree (psfX11sh);
     psFree (psfX12sh);
@@ -319 +340 @@
     psFree (psf_e1sh);
     psFree (psf_e2sh);
+
+    psFree (psf_e1);
+    psFree (psf_e2);
+
     psFree (xPos    );
     psFree (yPos    );

@@ -27 +27 @@
 psmakecff
 psphotFullForceSummary
+psphotVersionDefinitions.h.tmp