Changeset 37351 for branches/eam_branches/ipp-20140813/psphot

Timestamp:

Sep 3, 2014, 3:24:28 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140813

Files:

• . (modified) (1 prop)
• psphot/src/Makefile.am (modified) (2 diffs)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotChipParams.c (copied) (copied from trunk/psphot/src/psphotChipParams.c )
• psphot/src/psphotFullForceReadout.c (modified) (1 diff)
• psphot/src/psphotSetThreads.c (modified) (1 diff)

branches/eam_branches/ipp-20140813/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

branches/eam_branches/ipp-20140813/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

branches/eam_branches/ipp-20140813/psphot/src/psphotFullForceReadout.c

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

branches/eam_branches/ipp-20140813/psphot/src/psphotSetThreads.c

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