Changeset 37729 for trunk/Ohana/src/libdvo

Timestamp:

Dec 9, 2014, 5:36:13 PM (12 years ago)

Author:

eugene

Message:

updating formats to match current (2014.12.09) set

Location:

trunk/Ohana/src/libdvo

Files:

• Makefile (modified) (2 diffs)
• include/cmf-ps1-sv4.h (added)
• include/cmf-ps1-v5-lensing-alt.h (added)
• include/cmf-ps1-v5-lensing.h (modified) (1 diff)
• include/dvo.h (modified) (1 diff)
• src/cmf-ps1-sv4.c (added)
• src/cmf-ps1-v5-lensing-alt.c (added)
• src/cmf-ps1-v5-lensing.c (modified) (4 diffs)
• src/cmf-ps1-v5.c (modified) (4 diffs)

trunk/Ohana/src/libdvo/Makefile

@@ -41 +41 @@
 $(DESTINC)/cmf-ps1-v5.h \
 $(DESTINC)/cmf-ps1-sv3.h \
-$(DESTINC)/cmf-ps1-v5-lensing.h
+$(DESTINC)/cmf-ps1-sv4.h \
+$(DESTINC)/cmf-ps1-v5-lensing.h \
+$(DESTINC)/cmf-ps1-v5-lensing-alt.h
 
 INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h
@@ -92 +94 @@
 $(SRC)/cmf-ps1-dv3.$(ARCH).o \
 $(SRC)/cmf-ps1-sv3.$(ARCH).o \
+$(SRC)/cmf-ps1-sv4.$(ARCH).o \
 $(SRC)/cmf-ps1-v5.$(ARCH).o \
 $(SRC)/cmf-ps1-v5-lensing.$(ARCH).o \
+$(SRC)/cmf-ps1-v5-lensing-alt.$(ARCH).o \
 $(SRC)/dvo_util.$(ARCH).o \
 $(SRC)/dbBooleanCond.$(ARCH).o          \

trunk/Ohana/src/libdvo/include/cmf-ps1-v5-lensing.h

@@ -71 +71 @@
   float            E2_sh_psf;            // lensing shear
 
+  short            srcChipNum;
+  short            srcChipX;
+  short            srcChipY;
+
   float            Mr1;                  // first radial moment (pixels)
   float            Mrh;                  // half radial moment (pixels^1/2)

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

@@ -338 +338 @@
 # include "cmf-ps1-dv3.h"
 # include "cmf-ps1-sv3.h"
+# include "cmf-ps1-sv4.h"
 # include "cmf-ps1-v5.h"
 # include "cmf-ps1-v5-lensing.h"
+# include "cmf-ps1-v5-lensing-alt.h"
 
 typedef struct {

trunk/Ohana/src/libdvo/src/cmf-ps1-v5-lensing.c

@@ -1 +1 @@
 # include "dvo.h"
-# define ST_SIZE 312
+# define ST_SIZE 320
 
 // this function is based on the one generated by the autocode of cmf-ps1-v5.d
@@ -100 +100 @@
     SWAP_WORD (256); // E1_SH_PSF
     SWAP_WORD (260); // E2_SH_PSF
-    SWAP_WORD (264); // MOMENTS_R1
-    SWAP_WORD (268); // MOMENTS_RH
-    SWAP_WORD (272); // KRON_FLUX
-    SWAP_WORD (276); // KRON_FLUX_ERR
-    SWAP_WORD (280); // KRON_FLUX_INNER
-    SWAP_WORD (284); // KRON_FLUX_OUTER
-    SWAP_WORD (288); // SKY_LIMIT_RAD
-    SWAP_WORD (292); // SKY_LIMIT_FLUX
-    SWAP_WORD (296); // SKY_LIMIT_SLOPE
-    SWAP_WORD (300); // FLAGS
-    SWAP_WORD (304); // FLAGS2
-    SWAP_BYTE (308); // N_FRAMES
-    SWAP_BYTE (310); // PADDING                       
+
+    SWAP_BYTE (264); // SRC_CHIP_NUM
+    SWAP_BYTE (266); // SRC_CHIP_X
+    SWAP_BYTE (268); // SRC_CHIP_Y
+
+    SWAP_WORD (272); // MOMENTS_R1
+    SWAP_WORD (276); // MOMENTS_RH
+    SWAP_WORD (280); // KRON_FLUX
+    SWAP_WORD (284); // KRON_FLUX_ERR
+    SWAP_WORD (288); // KRON_FLUX_INNER
+    SWAP_WORD (292); // KRON_FLUX_OUTER
+    SWAP_WORD (296); // SKY_LIMIT_RAD
+    SWAP_WORD (300); // SKY_LIMIT_FLUX
+    SWAP_WORD (304); // SKY_LIMIT_SLOPE
+    SWAP_WORD (308); // FLAGS
+    SWAP_WORD (312); // FLAGS2
+    SWAP_BYTE (316); // N_FRAMES
+    SWAP_BYTE (318); // PADDING                       
   }
 # endif  
@@ -289 +294 @@
   gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_X",       "x-coord in source chip",          "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_Y",       "y-coord in source chip",          "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "PADDING3",         "padding for 8byte records",       "",                  1.0, 0.0);
+
   gfits_define_bintable_column (header, "E",    "MOMENTS_R1",       "first radial moment",             "pixels",            1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_RH",       "half radial moment",              "pixels^1/2",        1.0, 0.0);
@@ -385 +396 @@
   gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_X",       "x-coord in source chip",          "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "SRC_CHIP_Y",       "y-coord in source chip",          "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "I",    "PADDING3",         "padding for 8byte records",       "",                  1.0, 0.0);
+
   gfits_define_bintable_column (header, "E",    "MOMENTS_R1",       "first radial moment",             "pixels",            1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_RH",       "half radial moment",              "pixels^1/2",        1.0, 0.0);

trunk/Ohana/src/libdvo/src/cmf-ps1-v5.c

@@ -1 +1 @@
 # include "dvo.h"
+# define ST_SIZE 232
 
 // this function is based on the one generated by the autocode of cmf-ps1-v5.d
@@ -7 +8 @@
   unsigned char tmp;
 
-  if (size != 232) { 
-    fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5: "OFF_T_FMT" vs %d\n",  size,  232);
+  if (size != ST_SIZE) { 
+    fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5: "OFF_T_FMT" vs %d\n",  size,  ST_SIZE);
     return (FALSE);
   }
@@ -33 +34 @@
 # ifdef BYTE_SWAP
   byte = (unsigned char *) data;
-  for (i = 0; i < nitems; i++, byte += 232) {
+  for (i = 0; i < nitems; i++, byte += ST_SIZE) {
     /** BYTE SWAP **/
     SWAP_WORD (0); // IPP_IDET                     
@@ -176 +177 @@
 
   Ncols = ftable[0].header[0].Naxis[0];
-  if (Ncols != 232) {
-    fprintf (stderr, "ERROR: mis-match in table size: width is %d but should be %d bytes\n", Ncols, 232);
+  if (Ncols != ST_SIZE) {
+    fprintf (stderr, "ERROR: mis-match in table size: width is %d but should be %d bytes\n", Ncols, ST_SIZE);
     return NULL;
   }