Changeset 37995 for trunk/Ohana/src/libdvo/src/dvo_convert.c

Timestamp:

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

Author:

eugene

Message:

adding dvo elements for E1,E2_psf

File:

• trunk/Ohana/src/libdvo/src/dvo_convert.c (modified) (3 diffs)

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