Changeset 37995 for trunk/Ohana/src/libdvo

Timestamp:

Mar 23, 2015, 10:15:49 AM (11 years ago)

Author:

eugene

Message:

adding dvo elements for E1,E2_psf

Location:

trunk/Ohana/src/libdvo

Files:

• include/ps1_v5_defs.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (1 diff)
• src/dvo_convert.c (modified) (3 diffs)
• src/dvo_convert_PS1_V5.c (modified) (8 diffs)

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

@@ -8 +8 @@
 SecFilt_PS1_V5          *SecFiltInternalTo_PS1_V5 (SecFilt *in, off_t Nvalues);
 
+typedef Lensing_PS1_V5_R2 Lensing_PS1_V5;
+
 Lensing                 *Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues);
-Lensing                 *Lensing_PS1_V5_ALT_ToInternal (Lensing_PS1_V5_ALT *in, off_t Nvalues);
-Lensing_PS1_V5          *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues);
+Lensing_PS1_V5_R2       *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues);
 Lensobj                 *Lensobj_PS1_V5_ToInternal (Lensobj_PS1_V5 *in, off_t Nvalues);
 Lensobj_PS1_V5          *LensobjInternalTo_PS1_V5 (Lensobj *in, off_t Nvalues);
+
+Lensing                 *Lensing_PS1_V5_R0_ToInternal (Lensing_PS1_V5_R0 *in, off_t Nvalues);
+Lensing                 *Lensing_PS1_V5_R1_ToInternal (Lensing_PS1_V5_R1 *in, off_t Nvalues);
+Lensing                 *Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues);
 
 StarPar                 *StarPar_PS1_V5_ToInternal (StarPar_PS1_V5 *in, off_t Nvalues);

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

@@ -377 +377 @@
   lensing->E1_sh_psf  = NAN;
   lensing->E2_sh_psf  = NAN;
+
+  lensing->E1_psf     = NAN;
+  lensing->E2_psf     = NAN;
 
   lensing->F_ApR5     = NAN;

trunk/Ohana/src/libdvo/src/dvo_convert.c

@@ -416 +416 @@
 
   if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 128)) {
-    Lensing_PS1_V5_ALT *tmpLensing;                                             
-    tmpLensing = gfits_table_get_Lensing_PS1_V5_ALT (ftable, Nlensing, NULL); 
+    Lensing_PS1_V5_R0 *tmpLensing;                                              
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R0 (ftable, Nlensing, NULL); 
     if (!tmpLensing) {                                                  
       fprintf (stderr, "ERROR: failed to read lensings\n");             
       exit (2);                                                         
     }                                                                   
-    lensing = Lensing_PS1_V5_ALT_ToInternal (tmpLensing, *Nlensing); 
+    lensing = Lensing_PS1_V5_R0_ToInternal (tmpLensing, *Nlensing); 
+    free (tmpLensing);                                                  
+    *format = DVO_FORMAT_PS1_V5;                                        
+    return (lensing); }
+
+  if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
+    Lensing_PS1_V5_R1 *tmpLensing;                                              
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R1 (ftable, Nlensing, NULL); 
+    if (!tmpLensing) {                                                  
+      fprintf (stderr, "ERROR: failed to read lensings\n");             
+      exit (2);                                                         
+    }                                                                   
+    lensing = Lensing_PS1_V5_R1_ToInternal (tmpLensing, *Nlensing); 
     free (tmpLensing);                                                  
     *format = DVO_FORMAT_PS1_V5;                                        
@@ -468 +480 @@
   SKIPPING_FORMAT ("DVO_LENSING_PS1_V3",          PS1_V3,          PS1_V3);
   SKIPPING_FORMAT ("DVO_LENSING_PS1_V4",          PS1_V4,          PS1_V4);
-  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5);
+  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5_R2);
 # undef CONVERT_FORMAT
 
@@ -505 +517 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
-      FORMAT_CASE (PS1_V5,          PS1_V5);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R2);
 # undef FORMAT_CASE
 

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

@@ -444 +444 @@
 }
 
-Lensing *Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues) {
+Lensing *Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues) {
 
   off_t i;
@@ -477 +477 @@
     out[i].E1_sh_psf   = in[i].E1_sh_psf;
     out[i].E2_sh_psf   = in[i].E2_sh_psf;
+
+    out[i].E1_psf      = in[i].E1_psf;
+    out[i].E2_psf      = in[i].E2_psf;
 
     out[i].F_ApR5      = in[i].F_ApR5;
@@ -491 +494 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
 
@@ -499 +501 @@
 }
 
-Lensing_PS1_V5 *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues) {
-
-  off_t i;
-  Lensing_PS1_V5 *out;
+Lensing_PS1_V5_R2 *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues) {
+
+  off_t i;
+  Lensing_PS1_V5_R2 *out;
 
   ALLOCATE_ZERO (out, Lensing_PS1_V5, Nvalues);
@@ -548 +550 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
+
     out[i].imageID     = in[i].imageID;
   }
@@ -583 +585 @@
     out[i].E2_sm_psf   = in[i].E2_sm_psf;     
                                          
-    out[i].E1_psf      = in[i].E1_psf;
-    out[i].E2_psf      = in[i].E2_psf;     
-
     out[i].X11_sh_psf  = in[i].X11_sh_psf;
     out[i].X12_sh_psf  = in[i].X12_sh_psf;
@@ -1317 +1316 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
   }
@@ -1370 +1368 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
-  }
-  return (out);
-}
-
+
+    out[i].imageID     = in[i].imageID;
+  }
+  return (out);
+}
+