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

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

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

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

@@ -2 +2 @@
 EXTNAME      DVO_IMAGE
 TYPE         BINTABLE
-SIZE         384
+SIZE         392
 DESCRIPTION  DVO Image Table 
+
+## XXX NOTE: as of 2015.01.11 (r 37807), I had to move this structure from the autocode
+## version to libdvo/include/libdvo_astro.h to support self-references 
 
 # elements of the image structure
@@ -35 +38 @@
 FIELD     apmifit,          APMIFIT,              float,          aperture correction,       mag
 FIELD     dapmifit,         DAPMIFIT,             float,          apmifit error,             mag
-FIELD     Mcal,             MCAL,                 float,          calibration mag,           mag
+FIELD     McalPSF,          MCAL_PSF,             float,          calibration mag for PSF, mag
+FIELD     McalAPER,         MCAL_APER,            float,          calibration mag for Aperture, mag
 FIELD     dMcal,            DMCAL,                float,          error on Mcal,             mag
-FIELD     Xm,               XM,                   short,          image chisq,               10*log(value)
+FIELD     McalChiSq,        XM,                   float,          image chisq
+FIELD     padding_1,        PADDING,              short,          identifier for CCD,
 FIELD     photcode,         PHOTCODE,             short,          identifier for CCD,
 FIELD     exptime,          EXPTIME,              float,          exposure time,             seconds
 FIELD     sidtime,          ST,                   float,          sidereal time of exposure
 FIELD     latitude,         LAT,                  float,          observatory latitude,      degrees
-# 40 bytes
+# 56 bytes
 
 FIELD     RAo,              RA_CENTER,            float,          image center,              degrees