Changeset 3536 for trunk/Ohana/src/libautocode

Timestamp:

Mar 28, 2005, 4:48:19 PM (21 years ago)

Author:

eugene

Message:

adding PhotPars and PhotParsOld to autocode

Location:

trunk/Ohana/src/libautocode

Files:

• Makefile (modified) (2 diffs)
• def/common.h (modified) (1 diff)
• def/photreg-old.d (added)
• def/photreg.d (added)
• def/spectrum.d (modified) (1 diff)
• generate (modified) (4 diffs)

trunk/Ohana/src/libautocode/Makefile

@@ -27 +27 @@
         @echo done autocode
 
+# remember to add entries here to libohana/Makefile:AOBJ as well
 LIBOBJ = \
+$(SRC)/photreg.$(ARCH).o \
+$(SRC)/photreg-old.$(ARCH).o \
 $(SRC)/smpdata.$(ARCH).o \
 $(SRC)/spectrum.$(ARCH).o \
@@ -33 +36 @@
 
 LIBINC = \
+$(INC)/photreg.h \
+$(INC)/photreg-old.h \
 $(INC)/smpdata.h \
 $(INC)/spectrum.h \

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

@@ -31 +31 @@
 # endif
 
+# define e_time unsigned int
+
+/*** this file uses data types which must have fixed sizes regardless 
+     of the platform.  It originally used the basic C primitives: 
+       float, double, int, short int, unsigned long int, etc.
+     this breaks under 64 bit (and probably on other systems).
+     I should define internal data types which should be set by the 
+     use of # define statements if needed.  I will cheat for now and use
+     the time_t to replace unsigned long int in this file 
+***/
+

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

@@ -1 @@
-# name of structure type
 STRUCT  Spectrum
 EXTNAME SPECTRUM_DATABASE

trunk/Ohana/src/libautocode/generate

@@ -103 +103 @@
         if ($type eq "short")  { $pt1 = "I"; }
         if ($type eq "int")    { $pt1 = "J"; }
+        if ($type eq "e_time") { $pt1 = "J"; }
         if ($type eq "float")  { $pt1 = "E"; }
         if ($type eq "double") { $pt1 = "D"; }
@@ -125 +126 @@
         if ($type eq "short")  { $pt1 = sprintf "I%s", $length; }
         if ($type eq "int")    { $pt1 = sprintf "I%s", $length; }
+        if ($type eq "e_time") { $pt1 = sprintf "I%s", $length; }
         if ($type eq "float")  { $pt1 = sprintf "F%s", $length; }
         if ($type eq "double") { $pt1 = sprintf "F%s", $length; }
@@ -181 +183 @@
             $n = 2;
         }
-        if ($type eq "float")  {
+        if ($type eq "int")    {
             $T = "WORD";
             $n = 4;
         }
-        if ($type eq "int")    {
+        if ($type eq "e_time")    {
+            $T = "WORD";
+            $n = 4;
+        }
+        if ($type eq "float")  {
             $T = "WORD";
             $n = 4;
@@ -217 +223 @@
             }
         }
+        if ($type eq "byte")   { $Nbytes += 1; }
+        if ($type eq "short")  { $Nbytes += 2; }
+        if ($type eq "int")    { $Nbytes += 4; }
+        if ($type eq "e_time") { $Nbytes += 4; }
+        if ($type eq "float")  { $Nbytes += 4; }
         if ($type eq "double") { $Nbytes += 8; }
-        if ($type eq "int")    { $Nbytes += 4; }
-        if ($type eq "short")  { $Nbytes += 2; }
-        if ($type eq "float")  { $Nbytes += 4; }
     }
     return ($Nbytes);