Changeset 30605 for trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

Timestamp:

Feb 13, 2011, 11:13:37 AM (15 years ago)

Author:

eugene

Message:

zero out all dvo I/O buffers before converting formats; adding fields to track calibration accuracy ( dXpixSys, dMagSys, and related ) -- these replace existing but unused fields Mxx...Myyyy in images, and replace dummy padding in measure-ps1-v2 ; invalidate old photfits functions ( to be replaced with a map if needed )

File:

• trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c (modified) (12 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

@@ -8 +8 @@
   Measure *out;
 
-  ALLOCATE (out, Measure, Nvalues);
+  ALLOCATE_ZERO (out, Measure, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -63 +63 @@
   Measure_PS1_DEV_2 *out;
 
-  ALLOCATE (out, Measure_PS1_DEV_2, Nvalues);
+  ALLOCATE_ZERO (out, Measure_PS1_DEV_2, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -109 +109 @@
   Average *out;
 
-  ALLOCATE (out, Average, Nvalues);
+  ALLOCATE_ZERO (out, Average, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -151 +151 @@
   Average_PS1_DEV_2 *out;
 
-  ALLOCATE (out, Average_PS1_DEV_2, Nvalues);
+  ALLOCATE_ZERO (out, Average_PS1_DEV_2, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -185 +185 @@
   SecFilt *out;
 
-  ALLOCATE (out, SecFilt, Nvalues);
+  ALLOCATE_ZERO (out, SecFilt, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -209 +209 @@
   SecFilt_PS1_DEV_2 *out;
 
-  ALLOCATE (out, SecFilt_PS1_DEV_2, Nvalues);
+  ALLOCATE_ZERO (out, SecFilt_PS1_DEV_2, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -226 +226 @@
   Image *out;
 
-  ALLOCATE (out, Image, Nvalues);
+  ALLOCATE_ZERO (out, Image, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -259 +259 @@
     out[i].sourceID         = in[i].sourceID;
 
-    out[i].order            = in[i].order;
-    out[i].Mx               = in[i].Mx;
-    out[i].My               = in[i].My;
-    out[i].Mxx              = in[i].Mxx;
-    out[i].Mxy              = in[i].Mxy;
-    out[i].Myy              = in[i].Myy;
-    out[i].Mxxx             = in[i].Mxxx;
-    out[i].Mxxy             = in[i].Mxxy;
-    out[i].Mxyy             = in[i].Mxyy;
-    out[i].Myyy             = in[i].Myyy;
-    out[i].Mxxxx            = in[i].Mxxxx;
-    out[i].Mxxxy            = in[i].Mxxxy;
-    out[i].Mxxyy            = in[i].Mxxyy;
-    out[i].Mxyyy            = in[i].Mxyyy;
-    out[i].Myyyy            = in[i].Myyyy;
+    // as of 2011.02.03, the old Mx,My,..., Mxxxx,Myyyy have been deprecated and replaced
+    // with the following.  (no real databases used those values -- see
+    // libdvo/doc/dvo-images.txt)
+    out[i].nLinkAstrom      = in[i].nLinkAstrom;
+    out[i].nLinkPhotom      = in[i].nLinkPhotom;
+    out[i].dummy3           = in[i].dummy3;
+    out[i].dXpixSys         = in[i].dXpixSys;
+    out[i].dYpixSys         = in[i].dYpixSys;
+    out[i].dMagSys          = in[i].dMagSys;
+    out[i].nFitAstrom       = in[i].nFitAstrom;
+    out[i].nFitPhotom       = in[i].nFitPhotom;
+    out[i].photom_map_id    = in[i].photom_map_id;
+    out[i].astrom_map_id    = in[i].astrom_map_id;
 
     // changed or added for PS1_V1
@@ -292 +290 @@
   Image_PS1_DEV_2 *out;
 
-  ALLOCATE (out, Image_PS1_DEV_2, Nvalues);
+  ALLOCATE_ZERO (out, Image_PS1_DEV_2, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -326 +324 @@
     out[i].sourceID         = in[i].sourceID;
 
-    out[i].order            = in[i].order;
-    out[i].Mx               = in[i].Mx;
-    out[i].My               = in[i].My;
-    out[i].Mxx              = in[i].Mxx;
-    out[i].Mxy              = in[i].Mxy;
-    out[i].Myy              = in[i].Myy;
-    out[i].Mxxx             = in[i].Mxxx;
-    out[i].Mxxy             = in[i].Mxxy;
-    out[i].Mxyy             = in[i].Mxyy;
-    out[i].Myyy             = in[i].Myyy;
-    out[i].Mxxxx            = in[i].Mxxxx;
-    out[i].Mxxxy            = in[i].Mxxxy;
-    out[i].Mxxyy            = in[i].Mxxyy;
-    out[i].Mxyyy            = in[i].Mxyyy;
-    out[i].Myyyy            = in[i].Myyyy;
+    // as of 2011.02.03, the old Mx,My,..., Mxxxx,Myyyy have been deprecated and replaced
+    // with the following.  (no real databases used those values -- see
+    // libdvo/doc/dvo-images.txt)
+    out[i].nLinkAstrom      = in[i].nLinkAstrom;
+    out[i].nLinkPhotom      = in[i].nLinkPhotom;
+    out[i].dummy3           = in[i].dummy3;
+    out[i].dXpixSys         = in[i].dXpixSys;
+    out[i].dYpixSys         = in[i].dYpixSys;
+    out[i].dMagSys          = in[i].dMagSys;
+    out[i].nFitAstrom       = in[i].nFitAstrom;
+    out[i].nFitPhotom       = in[i].nFitPhotom;
+    out[i].photom_map_id    = in[i].photom_map_id;
+    out[i].astrom_map_id    = in[i].astrom_map_id;
 
     // changed or added for PS1_V1
@@ -353 +349 @@
   PhotCode *out;
 
-  ALLOCATE (out, PhotCode, Nvalues);
+  ALLOCATE_ZERO (out, PhotCode, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {
@@ -390 +386 @@
   PhotCode_PS1_DEV_2 *out;
 
-  ALLOCATE (out, PhotCode_PS1_DEV_2, Nvalues);
+  ALLOCATE_ZERO (out, PhotCode_PS1_DEV_2, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {