Changeset 36619 for branches/eam_branches/ipp-20140226/psphot/src

Timestamp:

Mar 29, 2014, 2:19:18 PM (12 years ago)

Author:

eugene

Message:

adding lensing parameters (pmSourceLensing, psphotLensing)

Location:

branches/eam_branches/ipp-20140226/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotLensing.c (added)
• psphotReadout.c (modified) (2 diffs)

branches/eam_branches/ipp-20140226/psphot/src/Makefile.am

@@ -208 +208 @@
         psphotMakeGrowthCurve.c        \
         psphotMagnitudes.c             \
+        psphotLensing.c        \
         psphotSetMaskBits.c            \
         psphotSkyReplace.c             \

branches/eam_branches/ipp-20140226/psphot/src/psphot.h

@@ -144 +144 @@
 bool            psphotMagnitudesReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, pmReadout *readout, psArray *sources, pmPSF *psf);
 bool            psphotMagnitudes_Threaded (psThreadJob *job);
+
+bool            psphotLensing (pmConfig *config, const pmFPAview *view, const char *filerule);
+bool            psphotLensingReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
+bool            psphotLensingPSFtrendsReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
 
 bool            psphotEfficiency (pmConfig *config, const pmFPAview *view, const char *filerule);

branches/eam_branches/ipp-20140226/psphot/src/psphotReadout.c

@@ -340 +340 @@
     // calculate source magnitudes
     if (!psphotMagnitudes(config, view, filerule)) { // pass 1 (detections->allSources)
-      psErrorStackPrint(stderr, "Unable to do magnitudes.");
+        psErrorStackPrint(stderr, "Unable to do magnitudes.");
         psErrorClear();
     }
+
+    // calculate lensing parameters
+    if (!psphotLensing(config, view, filerule)) {
+        psErrorStackPrint(stderr, "Unable to do lensing parameters.");
+        psErrorClear();
+    }
+
     if (!psphotEfficiency(config, view, filerule)) { // pass 1
         psErrorStackPrint(stderr, "Unable to determine detection efficiencies from fake sources");
@@ -353 +360 @@
     // replace background in residual image
     if (!psphotSkyReplace (config, view, filerule)) { // pass 1
-      psErrorStackPrint(stderr, "Unable to replace sky");
-      psErrorClear();
+        psErrorStackPrint(stderr, "Unable to replace sky");
+        psErrorClear();
     }
 
     // drop the references to the image pixels held by each source
     if (!psphotSourceFreePixels (config, view, filerule)) { // pass 1
-      psErrorStackPrint(stderr, "Unable to free source pixels");
-      psErrorClear();
+        psErrorStackPrint(stderr, "Unable to free source pixels");
+        psErrorClear();
     }