Changeset 3609 for trunk/Ohana/src/libautocode

Timestamp:

Mar 31, 2005, 4:57:00 PM (21 years ago)

Author:

eugene

Message:

moving to autocode on imregister

Location:

trunk/Ohana/src/libautocode

Files:

• Makefile (modified) (3 diffs)
• def/common.h (modified) (2 diffs)
• def/photreg.d (modified) (1 diff)
• def/regimage.d (added)
• generate (modified) (5 diffs)

trunk/Ohana/src/libautocode/Makefile

@@ -29 +29 @@
 # remember to add entries here to libohana/Makefile:AOBJ as well
 LIBOBJ = \
+$(SRC)/regimage.$(ARCH).o \
 $(SRC)/detreg.$(ARCH).o \
 $(SRC)/photreg.$(ARCH).o \
@@ -37 +38 @@
 
 LIBINC = \
+$(INC)/regimage.h \
 $(INC)/detreg.h \
 $(INC)/photreg.h \
@@ -44 +46 @@
 $(INC)/spectrum-ascii.h
 
-COMINC = \
-$(DEF)/common.h
-
 $(LIBOBJ): $(INC)/autocode.h
 
 $(INC)/autocode.h: $(LIBINC)
-        cat $(COMINC) $(LIBINC) > $(INC)/autocode.h
+        cat $(DEF)/common.h >  $(INC)/autocode.h
+        cat $(LIBINC)       >> $(INC)/autocode.h
+        @echo "# endif"     >> $(INC)/autocode.h
         @echo done with libautocode.a:
 

trunk/Ohana/src/libautocode/def/common.h

@@ -1 @@
-# include <stdio.h>
-# include <stdarg.h>
-# include <fitsio.h>
+# include <ohana.h>
+
+# ifndef AUTOCODE_H
+# define AUTOCODE_H
+/* matched endif is added by Makefile */
 
 # ifndef TRUE
@@ -32 +34 @@
 
 # define e_time unsigned int
+# define rawshort short
+
+/*** rawshort is used to handle the broken pre-autocode photreg tables
+     fix the tables and remove this
+***/
 
 /*** this file uses data types which must have fixed sizes regardless 

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

@@ -17 +17 @@
 FIELD photcode,   PHOTCODE,   short,       photcode,                  photcode
 FIELD label,      LABEL,      char[64],    data label
-FIELD refcode,    REFCODE,    short,       photcode,                  photcode
+FIELD refcode,    REFCODE,    rawshort,    photcode,                  photcode
 FIELD Ntime,      N_TIME,     int,         number of times
 FIELD Nmeas,      N_MEAS,     int,         number of measurements

trunk/Ohana/src/libautocode/generate

@@ -41 +41 @@
         # not a simple key/value entry
         if ($key eq "FIELD") {
-            ($element, $field, $format, $comment, $unit) = split (/,\s+/, $value);
+            ($element, $field, $format, $comment, $unit) = split (/,\s+/, $value, 5);
+#           print "$element : $field : $format : $comment : $unit\n";
             push @element, $element;
             push @field,   $field;
@@ -106 +107 @@
         if ($type eq "float")  { $pt1 = "E"; }
         if ($type eq "double") { $pt1 = "D"; }
+
+        if ($type eq "rawshort") { $pt1 = "I"; }
 
         printf FILE "  fits_define_bintable_column (header, ";
@@ -130 +133 @@
         if ($type eq "double") { $pt1 = sprintf "F%s", $length; }
 
+        if ($type eq "rawshort")  { $pt1 = sprintf "I%s", $length; }
+
         printf FILE "  fits_define_table_column (header, ";
         printf FILE "\"%s\", ",   $pt1;
@@ -179 +184 @@
             next;
         }
+        # this is a patch for old photreg tables: provide a fix for the tables
+        if ($type eq "rawshort")  {
+            $N +=2;
+            next;
+        }
         if ($type eq "short")  {
             $T = "BYTE";
@@ -229 +239 @@
         if ($type eq "float")  { $Nbytes += 4; }
         if ($type eq "double") { $Nbytes += 8; }
+
+        if ($type eq "rawshort")  { $Nbytes += 2; }
     }
     return ($Nbytes);