Changeset 38056 for branches/eam_branches/ipp-20150112/ppSub/src/ppSubReadoutPhotometry.c

Timestamp:

Mar 29, 2015, 5:51:35 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/ppSub/src

Files:

• . (modified) (1 prop)
• ppSubReadoutPhotometry.c (modified) (1 diff)

branches/eam_branches/ipp-20150112/ppSub/src

@@ -14 +14 @@
 ppSubVersionDefinitions.h
 ppSubConvolve
+ppSubVersionDefinitions.h.tmp

@@ -14 +14 @@
 ppSubVersionDefinitions.h
 ppSubConvolve
+ppSubVersionDefinitions.h.tmp

branches/eam_branches/ipp-20150112/ppSub/src/ppSubReadoutPhotometry.c

@@ -46 +46 @@
         psFree(view);
         return false;
+    }
+
+    // psphot may need the PHU header
+    if (!photFile->fpa->hdu) {
+      photFile->fpa->hdu = psMemIncrRefCounter (inFile->fpa->hdu);
     }
 

@@ -14 +14 @@
 ppSubVersionDefinitions.h
 ppSubConvolve
+ppSubVersionDefinitions.h.tmp