Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmFPA.c

Timestamp:

Mar 8, 2006, 5:08:08 PM (20 years ago)

Author:

Paul Price

Message:

Broad changes to introduce pmHDU, and allow read/write at any level. Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPA.c (modified) (16 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.1.4.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-17 17:13:41 $
+*  @version $Revision: 1.1.4.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-09 03:08:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "pslib.h"
 
+#include "pmHDU.h"
 #include "pmFPA.h"
 #include "pmConcepts.h"
@@ -97 +98 @@
         #endif
 
-        psFree(cell->toChip);
-        psFree(cell->toFPA);
-        psFree(cell->toSky);
         psFree(cell->concepts);
         psFree(cell->analysis);
-        psFree(cell->camera);
+        psFree(cell->config);
         psFree(cell->hdu);
     }
@@ -135 +133 @@
         #endif
 
+        #if 0
+
         psFree(chip->toFPA);
         psFree(chip->fromFPA);
+        #endif
+
         psFree(chip->concepts);
         psFree(chip->analysis);
@@ -148 +150 @@
     if (fpa != NULL) {
         psTrace(__func__, 9, "Freeing fpa %lx\n", (size_t)fpa);
+        #if 0
+
         psFree(fpa->fromTangentPlane);
         psFree(fpa->toTangentPlane);
         psFree(fpa->projection);
+        #endif
+
         psFree(fpa->concepts);
         psFree(fpa->analysis);
@@ -172 +178 @@
         psFree(fpa->chips);
         psFree(fpa->hdu);
-        psFree(fpa->phu);
     }
 }
@@ -230 +235 @@
 
 
-
-void p_pmHDUFree(p_pmHDU *hdu)
-{
-    if (hdu) {
-        psFree(hdu->extname);
-        psFree(hdu->header);
-        psFree(hdu->images);
-        psFree(hdu->masks);
-        psFree(hdu->weights);
-    }
-}
-
-// XXX: Verify these default values for row0, col0, rowBins, colBins
-// PAP: These values may disappear in the future in favour of values in parent->concepts?
 pmReadout *pmReadoutAlloc(pmCell *cell)
 {
     pmReadout *tmpReadout = (pmReadout *) psAlloc(sizeof(pmReadout));
 
-    tmpReadout->col0 = 0;
-    tmpReadout->row0 = 0;
-    tmpReadout->colBins = 0;
-    tmpReadout->rowBins = 0;
     tmpReadout->image = NULL;
     tmpReadout->mask = NULL;
@@ -276 +263 @@
 pmCell *pmCellAlloc(
     pmChip *chip,
-    psMetadata *cameraData,
     const char *name)
 {
     pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell));
 
-    tmpCell->col0 = 0;
-    tmpCell->row0 = 0;
-    tmpCell->toChip = NULL;
-    tmpCell->toFPA = NULL;
-    tmpCell->toSky = NULL;
     tmpCell->concepts = psMetadataAlloc();
     psBool rc = psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name);
@@ -291 +272 @@
         psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n");
     }
-    tmpCell->camera = psMemIncrRefCounter(cameraData);
+    tmpCell->config = NULL;
     tmpCell->analysis = psMetadataAlloc();
     tmpCell->readouts = psArrayAlloc(0);
@@ -323 +304 @@
     pmChip *tmpChip = (pmChip *) psAlloc(sizeof(pmChip));
 
+    #if 0
+
     tmpChip->col0 = 0;
     tmpChip->row0 = 0;
     tmpChip->toFPA = NULL;
     tmpChip->fromFPA = NULL;
+    #endif
+
     tmpChip->concepts = psMetadataAlloc();
     psBool rc = psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name);
@@ -359 +344 @@
     pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA));
 
+    #if 0
+
     tmpFPA->fromTangentPlane = NULL;
     tmpFPA->toTangentPlane = NULL;
     tmpFPA->projection = NULL;
+    #endif
+
     tmpFPA->concepts = psMetadataAlloc();
     tmpFPA->analysis = NULL;
@@ -367 +356 @@
     tmpFPA->chips = psArrayAlloc(0);
     tmpFPA->hdu = NULL;
-    tmpFPA->phu = NULL;
 
     pmConceptsBlankFPA(tmpFPA);
@@ -375 +363 @@
 }
 
-p_pmHDU *p_pmHDUAlloc(const char *extname)
-{
-    p_pmHDU *hdu = psAlloc(sizeof(p_pmHDU));
-    psMemSetDeallocator(hdu, (psFreeFunc)p_pmHDUFree);
-
-    hdu->extname = psStringCopy(extname);
-    hdu->header = NULL;
-    hdu->images = NULL;
-    hdu->masks = NULL;
-    hdu->weights = NULL;
+pmHDU *pmHDUFromFPA(pmFPA *fpa          // FPA for which to find HDU
+                   )
+{
+    return fpa->hdu;
+}
+
+pmHDU *pmHDUFromChip(pmChip *chip       // Chip for which to find HDU
+                    )
+{
+    pmHDU *hdu = chip->hdu;             // The HDU information
+    if (!hdu) {
+        hdu = pmHDUFromFPA(chip->parent); // Grab HDU info from the FPA
+    }
+
+    return hdu;
+}
+
+pmHDU *pmHDUFromCell(pmCell *cell       // Cell for which to find HDU
+                    )
+{
+    pmHDU *hdu = cell->hdu;             // The HDU information
+    if (!hdu) {
+        hdu = pmHDUFromChip(cell->parent); // Grab HDU info from the chip
+    }
 
     return hdu;
@@ -599 +601 @@
 }
 
-
+#if 0
 bool pmCellSetWeights(pmCell *cell // Cell for which to set weights
                      )
@@ -609 +611 @@
     float bad = psMetadataLookupF32(NULL, cell->concepts, "CELL.BAD"); // Bad level
 
-    p_pmHDU *hdu = cell->hdu;           // The data unit, containing the weight and mask originals
+    pmHDU *hdu = cell->hdu;             // The data unit, containing the weight and mask originals
     if (!hdu) {
         pmChip *chip = cell->parent;    // The parent chip
@@ -682 +684 @@
 }
 
-
+#endif