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

Timestamp:

Sep 5, 2012, 4:25:56 PM (14 years ago)

Author:

eugene

Message:

merging change from eam_branches/ipp-20120805: adding psfQF, psfQFperf to both average and measure; deprecate average.Xp

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/dvo_convert_loneos.c (modified) (5 diffs)

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

@@ -39 +39 @@
     out[i].Sky       = 0;
     out[i].dSky      = 0;
-    out[i].psfQual   = 0;
+    out[i].psfQF     = 0;
     out[i].psfChisq  = 0;
     out[i].crNsigma  = 0;
@@ -74 +74 @@
     out[i].FluxKron   = NAN;
     out[i].dFluxKron  = NAN;
+    out[i].psfQFperf  = NAN;
   }
   return (out);
@@ -118 +119 @@
     out[i].R             = in[i].R;      
     out[i].D             = in[i].D;      
-    out[i].Xp            = in[i].Xp;     
 
     // added for ELIXIR
@@ -162 +162 @@
     out[i].photFlagsUpper = 0;
     out[i].photFlagsLower = 0;
+
+    // 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);
@@ -177 +182 @@
     out[i].R       = in[i].R;      
     out[i].D       = in[i].D;      
-    out[i].Xp      = in[i].Xp;     
 
     // changed for PANSTARRS_DEV_0 (moved from Average to Measure)