Changeset 5014 for trunk/Ohana/src/libautocode

Timestamp:

Sep 12, 2005, 3:04:48 PM (21 years ago)

Author:

eugene

Message:

substantial work to enable mode and format selections for DVO:image and DVO:secfilt

Location:

trunk/Ohana/src/libautocode

Files:

• Makefile (modified) (4 diffs)
• def/average-panstarrs.d (modified) (2 diffs)
• def/image-ascii.d (added)
• def/image-elixir.d (added)
• def/image-loneos.d (added)
• def/image-panstarrs.d (added)
• def/image.d (modified) (4 diffs)
• def/measure-panstarrs.d (modified) (2 diffs)
• def/secfilt-loneos.d (added)
• def/secfilt-panstarrs.d (modified) (1 diff)
• def/secfilt.d (modified) (2 diffs)
• generate (modified) (2 diffs)

trunk/Ohana/src/libautocode/Makefile

@@ -29 +29 @@
 $(SRC)/average-panstarrs.$(ARCH).o \
 $(SRC)/secfilt.$(ARCH).o \
+$(SRC)/secfilt-loneos.$(ARCH).o \
 $(SRC)/secfilt-elixir.$(ARCH).o \
 $(SRC)/secfilt-panstarrs.$(ARCH).o \
@@ -38 +39 @@
 $(SRC)/photcode.$(ARCH).o \
 $(SRC)/image.$(ARCH).o \
+$(SRC)/image-loneos.$(ARCH).o \
+$(SRC)/image-elixir.$(ARCH).o \
+$(SRC)/image-panstarrs.$(ARCH).o \
 $(SRC)/regimage.$(ARCH).o \
 $(SRC)/detreg.$(ARCH).o \
@@ -53 +57 @@
 $(INC)/average-panstarrs.h \
 $(INC)/secfilt.h \
+$(INC)/secfilt-loneos.h \
 $(INC)/secfilt-elixir.h \
 $(INC)/secfilt-panstarrs.h \
@@ -62 +67 @@
 $(INC)/photcode.h \
 $(INC)/image.h \
+$(INC)/image-loneos.h \
+$(INC)/image-elixir.h \
+$(INC)/image-panstarrs.h \
 $(INC)/regimage.h \
 $(INC)/detreg.h \

trunk/Ohana/src/libautocode/def/average-panstarrs.d

@@ -2 +2 @@
 EXTNAME DVO_AVERAGE_PANSTARRS
 TYPE    BINTABLE
-SIZE    44
+SIZE    48
 
 # elements of data structure / FITS table
@@ -18 +18 @@
 FIELD offset,         offset,     int,              offset to first measurement
 FIELD missing,        missing,    int,              offset to first missing obs
+FIELD dummy,          dummmy,     int,              extra space

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

@@ -1 @@
-STRUCT Image
-EXTNAME DVO_IMAGES
-TYPE BINTABLE
-SIZE 240
+STRUCT  Image
+EXTNAME DVO_IMAGE
+TYPE    BINTABLE
+SIZE    248
 
 # elements of the image structure
@@ -20 +20 @@
 SUBFIELD  ctype,            CTYPE,                char[15],      coordinate type
 SUBFIELD  Npolyterms,       NPOLYTERMS,           char,          order of polynomial
+# 120 bytes
 
 FIELD     tzero,            TZERO,                e_time,         readout time (row 0)
 FIELD     nstar,            NSTAR,                unsigned int,   number of stars on image
-FIELD     secz,             SECZ,                 short,          airmass,                   milliairmass
+FIELD     secz_PS,          SECZ,                 float,          airmass,                   mag
 FIELD     NX,               NX,                   short,          image width
 FIELD     NY,               NY,                   short,          image height
-FIELD     apmifit,          APMIFIT,              short,          aperture correction,       millimag
-FIELD     dapmifit,         DAPMIFIT,             short,          apmifit error,             millimag
+FIELD     apmifit_PS,       APMIFIT,              float,          aperture correction,       mag
+FIELD     dapmifit_PS,      DAPMIFIT,             float,          apmifit error,             mag
+FIELD     Mcal_PS,          MCAL,                 float,          calibration mag,           mag
+FIELD     dMcal_PS,         DMCAL,                float,          error on Mcal,             mag
+FIELD     Xm,               XM,                   short,          image chisq,               10*log(value)
 FIELD     source,           SOURCE,               short,          identifier for CCD,
-FIELD     Mcal,             MCAL,                 short,          calibration mag,           millimag
-FIELD     dMcal,            DMCAL,                short,          error on Mcal,             millimag
-FIELD     Xm,               XM,                   short,          image chisq,               10*log(value)
+FIELD     exptime,          EXPTIME,              float,          exposure time,             seconds
+# 40 bytes
+
 FIELD     name,             NAME,                 char[32],       name of original image 
 FIELD     detection_limit,  DETECTION_LIMIT,      unsigned char,  detection limit,           10*mag
@@ -39 +43 @@
 FIELD     fwhm_y,           FWHM_Y,               unsigned char,  PSF y width,               25*arcsec
 FIELD     trate,            TRATE,                unsigned char,  scan rate,                 100 usec/pixel
-FIELD     exptime,          EXPTIME,              float,          exposure time,             seconds
 FIELD     code,             CODE,                 char,           image quality flag
 FIELD     ccdnum,           CCDNUM,               unsigned char,  CCD ID number
-FIELD     dummy,            DUMMY,                char[20],       unused
+# 40 bytes 
+
+FIELD     dummy,            DUMMY,                char[18],       unused
 FIELD     order,            ORDER,                short,          Mrel 2D polynomical order 
 FIELD     Mx,               MX,                   short,          Mrel polyterm
@@ -58 +63 @@
 FIELD     Mxyyy,            MXYYY,                short,          Mrel polyterm
 FIELD     Myyyy,            MYYYY,                short,          Mrel polyterm
+# 48 bytes

trunk/Ohana/src/libautocode/def/measure-panstarrs.d

@@ -2 +2 @@
 EXTNAME DVO_MEASURE_PANSTARRS
 TYPE    BINTABLE
-SIZE    50
+SIZE    52
 
 # elements of data structure / FITS table
@@ -20 +20 @@
 FIELD source,         source,     unsigned short, photcode
 FIELD flags,          flags,      unsigned short, flags for various uses  
+FIELD dummy,          dummy,      short,          extra space
 FIELD t,              t,          unsigned int,   time in seconds (UNIX)
 FIELD averef,         averef,     unsigned int,   reference to average entry      

trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d

@@ -2 +2 @@
 EXTNAME DVO_SECFILT_PANSTARRS
 TYPE    BINTABLE
-SIZE    8
+SIZE    12
 
 # elements of data structure / FITS table
 FIELD  M,  MAG,      float,                other mags,       mags
-FIELD  dM, MAG_ERR,  short,                scatter on mag    1e4*mag
+FIELD  dM, MAG_ERR,  float,                scatter on mag    1e4*mag
 FIELD  Xm, MAG_CHI,  short,                chisq on mag,     [100*log(value)]
+FIELD  dummy, JUNK,  short,                chisq on mag,     [100*log(value)]

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

@@ -2 +2 @@
 EXTNAME DVO_SECFILT
 TYPE    BINTABLE
-SIZE    10
+SIZE    12
 
 # elements of data structure / FITS table
@@ -8 +8 @@
 FIELD  dM_PS, MAG_ERR,  float,                scatter on mag    mags
 FIELD  Xm,    MAG_CHI,  short,                chisq on mag      [100*log(value)]
+FIELD  dummy, JUNK,     short,                place holder

trunk/Ohana/src/libautocode/generate

@@ -35 +35 @@
         ($key, $value) = split (" ", $line, 2);
         
+        # strip white space from the following
+        if ($key eq "TYPE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "SIZE")    { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "STRUCT")  { ($value) = $value =~ m|\s*(\S+)\s*|; }
+        if ($key eq "EXTNAME") { ($value) = $value =~ m|\s*(\S+)\s*|; }
+
         &set_keypair ($key, $value);
 
         # there are used internally (not just a replacement)
-        if ($key eq "TYPE")   { $TYPE = $value;   }
-        if ($key eq "SIZE")   { $SIZE = $value;   }
-        if ($key eq "STRUCT") { $STRUCT = $value; }
+        if ($key eq "TYPE")    { $TYPE = $value;   }
+        if ($key eq "SIZE")    { $SIZE = $value;   }
+        if ($key eq "STRUCT")  { $STRUCT = $value; }
 
         # not a simple key/value entry
@@ -54 +60 @@
         }
     }
+    $Nexpect = 0;
     if ($TYPE eq "BINTABLE") { $Nexpect = &count_bintablesize; }
     if ($TYPE eq "TABLE")    { $Nexpect = &count_tablesize;    }
+    if (! $Nexpect) { die "missing valid TYPE\n"; }
     if ($Nexpect != $SIZE) { die "size mismatch: $Nexpect vs $SIZE\n"; }
 }