Changeset 16784

Timestamp:

Mar 2, 2008, 2:22:29 PM (18 years ago)

Author:

eugene

Message:

update to convert to PS1_DEV_2

File:

• branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_convert_elixir.c (modified) (2 diffs)

branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_convert_elixir.c

@@ -312 +312 @@
     out[i].name[31] = 0; // force termination
 
-    out[i].code = in[i].code;         
-    out[i].type = in[i].type;         
-    out[i].C = in[i].C;            
-    out[i].dC = in[i].dC;           
-    out[i].dX = in[i].dX;           
-    out[i].K = in[i].K;            
-    out[i].c1 = in[i].c1;           
-    out[i].c2 = in[i].c2;           
+    out[i].code  = in[i].code;         
+    out[i].type  = in[i].type;         
+    out[i].C     = in[i].C;            
+    out[i].dC    = in[i].dC;           
+    out[i].dX    = in[i].dX;           
+    out[i].K     = in[i].K;            
+    out[i].c1    = in[i].c1;           
+    out[i].c2    = in[i].c2;           
     out[i].equiv = in[i].equiv;        
-    out[i].Nc = in[i].Nc;           
+    out[i].Nc    = in[i].Nc;           
     memcpy (out[i].X, in[i].X, 4*sizeof(float));            
   }
@@ -338 +338 @@
     out[i].name[31] = 0; // force termination
 
-    out[i].code = in[i].code;         
-    out[i].type = in[i].type;         
-    out[i].C = in[i].C;            
-    out[i].dC = in[i].dC;           
-    out[i].dX = in[i].dX;           
-    out[i].K = in[i].K;            
-    out[i].c1 = in[i].c1;           
-    out[i].c2 = in[i].c2;           
+    out[i].code  = in[i].code;         
+    out[i].type  = in[i].type;         
+    out[i].C     = in[i].C;            
+    out[i].dC    = in[i].dC;           
+    out[i].dX    = in[i].dX;           
+    out[i].K     = in[i].K;            
+    out[i].c1    = in[i].c1;           
+    out[i].c2    = in[i].c2;           
     out[i].equiv = in[i].equiv;        
-    out[i].Nc = in[i].Nc;           
+    out[i].Nc    = in[i].Nc;           
     memcpy (out[i].X, in[i].X, 4*sizeof(float));            
 
     // not defined in Elixir:
-    out[i].astromScale = 1.0;
-    out[i].photSysErr = 1.0;
-  }
-  return (out);
-}
+    out[i].astromErrSys      = 0.0;
+    out[i].astromErrScale    = 0.0;
+    out[i].astromErrMagScale = 0.0;
+    out[i].photomErrSys      = 0.0;
+  }
+  return (out);
+}