Changeset 37807 for trunk/Ohana/src/libautocode/def/image.d

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libautocode/def/image.d (modified) (4 diffs)

trunk/Ohana/src/libautocode/def/image.d

@@ -2 +2 @@
 EXTNAME      DVO_IMAGE
 TYPE         BINTABLE
-SIZE         360
+SIZE         384
 DESCRIPTION  DVO Image Table 
 
@@ -8 +8 @@
 # careful of 8-byte boundaries
 
+# Coords is an internal structure defined in def/common.h
 SUBSTRUCT coords,           COORDS,               Coords,        astrometric data
 SUBFIELD  crval1,           CRVAL1,               double,        coordinate at reference pixel
@@ -22 +23 @@
 SUBFIELD  ctype,            CTYPE,                char[15],      coordinate type
 SUBFIELD  Npolyterms,       NPOLYTERMS,           char,          order of polynomial
-# 120 bytes
+SUBFIELD  mosaic,           MOSAIC,               e_void,        pointer to parent mosaic
+SUBFIELD  imageMap,         IMAGE_MAP,            e_void,        pointer to image map
+# 136 bytes
 
 # change this to a double?
@@ -76 +79 @@
 FIELD     photom_map_id,    PHOTOM_MAP_ID,        unsigned int,   reference to 2D zero point map
 FIELD     astrom_map_id,    ASTROM_MAP_ID,        unsigned int,   reference to 2D astrometry map
+
+FIELD    *parent,           PARENT,               e_void,         pointer to parent mosaic (not save to disk)
 # nFitPhotom lands on the old location of Mxxxx, which was used to mean nFitPhotom in some cases