Changeset 34749 for trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

Timestamp:

Nov 30, 2012, 10:06:05 AM (14 years ago)

Author:

eugene

Message:

merge from eam/20120905 (updates to delstar, setposangle, update to ps1-v4 schema to add measure.Xoff,Yoff)

File:

• trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

@@ -11 +11 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_measure_init (&out[i]);
+
     out[i].dR         = in[i].dR;
     out[i].dD         = in[i].dD;
@@ -53 +55 @@
     out[i].dbFlags    = in[i].dbFlags;
     out[i].photFlags  = in[i].photFlags;
-
-    // added for PS1_V4
-    out[i].Mkron      = NAN;
-    out[i].dMkron     = NAN;
-    out[i].FluxPSF    = NAN;
-    out[i].dFluxPSF   = NAN;
-    out[i].FluxKron   = NAN;
-    out[i].dFluxKron  = NAN;
-    out[i].psfQFperf  = NAN;
   }
   return (out);
@@ -129 +122 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_average_init (&out[i]);
+
     out[i].R             = in[i].R;      
     out[i].D             = in[i].D;      
@@ -157 +152 @@
     out[i].catID         = in[i].catID;
     out[i].extID         = in[i].extID;
-
-    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
-    out[i].psfQF         = NAN;
-    out[i].psfQFperf     = NAN;
-    out[i].stargal       = NAN;
   }
   return (out);
@@ -215 +205 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_secfilt_init (&out[i]);
+
     out[i].M           = in[i].M;      
     out[i].Map         = in[i].Map;      
@@ -226 +218 @@
     out[i].Mstdev      = in[i].Mstdev;      
     out[i].ubercalDist = in[i].ubercalDist;      
-
-    // added for PS1_V4
-    out[i].Mkron       = NAN;
-    out[i].dMkron      = NAN;
-    out[i].FluxPSF     = NAN;
-    out[i].dFluxPSF    = NAN;
-    out[i].FluxKron    = NAN;
-    out[i].dFluxKron   = NAN;
-    out[i].stackDetectID     = 0;
  }
   return (out);