Changeset 37321

Timestamp:

Aug 27, 2014, 12:20:33 PM (12 years ago)

Author:

bills

Message:

In psphotFullForce, add code to read the warp to chip transformations stored in the
warp headers and identify the chip that generated the pixels for each source and
the chip coordinates of the peak.
Save this information in PS1_V5 cmf if the lensing parameters are also being saved.
(full force only)

Location:

trunk

Files:

• psModules/src/objects/pmSource.c (modified) (1 diff)
• psModules/src/objects/pmSource.h (modified) (1 diff)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (1 diff)
• psphot/src/Makefile.am (modified) (2 diffs)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotChipParams.c (added)
• psphot/src/psphotFullForceReadout.c (modified) (1 diff)
• psphot/src/psphotSetThreads.c (modified) (1 diff)

trunk/psModules/src/objects/pmSource.c

@@ -176 +176 @@
     source->parent = NULL;
     source->tmpPtr = NULL;
+    source->chipNum = -1;
+    source->chipX = -1000;
+    source->chipY = -1000;
     source->imageID = -1;
     source->nFrames = 0;

trunk/psModules/src/objects/pmSource.h

@@ -127 +127 @@
     pmSource *parent;                   ///< reference to the master source from which this is derived
     psPtr *tmpPtr;                      ///< pointer that may be used to store data in a particular module. e.g. psphotKronIterate.
+    short chipNum;                      ///< camera dependent of chip suppling pixels for fullforce source
+    short chipX;                        ///< chip space X coord of fullforce source
+    short chipY;                        ///< chip space Y coord of fullforce source
     int imageID;
     psU16 nFrames;

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -221 +221 @@
           @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e2); 
         }
+
+        // if lensing params exist also include the backmapped chipID and chip coordinates
+        if (source->lensingPSF && source->lensingPSF->shear) {
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_NUM",   PS_DATA_S16, "id of warp input chip",     source->chipNum); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_X",    PS_DATA_S16, "x coord in warp input chip",     source->chipX); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "SRC_CHIP_Y",    PS_DATA_S16, "y coord in warp input chip",     source->chipY); 
+            @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "PADDING3",      PS_DATA_S16, "more padding", 0);
+        }
 
         @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_R1",       PS_DATA_F32, "first radial moment",                        moments.Mrf);

trunk/psphot/src/Makefile.am

@@ -97 +97 @@
 # generalized forced photometry (including Kron, Petro, and Models) of specified positions given a specified psf
 psphotFullForce_SOURCES = \
-        psphotFullForce.c             \
-        psphotFullForceArguments.c    \
+        psphotFullForce.c          \
+        psphotFullForceArguments.c \
         psphotParseCamera.c        \
         psphotImageLoop.c          \
@@ -259 +259 @@
         psphotEfficiency.c             \
         psphotSetNFrames.c             \
-        psphotSourceMemory.c
+        psphotSourceMemory.c           \
+        psphotChipParams.c
 
 # not currently used

trunk/psphot/src/psphot.h

@@ -571 +571 @@
 bool psphotSourceMemoryReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index);
 
+bool psphotChipParams(pmConfig *config, const pmFPAview *view, const char *filerule);
+bool psphotChipParams_Threaded(psThreadJob *job);
+
 const char * psphotGetFilerule(const char *baseRule);
 extern bool psphotINpsphotStack;
 
+
 #endif

trunk/psphot/src/psphotFullForceReadout.c

@@ -106 +106 @@
     psphotKronFlux (config, view, filerule);
 
+    psphotChipParams (config, view, filerule);
+
     // measure petro fluxes
     psphotPetroFlux (config, view, filerule);

trunk/psphot/src/psphotSetThreads.c

@@ -87 +87 @@
     psFree(task);
 
+    task = psThreadTaskAlloc("PSPHOT_CHIP_PARAMS", 2);
+    task->function = &psphotChipParams_Threaded;
+    psThreadTaskAdd(task);
+    psFree(task);
+
     return true;
 }