Changeset 12008 for branches/dvo-mods-2007-02/Ohana/src/libdvo/src/dvo_convert_panstarrs.c

Timestamp:

Feb 22, 2007, 4:05:39 PM (19 years ago)

Author:

eugene

Message:

adding fields needed by DVO for PS1 support; pre-calculating Xccd, Yccd

File:

• branches/dvo-mods-2007-02/Ohana/src/libdvo/src/dvo_convert_panstarrs.c (modified) (9 diffs)

branches/dvo-mods-2007-02/Ohana/src/libdvo/src/dvo_convert_panstarrs.c

@@ -1 +1 @@
 # include <dvo.h>
 
-/*** note that these structures are identical ***/
+/*** XXX is this format actually used by anyone?? ***/
 
 /* convert panstarrs-format measures to internal measures */
@@ -12 +12 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR_PS      = in[i].dR;
-    out[i].dD_PS      = in[i].dD;
-    out[i].M_PS       = in[i].M;
-    out[i].dM_PS      = in[i].dM;
-    out[i].Mcal_PS    = in[i].Mcal;
-    out[i].Mgal_PS    = in[i].Mgal;
-    out[i].airmass_PS = in[i].airmass;
-    out[i].dt_PS      = in[i].dt;
+    out[i].dR         = in[i].dR;
+    out[i].dD         = in[i].dD;
+    out[i].M          = in[i].M;
+    out[i].dM         = in[i].dM;
+    out[i].Mcal       = in[i].Mcal;
+    out[i].Mgal       = in[i].Mgal;
+    out[i].airmass    = in[i].airmass;
+    out[i].dt         = in[i].dt;
     out[i].FWx        = in[i].FWx;
     out[i].FWy        = in[i].FWy;
     out[i].theta      = in[i].theta;
     out[i].dophot     = in[i].dophot;
-    out[i].source     = in[i].source;
+    out[i].photcode   = in[i].source;
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
     out[i].flags      = in[i].flags;
+    
+    /* these can be determined if needed / desired */
+    out[i].Xccd     = 0;
+    out[i].Yccd     = 0;
+    out[i].dXccd    = 0;
+    out[i].dYccd    = 0;
+
+    /* these do not have a corresponding value */
+    out[i].stargal  = 0;
+    out[i].Sky      = 0;
+    out[i].dSky     = 0;
+    out[i].qPSF     = 0;
+
+    /* XXX add these later */
+    out[i].detID_hi = 0;
+    out[i].detID_lo = 0;
+    out[i].imageID_hi = 0;
+    out[i].imageID_lo = 0;
   }
   return (out);
@@ -41 +59 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR      = in[i].dR_PS;
-    out[i].dD      = in[i].dD_PS;
-    out[i].M       = in[i].M_PS;
-    out[i].dM      = in[i].dM_PS;
-    out[i].Mcal    = in[i].Mcal_PS;
-    out[i].Mgal    = in[i].Mgal_PS;
-    out[i].airmass = in[i].airmass_PS;
-    out[i].dt      = in[i].dt_PS;
+    out[i].dR      = in[i].dR;
+    out[i].dD      = in[i].dD;
+    out[i].M       = in[i].M;
+    out[i].dM      = in[i].dM;
+    out[i].Mcal    = in[i].Mcal;
+    out[i].Mgal    = in[i].Mgal;
+    out[i].airmass = in[i].airmass;
+    out[i].dt      = in[i].dt;
     out[i].FWx     = in[i].FWx;
     out[i].FWy     = in[i].FWy;
     out[i].theta   = in[i].theta;
     out[i].dophot  = in[i].dophot;
-    out[i].source  = in[i].source;
+    out[i].source  = in[i].photcode;
     out[i].t       = in[i].t;
     out[i].averef  = in[i].averef;
@@ -92 +110 @@
     out[i].P       = 0;
     out[i].dP      = 0;
+
+    /* XXX add these later */
+    out[i].objID_hi = 0;
+    out[i].objID_lo = 0;
   }
   return (out);
@@ -130 +152 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M_PS    = in[i].M;      
-    out[i].dM_PS   = in[i].dM;      
-    out[i].Xm      = in[i].Xm;     
-  }
+    out[i].M    = in[i].M;      
+    out[i].dM   = in[i].dM;      
+    out[i].Xm      = in[i].Xm;     
+     out[i].Ncode = 0;
+    out[i].Nused = 0;
+ }
   return (out);
 }
@@ -146 +170 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M       = in[i].M_PS;      
-    out[i].dM      = in[i].dM_PS;
+    out[i].M       = in[i].M;      
+    out[i].dM      = in[i].dM;
     out[i].Xm      = in[i].Xm;     
   }
@@ -168 +192 @@
     out[i].tzero            = in[i].tzero;
     out[i].nstar            = in[i].nstar;
-    out[i].secz_PS                  = in[i].secz;
+    out[i].secz             = in[i].secz;
     out[i].NX               = in[i].NX;
     out[i].NY               = in[i].NY;
-    out[i].apmifit_PS       = in[i].apmifit;
-    out[i].dapmifit_PS      = in[i].dapmifit;
-    out[i].Mcal_PS                  = in[i].Mcal;
-    out[i].dMcal_PS         = in[i].dMcal;
+    out[i].apmifit          = in[i].apmifit;
+    out[i].dapmifit         = in[i].dapmifit;
+    out[i].Mcal             = in[i].Mcal;
+    out[i].dMcal            = in[i].dMcal;
     out[i].Xm               = in[i].Xm;
-    out[i].source           = in[i].source;
+    out[i].photcode         = in[i].source;
     out[i].exptime          = in[i].exptime;
     out[i].detection_limit  = in[i].detection_limit;
@@ -201 +225 @@
     out[i].Mxyyy            = in[i].Mxyyy;
     out[i].Myyyy            = in[i].Myyyy;
+
+    /* XXX add these later */
+    out[i].imageID_hi = 0;
+    out[i].imageID_lo = 0;
   }
   return (out);
@@ -220 +248 @@
     out[i].tzero            = in[i].tzero;
     out[i].nstar            = in[i].nstar;
-    out[i].secz             = in[i].secz_PS;
+    out[i].secz             = in[i].secz;
     out[i].NX               = in[i].NX;
     out[i].NY               = in[i].NY;
-    out[i].apmifit          = in[i].apmifit_PS;
-    out[i].dapmifit         = in[i].dapmifit_PS;
-    out[i].Mcal             = in[i].Mcal_PS;
-    out[i].dMcal            = in[i].dMcal_PS;
+    out[i].apmifit          = in[i].apmifit;
+    out[i].dapmifit         = in[i].dapmifit;
+    out[i].Mcal             = in[i].Mcal;
+    out[i].dMcal            = in[i].dMcal;
     out[i].Xm               = in[i].Xm;
-    out[i].source           = in[i].source;
+    out[i].source           = in[i].photcode;
     out[i].exptime          = in[i].exptime;
     out[i].detection_limit  = in[i].detection_limit;