Changeset 7727

Timestamp:

Jun 28, 2006, 9:22:11 AM (20 years ago)

Author:

magnier

Message:

changed args for pmFPAfileCopyStructureView, fixed for PHU handling

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (3 diffs)
• pmFPAfile.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -248 +248 @@
 // given an already-opened fits file, write the components corresponding
 // to the specified view
-bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, psMetadata *format, int xBin, int yBin, const pmFPAview *view)
-{
+bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, int xBin, int yBin, const pmFPAview *view)
+{
+    bool status;
     PS_ASSERT_PTR_NON_NULL(out, false);
     PS_ASSERT_PTR_NON_NULL(in, false);
-    PS_ASSERT_PTR_NON_NULL(format, false);
     PS_ASSERT_PTR_NON_NULL(view, false);
 
     // pmFPAWrite takes care of all PHUs as needed
-    if (view->chip == -1) {
-        pmFPAAddSourceFromView (out, view, format);
-        return pmFPACopyStructure (out, in, xBin, yBin);
+    if ((view->chip == -1) || in->hdu) {
+        status = pmFPACopyStructure (out, in, xBin, yBin);
+        return status;
     }
     if (view->chip >= in->chips->n) {
@@ -267 +267 @@
     pmChip *outChip = out->chips->data[view->chip];
 
-    if (view->cell == -1) {
-        pmFPAAddSourceFromView (out, view, format);
-        // XXX this is a hack: can i defer this to ppImageRebinChip?
-        // bool status = pmChipCopyStructure (outChip, inChip, xBin, yBin);
-        return true;
+    if ((view->cell == -1) || inChip->hdu) {
+        status = pmChipCopyStructure (outChip, inChip, xBin, yBin);
+        return status;
     }
     if (view->cell >= inChip->cells->n) {
@@ -281 +279 @@
     pmCell *outCell = outChip->cells->data[view->cell];
 
-    if (view->readout == -1) {
-        pmFPAAddSourceFromView (out, view, format);
-        return pmCellCopyStructure (outCell, inCell, xBin, yBin);
+    if ((view->readout == -1) || inCell->hdu) {
+        status = pmCellCopyStructure (outCell, inCell, xBin, yBin);
+        return status;
     }
     psError(PS_ERR_UNKNOWN, true, "Returning false");
     return false;
-
-    // XXX add readout / segment equivalents
-}
+}

trunk/psModules/src/camera/pmFPAfile.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-21 22:44:16 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-28 19:22:11 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -108 +108 @@
 bool pmFPAfileCopyView (pmFPA *out, pmFPA *in, const pmFPAview *view);
 
-bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, psMetadata *format, int xBin, int yBin, const pmFPAview *view);
+bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, int xBin, int yBin, const pmFPAview *view);
 
 # endif