Changeset 34749 for trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.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_panstarrs_DEV_0.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

@@ -10 +10 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_measure_init (&out[i]);
     out[i].dR         = in[i].dR;
     out[i].dD         = in[i].dD;
@@ -35 +36 @@
     // magnitudes.  Most uses of Mgal in the past were actually aperture (isophotal) mags
 
-    // changed or added for PS1_DEV_1 (2008.02.26)
+    // changed for PS1_DEV_1 (2008.02.26)
     out[i].psfQF      = (in[i].psfQF == NAN_S_SHORT) ? NAN : in[i].psfQF;
     out[i].dbFlags    = in[i].flags;
     out[i].detID      = in[i].detID_lo;
     out[i].imageID    = in[i].imageID_lo;
-    out[i].psfChisq   = 0;
-    out[i].crNsigma   = 0;
-    out[i].extNsigma  = 0;
-
-    // changed or added for PS1_DEV_2
+
+    // changed for PS1_DEV_2
     out[i].Map        = in[i].Mgal;
-    out[i].dMcal      = 0; 
-
-    // changed or added for PS1_V1
+
+    // changed for PS1_V1
     out[i].photFlags  = in[i].dophot << 16;
-    out[i].t_msec     = 0;
-    out[i].extID      = 0;
-    out[i].objID      = 0;
-    out[i].catID      = 0;
-    out[i].Mxx        = 0.0;
-    out[i].Mxy        = 0.0;
-    out[i].Myy        = 0.0;
-    out[i].posangle   = 0;
-    out[i].pltscale   = 0;
-    out[i].psfNdof    = 0;
-    out[i].psfNpix    = 0;
-
-    // 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);
@@ -132 +109 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_average_init (&out[i]);
+
     out[i].R             = in[i].R;      
     out[i].D             = in[i].D;      
@@ -145 +124 @@
     out[i].catID         = in[i].catID;
 
-    // changed or added for PS1_DEV_2
+    // changed for PS1_DEV_2
     out[i].Nmeasure      = in[i].Nm;     
     out[i].Nmissing      = in[i].Nn;     
     out[i].measureOffset = in[i].offset; 
     out[i].missingOffset = in[i].missing;
-    out[i].Nextend       = 0;
-    out[i].extendOffset  = 0;
-
-    // changed or added for PS1_V1
+
+    // changed for PS1_V1
     out[i].flags         = in[i].code;   
-    out[i].ChiSqAve      = NAN;
-    out[i].ChiSqPM       = NAN;
-    out[i].ChiSqPar      = NAN;
-    out[i].Tmean         = 0;
-    out[i].Trange        = 0;
-    out[i].Npos          = 0.0;
-    out[i].extID         = 0;
-
-    // added in PS1_V3
-    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);
@@ -219 +180 @@
 
   for (i = 0; i < Nvalues; i++) {
+    dvo_secfilt_init (&out[i]);
+
     out[i].M     = in[i].M;      
     out[i].dM    = in[i].dM;      
@@ -224 +187 @@
     out[i].Ncode = in[i].Ncode;
     out[i].Nused = in[i].Nused;
-
-    // changed or added for PS1_V1
-    out[i].M_20  = 0;      
-    out[i].M_80  = 0;      
-
-    // changed or added for PS1_V2
-    out[i].flags = 0;
-
-    // added in PS1_V3
-    out[i].Map         = 0;
-    out[i].Mstdev      = 0;
-    out[i].ubercalDist = 0;
-
-    // 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);