Changeset 7618

Timestamp:

Jun 21, 2006, 12:44:16 PM (20 years ago)

Author:

magnier

Message:

various fixes

Location:

trunk/psModules/src/camera

Files:

• pmFPAConstruct.c (modified) (1 diff)
• pmFPACopy.c (modified) (4 diffs)
• pmFPAMosaic.c (modified) (1 diff)
• pmFPAWrite.c (modified) (2 diffs)
• pmFPAfile.c (modified) (4 diffs)
• pmFPAfile.h (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (6 diffs)
• pmFPAfileFitsIO.c (modified) (1 diff)
• pmFPAfileIO.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -739 +739 @@
     PS_ASSERT_PTR_NON_NULL(format, false);
 
-    return addSource(fpa, phuView, NULL, format) ? true : false;
-}
-
-
+    pmFPAview *view = addSource(fpa, phuView, NULL, format);
+    bool status = (view == NULL);
+    psFree (view);
+    return status;
+}
 
 // Add an input file to the FPA

trunk/psModules/src/camera/pmFPACopy.c

@@ -181 +181 @@
         psFree(biasIter);
 
+        targetReadout->data_exists = true;
         psFree(targetReadout);          // Drop reference
     }
@@ -251 +252 @@
     binItem->data.S32 *= yBin;
 
-
     // Copy any headers
     pmHDU *targetHDU = pmHDUFromCell(target); // The target HDU
@@ -265 +265 @@
     }
 
+    target->data_exists = true;
     return true;
 }
@@ -301 +302 @@
     psMetadataCopy(target->concepts, source->concepts);
 
+    target->data_exists = true;
     return status;
 }

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -458 +458 @@
     psTrace(__func__, 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
     psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, type); // The mosaic image
-    psImageInit(mosaic, 0.0);
+    psImageInit(mosaic, 0);
 
     // Next pass through the images to do the mosaicking

trunk/psModules/src/camera/pmFPAWrite.c

@@ -101 +101 @@
     if ((!pixels && hdu->phu && !hdu->images) || // Data-less PHU
             (pixels && (hdu->images || (!hdu->images && pmHDUGenerateForCell(cell) && hdu->images)))) { // Data
-        psMetadataPrint (stdout, cell->concepts, 0);
         success &= pmConceptsWriteCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
                                        PM_CONCEPT_SOURCE_DEFAULTS, false, NULL);
@@ -152 +151 @@
         if (blankSegment || imageSegment) {
             pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA | PM_CONCEPT_SOURCE_DEFAULTS;
-            for (int i = 0; i < chip->cells->n; i++) {
-                pmCell *cell = chip->cells->data[i];
-                psMetadataPrint (stdout, cell->concepts, 0);
-            }
             if (!pmConceptsWriteChip(chip, source, false, true, NULL)) {
                 psError(PS_ERR_IO, false, "Unable to write Concepts for Chip.\n");

trunk/psModules/src/camera/pmFPAfile.c

@@ -81 +81 @@
     file->state = PM_FPA_STATE_CLOSED;
 
+    file->xBin = 1;
+    file->yBin = 1;
+    file->src = NULL;
+
+    file->save = false;
+
     return file;
 }
@@ -109 +115 @@
 
 // XXX reconsider this function name / concept
+# if 0
 bool pmFPAfileAddFileNames (psMetadata *files, char *name, char *value, int mode)
 {
@@ -130 +137 @@
     return true;
 }
+# endif
 
 // select the rule from the camera configuration, perform substitutions as needed
@@ -241 +249 @@
     if (view->cell == -1) {
         pmFPAAddSourceFromView (out, view, format);
-        return pmChipCopyStructure (outChip, inChip, xBin, yBin);
+        // XXX this is a hack: can i defer this to ppImageRebinChip?
+        // bool status = pmChipCopyStructure (outChip, inChip, xBin, yBin);
+        return true;
     }
     if (view->cell >= inChip->cells->n) {

trunk/psModules/src/camera/pmFPAfile.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-17 01:50:43 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-21 22:44:16 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -60 +60 @@
     pmFPALevel fileLevel;  // what level in the FPA hierarchy represents a unique file?
     pmFPALevel dataLevel;  // at what level do we read/write the data segment?
+    pmFPALevel freeLevel;  // at what level do we read/write the data segment?
 
     pmFPA *fpa;    // for I/O files, we carry a pointer to the complete fpa

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -109 +109 @@
         return NULL;
     }
+    // default is to free the data after use (after written out)
+    // this can be overridden for pmFPAfiles used as carriers as well
+    file->freeLevel = file->dataLevel;
 
     if (fpa != NULL) {
@@ -199 +202 @@
     char *save = psMetadataLookupStr (&status, data, "FILE.SAVE");
     if (save != NULL) {
-        if (!strcasecmp (type, "TRUE"))     {
+        if (!strcasecmp (save, "TRUE"))     {
             file->save = true;
         }
-        if (!strcasecmp (type, "FALSE"))     {
+        if (!strcasecmp (save, "FALSE"))     {
             file->save = false;
         }
@@ -218 +221 @@
         return NULL;
     }
+    // default is to free the data after use (after written out)
+    // this can be overridden for pmFPAfiles used as carriers as well
+    file->freeLevel = file->dataLevel;
 
     if (fpa != NULL) {
@@ -266 +272 @@
     }
 
+    // add argument-supplied OUTPUT name to this file
+    char *outname = psMetadataLookupStr(&status, config->arguments, "OUTPUT");
+    psMetadataAddStr (file->names, PS_LIST_TAIL, "OUTPUT", PS_META_NO_REPLACE, "", outname);
+
+    // place the resulting file in the config system
     psMetadataAddPtr (config->files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file);
     psFree (file); // we free this copy of file, but 'files' still has a copy
@@ -616 +627 @@
     PS_ASSERT_INT_POSITIVE(strlen(filename), false);
 
-    pmFPA *fpa = pmFPAConstruct (config->camera);
+    pmFPA *fpa = pmFPAConstruct (src->camera);
     pmFPAfile *file = pmFPAfileDefineOutput (config, fpa, filename);
     if (!file) {
@@ -648 +659 @@
     }
     file->fpa = pmFPAConstruct(file->camera);
+
+    for (int i = 0; i < file->fpa->chips->n; i++) {
+        pmChip *chip = file->fpa->chips->data[i];
+        for (int j = 0; j < chip->cells->n; j++) {
+            pmCell *cell = chip->cells->data[j];
+            char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME");
+            fprintf (stderr, "cell %d,%d : %s\n", i, j, name);
+        }
+    }
+
     return file;
 }

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -101 +101 @@
         if (hdu != phu) {
             // we assume that the PHU is just a header
-            psMetadata *outhead = psMetadataCopy (NULL, phu->header);
+            // header may not be defined for constructed images; make a dummy one
+            psMetadata *outhead = NULL;
+            if (phu->header) {
+                outhead = psMetadataCopy (NULL, phu->header);
+            } else {
+                outhead = psMetadataAlloc ();
+            }
             psMetadataAdd (outhead, PS_LIST_TAIL, "EXTEND", PS_DATA_BOOL | PS_META_REPLACE, "this file has extensions", true);
             psFitsWriteBlank (file->fits, outhead);

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -261 +261 @@
 
     // do we need to read this file?
-    if (level != file->dataLevel) {
-        psTrace("pmFPAfile", 6, "skip free of %s at this level %s: dataLevel is %s",
+    if (level != file->freeLevel) {
+        psTrace("pmFPAfile", 6, "skip free of %s at this level %s: freeLevel is %s",
+                file->name, pmFPALevelToName(level), pmFPALevelToName(file->freeLevel));
+        return true;
+    }
+
+    // XXX totally lame hack: how do I handle this?
+    # if 0
+    if (!strcasecmp(file->name, "PPIMAGE.BIN1") && (level != PM_FPA_LEVEL_FPA))
+        {
+            psTrace("pmFPAfile", 5, "skip free of %s at this level %s: dataLevel is %s",
+                    file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
+            return true;
+        }
+    if (!strcasecmp(file->name, "PPIMAGE.BIN2") && (level != PM_FPA_LEVEL_FPA)) {
+        psTrace("pmFPAfile", 5, "skip free of %s at this level %s: dataLevel is %s",
                 file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
         return true;
     }
+    # endif
 
     switch (file->type) {
@@ -271 +286 @@
         if (pmFPAviewFreeFitsImage (view, file)) {
             psTrace ("pmFPAfile", 5, "freed %s (type: %d)\n", file->filename, file->type);
+            if (file->filename == NULL) {
+                psTrace ("pmFPAfile", 5, "filename is not defined for %s\n", file->name);
+            }
         } else {
             psError(PS_ERR_UNKNOWN, false, "skipping %s (type: %d)\n", file->filename, file->type);
@@ -310 +328 @@
     if (file->mode != PM_FPA_MODE_WRITE) {
         psTrace("pmFPAfile", 6, "skip write for %s, mode is not WRITE", file->name);
+        return true;
+    }
+
+    if (!file->save) {
+        psTrace("pmFPAfile", 6, "skip write for %s, save is FALSE", file->name);
         return true;
     }
@@ -393 +416 @@
 
     // do we need to write this file?
-    if (level != file->dataLevel) {
-        psTrace("pmFPAfile", 6, "skip creation of %s at this level %s: dataLevel is %s",
-                file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel));
+    if (level != file->fileLevel) {
+        psTrace("pmFPAfile", 6, "skip creation of %s at this level %s: fileLevel is %s",
+                file->name, pmFPALevelToName(level), pmFPALevelToName(file->fileLevel));
         return true;
     }
@@ -404 +427 @@
         /* create a PHU for thie file, if it does not exist */
         pmFPAfileCopyStructureView (file->fpa, file->src, file->format, file->xBin, file->yBin, view);
-        psTrace ("pmFPAfile", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa);
+        // psTrace ("pmFPAfile", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa);
         break;