Changeset 38057 for branches/eam_branches/ipp-20150112/psphot/src/psphotReadoutMinimal.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/psphotReadoutMinimal.c (modified) (2 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/psphotReadoutMinimal.c

@@ -90 +90 @@
     psphotKronIterate(config, view, filerule, 1);
 
+    psphotChipParams (config, view, filerule);
+
     // measure source size for the remaining sources
     psphotSourceSize (config, view, filerule, false);
@@ -112 +114 @@
 
     // create the exported-metadata and free local data
-    return psphotReadoutCleanup (config, view, filerule);
+    return psphotReadoutCleanupMinimal (config, view, filerule);
 }

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