Changeset 38100 for branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_convert.c

Timestamp:

Apr 9, 2015, 8:43:14 AM (11 years ago)

Author:

eugene

Message:

add lensing ps1-v5-r3, lensobj ps1-v5-r1 (adds R7 apertures)

File:

• branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_convert.c (modified) (7 diffs)

branches/eam_branches/ipp-20150405/Ohana/src/libdvo/src/dvo_convert.c

@@ -455 +455 @@
     return (lensing); }
 
+  if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 144)) {
+    Lensing_PS1_V5_R2 *tmpLensing;                                              
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R2 (ftable, Nlensing, NULL); 
+    if (!tmpLensing) {                                                  
+      fprintf (stderr, "ERROR: failed to read lensings\n");             
+      exit (2);                                                         
+    }                                                                   
+    lensing = Lensing_PS1_V5_R2_ToInternal (tmpLensing, *Nlensing); 
+    free (tmpLensing);                                                  
+    *format = DVO_FORMAT_PS1_V5;                                        
+    return (lensing); }
+
+# define SKIPPING_FORMAT(NAME, FORMAT, TYPE)            \
+  if (!strcmp (extname, NAME)) {                                        \
+    fprintf (stderr, "ERROR: format %s not defined for lensing, skipping\n", NAME); \
+    *Nlensing = 0; \
+    return NULL; \
+  }
+
 # define CONVERT_FORMAT(NAME, FORMAT, TYPE)             \
   if (!strcmp (extname, NAME)) {                                        \
@@ -468 +487 @@
     return (lensing); }
 
-# define SKIPPING_FORMAT(NAME, FORMAT, TYPE)            \
-  if (!strcmp (extname, NAME)) {                                        \
-    fprintf (stderr, "ERROR: format %s not defined for lensing, skipping\n", NAME); \
-    *Nlensing = 0; \
-    return NULL; \
-  }
-
   if (!strcmp (extname, "DVO_LENSING")) {
     lensing = gfits_table_get_Lensing (ftable, Nlensing, NULL);
@@ -496 +508 @@
   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_R2);
+  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5_R3);
   SKIPPING_FORMAT ("DVO_LENSING_PS1_SIM",         PS1_SIM,         PS1_SIM);
 # undef CONVERT_FORMAT
@@ -535 +547 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
-      FORMAT_CASE (PS1_V5,          PS1_V5_R2);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R3);
 # undef FORMAT_CASE
 
@@ -557 +569 @@
     return (FALSE);
   }
+
+  if (!strcmp (extname, "DVO_LENSOBJ_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
+    Lensobj_PS1_V5_R0 *tmpLensobj;                                              
+    tmpLensobj = gfits_table_get_Lensobj_PS1_V5_R0 (ftable, Nlensobj, NULL); 
+    if (!tmpLensobj) {                                                  
+      fprintf (stderr, "ERROR: failed to read lensobjs\n");             
+      exit (2);                                                         
+    }                                                                   
+    lensobj = Lensobj_PS1_V5_R0_ToInternal (tmpLensobj, *Nlensobj); 
+    free (tmpLensobj);                                                  
+    *format = DVO_FORMAT_PS1_V5;                                        
+    return (lensobj); }
 
 # define SKIPPING_FORMAT(NAME, FORMAT, TYPE)            \
@@ -599 +623 @@
   SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_V3",          PS1_V3,          PS1_V3);
   SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_V4",          PS1_V4,          PS1_V4);
-  CONVERT_FORMAT  ("DVO_LENSOBJ_PS1_V5",          PS1_V5,          PS1_V5);
+  CONVERT_FORMAT  ("DVO_LENSOBJ_PS1_V5",          PS1_V5,          PS1_V5_R1);
   SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_SIM",         PS1_SIM,         PS1_SIM);
 # undef CONVERT_FORMAT
@@ -638 +662 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
-      FORMAT_CASE (PS1_V5,          PS1_V5);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R1);
 # undef FORMAT_CASE