Changeset 38333

Timestamp:

May 29, 2015, 8:56:02 AM (11 years ago)

Author:

eugene

Message:

fix galshape change

File:

• branches/eam_branches/ohana.20150429/src/relastro/src/BrightCatalog.c (modified) (8 diffs)

branches/eam_branches/ohana.20150429/src/relastro/src/BrightCatalog.c

@@ -172 +172 @@
     GET_COLUMN(Nmeasure,       "NMEASURE",       short);
     GET_COLUMN(Nmissing,       "NMISSING",       short);
-    GET_COLUMN(Nextend,        "NEXTEND",        short);
+    GET_COLUMN(Ngalshape,      "NGALSHAPE",      short);
     GET_COLUMN(measureOffset,  "OFF_MEASURE",    int);
     GET_COLUMN(missingOffset,  "OFF_MISSING",    int);
@@ -208 +208 @@
       average[i].Nmeasure        = Nmeasure[i]        ;
       average[i].Nmissing        = Nmissing[i]        ;
-      average[i].Nextend         = Nextend[i]         ;
+      average[i].Ngalshape       = Ngalshape[i]         ;
       average[i].measureOffset   = measureOffset[i]   ; 
       average[i].missingOffset   = missingOffset[i]   ; 
@@ -241 +241 @@
     free (Nmeasure);
     free (Nmissing);
-    free (Nextend);
+    free (Ngalshape);
     free (measureOffset);
     free (missingOffset);
@@ -502 +502 @@
     gfits_define_bintable_column (&theader, "I", "NMEASURE",       "number of psf measurements",                          "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "I", "NMISSING",       "number of missings",                                  "", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "I", "NEXTEND",        "number of extended measurements",                     "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "I", "NGALSHAPE",      "number of galaxy shape measurements",                 "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "J", "OFF_MEASURE",    "offset to first psf measurement",                     "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "J", "OFF_MISSING",    "offset to first missing obs",                         "", 1.0, 0.0);
@@ -537 +537 @@
     short    *Nmeasure      ; ALLOCATE (Nmeasure      , short   , catalog->Naverage);
     short    *Nmissing      ; ALLOCATE (Nmissing      , short   , catalog->Naverage);
-    short    *Nextend       ; ALLOCATE (Nextend       , short   , catalog->Naverage);
+    short    *Ngalshape     ; ALLOCATE (Ngalshape     , short   , catalog->Naverage);
     int      *measureOffset ; ALLOCATE (measureOffset , int     , catalog->Naverage);
     int      *missingOffset ; ALLOCATE (missingOffset , int     , catalog->Naverage);
@@ -571 +571 @@
       Nmeasure[i]        = average[i].Nmeasure        ;
       Nmissing[i]        = average[i].Nmissing        ;
-      Nextend[i]         = average[i].Nextend         ;
+      Ngalshape[i]       = average[i].Ngalshape       ;
       measureOffset[i]   = average[i].measureOffset   ; 
       missingOffset[i]   = average[i].missingOffset   ; 
@@ -604 +604 @@
     gfits_set_bintable_column (&theader, &ftable, "NMEASURE",       Nmeasure,        catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "NMISSING",       Nmissing,        catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "NEXTEND",        Nextend,         catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "NGALSHAPE",      Ngalshape,       catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MEASURE",    measureOffset,   catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MISSING",    missingOffset,   catalog->Naverage);
@@ -635 +635 @@
     free (Nmeasure);
     free (Nmissing);
-    free (Nextend);
+    free (Ngalshape);
     free (measureOffset);
     free (missingOffset);