Changeset 6205 for trunk/psModules/src/astrom

Timestamp:

Jan 26, 2006, 11:10:51 AM (21 years ago)

Author:

gusciora

Message:

Implemented the polynomial alloc argument changes.

Location:

trunk/psModules/src/astrom

Files:

• Makefile.am (modified) (1 diff)
• pmAstrometry.c (modified) (8 diffs)
• pmAstrometry.h (modified) (7 diffs)
• pmAstrometryObjects.h (modified) (2 diffs)

trunk/psModules/src/astrom/Makefile.am

@@ -5 +5 @@
 libpsmoduleastrom_la_SOURCES  = \
     pmAstrometry.c \
+    pmFPAConstruct.c \
     pmAstrometryObjects.c
 
 psmoduleincludedir = $(includedir)
 psmoduleinclude_HEADERS = \
-  pmAstrometry.h \
-  pmAstrometryObjects.h
+    pmAstrometry.h \
+    pmFPAConstruct.h \
+    pmAstrometryObjects.h

trunk/psModules/src/astrom/pmAstrometry.c

@@ -13 +13 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 * 
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-12-08 00:00:57 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-26 21:10:50 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
         psFree(cell->readouts);
         psFree(cell->parent);
-        psFree(cell->private);
+        psFree(cell->hdu);
     }
 }
@@ -125 +125 @@
         psFree(chip->cells);
         psFree(chip->parent);
-        psFree(chip->private);
+        psFree(chip->hdu);
     }
 }
@@ -151 +151 @@
         }
         psFree(fpa->chips);
-        psFree(fpa->private);
+        psFree(fpa->hdu);
         psFree(fpa->phu);
     }
@@ -204 +204 @@
     }
     tmpCell->valid = false;
-    tmpCell->private = NULL;
+    tmpCell->hdu = NULL;
 
     psMemSetDeallocator(tmpCell, (psFreeFunc) cellFree);
@@ -233 +233 @@
     }
     tmpChip->valid = false;
-    tmpChip->private = NULL;
+    tmpChip->hdu = NULL;
 
     psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree);
@@ -250 +250 @@
     tmpFPA->camera = camera;
     tmpFPA->chips = psArrayAlloc(0);
-    tmpFPA->private = NULL;
+    tmpFPA->hdu = NULL;
     tmpFPA->phu = NULL;
 
@@ -873 +873 @@
     return(numChips);
 }
+

trunk/psModules/src/astrom/pmAstrometry.h

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-12-08 00:00:57 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-26 21:10:50 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 }
 p_pmHDU;
+
+p_pmHDU *pmHDUAlloc();
+void *pmHDUFree(p_pmHDU *hdu);
 
 /** Focal plane data structure
@@ -62 +65 @@
     const psMetadata *camera;           ///< Camera configuration
     psArray *chips;                     ///< The chips
-    p_pmHDU *private;                   ///< FITS data
+    p_pmHDU *hdu;                       ///< FITS data
     psMetadata *phu;                    ///< Primary Header
 }
@@ -95 +98 @@
     pmFPA *parent;                      ///< Parent FPA
     bool valid;                         ///< Do we bother about reading and working with this chip?
-    p_pmHDU *private;                   ///< FITS data
+    p_pmHDU *hdu;                       ///< FITS data
 }
 pmChip;
@@ -124 +127 @@
     pmChip *parent;                     ///< Parent chip
     bool valid;                         ///< Do we bother about reading and working with this cell?
-    p_pmHDU *private;                   ///< FITS data
+    p_pmHDU *hdu;                       ///< FITS data
 }
 pmCell;
@@ -436 +439 @@
 );
 
+
 /**
  * 
@@ -451 +455 @@
 
 
+/**
+ * 
+ * pmFPAConstruct shall construct a focal plane hierarchy from a camera
+ * configuration. A db handle is also provided so that may be set in the pmFPA.
+ * The resultant pmFPA and its lower-down components shall be ready for to read a
+ * FITS file into it by setting the extname pointers at the appropriate levels to
+ * the appropriate FITS extension name.
+ *  
+ */
+pmFPA *pmFPAConstruct(
+    const psMetadata *camera,
+    psDB *db
+);
+
+
 #endif // #ifndef PS_ASTROMETRY_H
 

trunk/psModules/src/astrom/pmAstrometryObjects.h

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-12-05 20:49:30 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-26 21:10:50 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183 +183 @@
  * the GRID.*.ANGLE entries (they will be ignored).
  * 
- * XXX: This function name is different in the SDRS.
- * 
  */
 /* in pmAstromGrid.c */