Changeset 37356 for trunk/Ohana/src/libdvo

Timestamp:

Sep 4, 2014, 7:54:14 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140813 (tweaks to lensing / lensobj schema)

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (2 diffs)
• src/dvo_convert_PS1_V5.c (modified) (5 diffs)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -1039 +1039 @@
 
 void dvo_lensing_init (Lensing *lensing);
-void dvo_lensobj_init (Lensobj *lensobj);
+void dvo_lensobj_init (Lensobj *lensobj, int toZero);
 
 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -389 +389 @@
   lensing->catID = -1;
   lensing->averef = 0;
+
+  lensing->imageID = -1;
+  lensing->padding = 0;
 }
 
 // init all data, or just catalog data
-void dvo_lensobj_init (Lensobj *lensobj) {
-  lensobj->X11_sm_obj = NAN;
-  lensobj->X12_sm_obj = NAN;
-  lensobj->X22_sm_obj = NAN;
-  lensobj->E1_sm_obj  = NAN;
-  lensobj->E2_sm_obj  = NAN;
-
-  lensobj->X11_sh_obj = NAN;
-  lensobj->X12_sh_obj = NAN;
-  lensobj->X22_sh_obj = NAN;
-  lensobj->E1_sh_obj  = NAN;
-  lensobj->E2_sh_obj  = NAN;
-
-  lensobj->X11_sm_psf = NAN;
-  lensobj->X12_sm_psf = NAN;
-  lensobj->X22_sm_psf = NAN;
-  lensobj->E1_sm_psf  = NAN;
-  lensobj->E2_sm_psf  = NAN;
-
-  lensobj->X11_sh_psf = NAN;
-  lensobj->X12_sh_psf = NAN;
-  lensobj->X22_sh_psf = NAN;
-  lensobj->E1_sh_psf  = NAN;
-  lensobj->E2_sh_psf  = NAN;
-
-  lensobj->F_ApR5     = NAN;
-  lensobj->dF_ApR5    = NAN;
-  lensobj->sF_ApR5    = NAN;
-  lensobj->fF_ApR5    = NAN;
-
-  lensobj->F_ApR6     = NAN;
-  lensobj->dF_ApR6    = NAN;
-  lensobj->sF_ApR6    = NAN;
-  lensobj->fF_ApR6    = NAN;
+void dvo_lensobj_init (Lensobj *lensobj, int toZero) {
+  lensobj->X11_sm_obj = toZero ? 0 : NAN;
+  lensobj->X12_sm_obj = toZero ? 0 : NAN;
+  lensobj->X22_sm_obj = toZero ? 0 : NAN;
+  lensobj->E1_sm_obj  = toZero ? 0 : NAN;
+  lensobj->E2_sm_obj  = toZero ? 0 : NAN;
+  lensobj->X11_sh_obj = toZero ? 0 : NAN;
+  lensobj->X12_sh_obj = toZero ? 0 : NAN;
+  lensobj->X22_sh_obj = toZero ? 0 : NAN;
+  lensobj->E1_sh_obj  = toZero ? 0 : NAN;
+  lensobj->E2_sh_obj  = toZero ? 0 : NAN;
+  lensobj->X11_sm_psf = toZero ? 0 : NAN;
+  lensobj->X12_sm_psf = toZero ? 0 : NAN;
+  lensobj->X22_sm_psf = toZero ? 0 : NAN;
+  lensobj->E1_sm_psf  = toZero ? 0 : NAN;
+  lensobj->E2_sm_psf  = toZero ? 0 : NAN;
+  lensobj->X11_sh_psf = toZero ? 0 : NAN;
+  lensobj->X12_sh_psf = toZero ? 0 : NAN;
+  lensobj->X22_sh_psf = toZero ? 0 : NAN;
+  lensobj->E1_sh_psf  = toZero ? 0 : NAN;
+  lensobj->E2_sh_psf  = toZero ? 0 : NAN;
+  lensobj->F_ApR5     = toZero ? 0 : NAN;
+  lensobj->dF_ApR5    = toZero ? 0 : NAN;
+  lensobj->sF_ApR5    = toZero ? 0 : NAN;
+  lensobj->fF_ApR5    = toZero ? 0 : NAN;
+  lensobj->F_ApR6     = toZero ? 0 : NAN;
+  lensobj->dF_ApR6    = toZero ? 0 : NAN;
+  lensobj->sF_ApR6    = toZero ? 0 : NAN;
+  lensobj->fF_ApR6    = toZero ? 0 : NAN;
 
   lensobj->gamma = NAN;
@@ -434 +432 @@
   lensobj->catID = -1;
 
-  lensobj->pad = 0;
+  lensobj->photcode = 0;
+  lensobj->Nmeas = 0;
 }
 

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -491 +491 @@
 
     out[i].averef      = in[i].averef;
+
+    out[i].imageID     = in[i].imageID;
   }
   return (out);
@@ -543 +545 @@
 
     out[i].averef      = in[i].averef;
+    out[i].imageID     = in[i].imageID;
   }
   return (out);
@@ -555 +558 @@
 
   for (i = 0; i < Nvalues; i++) {
-    dvo_lensobj_init (&out[i]);
+    dvo_lensobj_init (&out[i], FALSE);
 
     out[i].X11_sm_obj  = in[i].X11_sm_obj;      
@@ -598 +601 @@
     out[i].catID       = in[i].catID;
 
+    out[i].photcode    = in[i].photcode;
+    out[i].Nmeas       = in[i].Nmeas;
   }
   return (out);
@@ -651 +656 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
+
+    out[i].photcode    = in[i].photcode;
+    out[i].Nmeas       = in[i].Nmeas;
   }
   return (out);