Changeset 39106 for trunk

Timestamp:

Nov 11, 2015, 3:20:46 PM (11 years ago)

Author:

eugene

Message:

need to init R7 elements of lensing and lensobj

Location:

trunk/Ohana/src/libdvo/src

Files:

• dvo_catalog.c (modified) (2 diffs)
• dvo_convert_PS1_V5.c (modified) (4 diffs)

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

@@ -449 +449 @@
   lensing->sF_ApR6    = NAN;
   lensing->fF_ApR6    = NAN;
+
+  lensing->F_ApR7     = NAN;
+  lensing->dF_ApR7    = NAN;
+  lensing->sF_ApR7    = NAN;
+  lensing->fF_ApR7    = NAN;
 
   lensing->detID = -1;
@@ -489 +494 @@
   lensobj->sF_ApR6    = toZero ? 0 : NAN;
   lensobj->fF_ApR6    = toZero ? 0 : NAN;
+  lensobj->F_ApR7     = toZero ? 0 : NAN;
+  lensobj->dF_ApR7    = toZero ? 0 : NAN;
+  lensobj->sF_ApR7    = toZero ? 0 : NAN;
+  lensobj->fF_ApR7    = toZero ? 0 : NAN;
 
   lensobj->gamma = NAN;

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

@@ -496 +496 @@
     out[i].fF_ApR6     = in[i].fF_ApR6;
                                     
+//  out[i].F_ApR7      = in[i].F_ApR7;
+//  out[i].dF_ApR7     = in[i].dF_ApR7;
+//  out[i].sF_ApR7     = in[i].sF_ApR7;
+//  out[i].fF_ApR7     = in[i].fF_ApR7;
+                                    
     out[i].detID       = in[i].detID;
     out[i].objID       = in[i].objID;
@@ -548 +553 @@
     out[i].fF_ApR6     = in[i].fF_ApR6;
                                     
+//  out[i].F_ApR7      = in[i].F_ApR7;
+//  out[i].dF_ApR7     = in[i].dF_ApR7;
+//  out[i].sF_ApR7     = in[i].sF_ApR7;
+//  out[i].fF_ApR7     = in[i].fF_ApR7;
+                                    
     out[i].detID       = in[i].detID;
     out[i].objID       = in[i].objID;
@@ -604 +614 @@
     out[i].sF_ApR6     = in[i].sF_ApR6;
     out[i].fF_ApR6     = in[i].fF_ApR6;
+                                    
+//  out[i].F_ApR7      = in[i].F_ApR7;
+//  out[i].dF_ApR7     = in[i].dF_ApR7;
+//  out[i].sF_ApR7     = in[i].sF_ApR7;
+//  out[i].fF_ApR7     = in[i].fF_ApR7;
                                     
     out[i].detID       = in[i].detID;
@@ -781 +796 @@
     out[i].sF_ApR6     = in[i].sF_ApR6;
     out[i].fF_ApR6     = in[i].fF_ApR6;
+                                    
+//  out[i].F_ApR7      = in[i].F_ApR7;
+//  out[i].dF_ApR7     = in[i].dF_ApR7;
+//  out[i].sF_ApR7     = in[i].sF_ApR7;
+//  out[i].fF_ApR7     = in[i].fF_ApR7;
                                     
     out[i].gamma       = in[i].gamma;