Changeset 15511 for trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c

Timestamp:

Nov 8, 2007, 10:43:14 AM (19 years ago)

Author:

eugene

Message:

fixed conversion, some cleanup to autocode files

File:

• trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c (modified) (9 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c

@@ -10 +10 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR        = in[i].dR * 0.01;
-    out[i].dD        = in[i].dD * 0.01;
-    out[i].M         = in[i].M  * 0.001;
-    out[i].dM        = in[i].dM * 0.001;
-    out[i].Mcal      = in[i].Mcal * 0.001;
+    out[i].dR        = (in[i].dR      == NAN_S_SHORT) ? NAN : in[i].dR     * 0.01;
+    out[i].dD        = (in[i].dD      == NAN_S_SHORT) ? NAN : in[i].dD     * 0.01;
+    out[i].M         = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
+    out[i].dM        = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
+    out[i].Mcal      = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     out[i].dophot    = in[i].dophot;
     out[i].photcode  = in[i].source;
@@ -24 +24 @@
 
     /* these values don't exist in the Loneos format */
-    out[i].Mgal     = in[i].M;
+    out[i].Mgal     = out[i].M;
     out[i].dt       = 0;
     out[i].airmass  = 0;
@@ -62 +62 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR     = in[i].dR * 100.0;
-    out[i].dD     = in[i].dD * 100.0;
-    out[i].M      = in[i].M  * 1000.0;
-    out[i].dM     = in[i].dM * 1000.0;
-    out[i].Mcal   = in[i].Mcal * 1000.0;
+    out[i].dR     = isnan(in[i].dR     ) ? NAN_S_SHORT : in[i].dR      *  100.0;
+    out[i].dD     = isnan(in[i].dD     ) ? NAN_S_SHORT : in[i].dD      *  100.0;
+    out[i].M      = isnan(in[i].M      ) ? NAN_S_SHORT : in[i].M       * 1000.0;
+    out[i].dM     = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
+    out[i].Mcal   = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
     out[i].dophot = in[i].dophot;
     out[i].source = in[i].photcode;
@@ -110 +110 @@
     out[i].objID_lo = 0;
 
-    primary[0][i].M  = in[i].M  * 0.001;      
+    primary[0][i].M  = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
     primary[0][i].Xm = in[i].Xm;     
-    primary[0][i].dM = 0xffff;
+    primary[0][i].dM = NAN;
     primary[0][i].Ncode = 0;     
     primary[0][i].Nused = 0;
-
-    // XXX drop this or keep this?
-    // primary[0][i].Xg = in[i].Xg;
   }
   return (out);
@@ -140 +137 @@
     out[i].missing = in[i].missing;
 
-    out[i].M       = primary[i].M * 1000.0;      
+    out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
     out[i].Xm      = primary[i].Xm;     
   }
@@ -155 +152 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M*0.001;      
+    out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
     out[i].Xm    = in[i].Xm;      
-    out[i].dM    = 0xffff;
+    out[i].dM    = NAN;
     out[i].Ncode = 0;
     out[i].Nused = 0;
@@ -173 +170 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M    = in[i].M*1000.0;      
+    out[i].M    = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M * 1000.0;
     out[i].Xm   = in[i].Xm;      
   }
@@ -189 +186 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strcpy (out[i].name, in[i].name); // out[64], in[32]
 
     out[i].tzero            = in[i].tzero;
     out[i].nstar            = in[i].nstar;
-    out[i].secz             = in[i].secz * 0.001;
     out[i].NX               = in[i].NX;
     out[i].NY               = in[i].NY;
-    out[i].apmifit          = in[i].apmifit * 0.001;
-    out[i].dapmifit         = in[i].dapmifit * 0.001;
-    out[i].Mcal     = in[i].Mcal * 0.001;
-    out[i].dMcal            = in[i].dMcal * 0.001;
+
+    out[i].secz             = (in[i].secz     == NAN_S_SHORT) ? NAN : in[i].secz     * 0.001;
+    out[i].apmifit          = (in[i].apmifit  == NAN_S_SHORT) ? NAN : in[i].apmifit  * 0.001;
+    out[i].dapmifit         = (in[i].dapmifit == NAN_S_SHORT) ? NAN : in[i].dapmifit * 0.001;
+    out[i].Mcal             = (in[i].Mcal     == NAN_S_SHORT) ? NAN : in[i].Mcal     * 0.001;
+    out[i].dMcal            = (in[i].dMcal    == NAN_S_SHORT) ? NAN : in[i].dMcal    * 0.001;
+
     out[i].Xm               = in[i].Xm;
     out[i].photcode         = in[i].source;
@@ -244 +242 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strncpy (out[i].name, in[i].name, 31); // out[32], in[64]
+    out[i].name[31] = 0; // force termination
 
     out[i].tzero            = in[i].tzero;
     out[i].nstar            = in[i].nstar;
-    out[i].secz             = in[i].secz * 1000.0;
     out[i].NX               = in[i].NX;
     out[i].NY               = in[i].NY;
-    out[i].apmifit          = in[i].apmifit * 1000.0;
-    out[i].dapmifit         = in[i].dapmifit * 1000.0;
-    out[i].Mcal             = in[i].Mcal * 1000.0;
-    out[i].dMcal            = in[i].dMcal * 1000.0;
+
+    out[i].secz             = isnan(in[i].secz    ) ? NAN_S_SHORT : in[i].secz     * 1000.0;
+    out[i].apmifit          = isnan(in[i].apmifit ) ? NAN_S_SHORT : in[i].apmifit  * 1000.0;
+    out[i].dapmifit         = isnan(in[i].dapmifit) ? NAN_S_SHORT : in[i].dapmifit * 1000.0;
+    out[i].Mcal             = isnan(in[i].Mcal    ) ? NAN_S_SHORT : in[i].Mcal     * 1000.0;
+    out[i].dMcal            = isnan(in[i].dMcal   ) ? NAN_S_SHORT : in[i].dMcal    * 1000.0;
+
     out[i].Xm               = in[i].Xm;
     out[i].source           = in[i].photcode;