Changeset 16782

Timestamp:

Mar 2, 2008, 2:21:35 PM (18 years ago)

Author:

eugene

Message:

cleanup; adjust names to match internal

File:

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

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

@@ -307 +307 @@
     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].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;           
     memcpy (out[i].X, in[i].X, 4*sizeof(float));            
 
-    out[i].astromScale = in[i].astromScale;  
-    out[i].photSysErr = in[i].photSysErr;   
+    out[i].astromErrMagScale = out[i].astromErrMagScale;
+    out[i].photomErrSys      = out[i].photomErrSys;
+
   }
   return (out);
@@ -334 +335 @@
     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;           
+
+    // not defined in PS1_DEV_1
+    out[i].astromErrSys      = 0.0;
+    out[i].astromErrScale    = 0.0;
+    out[i].astromErrMagScale = in[i].astromErrMagScale;
+    out[i].photomErrSys      = in[i].photomErrSys;
+
     memcpy (out[i].X, in[i].X, 4*sizeof(float));            
 
-    out[i].astromScale = in[i].astromScale;  
-    out[i].photSysErr = in[i].photSysErr;   
-  }
-  return (out);
-}
+  }
+  return (out);
+}