Changeset 39262 for trunk/Ohana/src/relastro/src/BrightCatalog.c

Timestamp:

Dec 12, 2015, 8:38:47 PM (11 years ago)

Author:

eugene

Message:

updates for Mflat

File:

• trunk/Ohana/src/relastro/src/BrightCatalog.c (modified) (9 diffs)

trunk/Ohana/src/relastro/src/BrightCatalog.c

@@ -67 +67 @@
     GET_COLUMN(R,         "RA",         double);
     GET_COLUMN(D,         "DEC",        double);
-    GET_COLUMN(RoffGAL,   "ROFF_GAL",   float);
-    GET_COLUMN(DoffGAL,   "DOFF_GAL",   float);
     GET_COLUMN(M,         "MAG_SYS",    float);
     GET_COLUMN(Mcal,      "MAG_CAL",    float);
@@ -94 +92 @@
       measure[i].R         = R[i];
       measure[i].D         = D[i];
-      measure[i].RoffGAL   = RoffGAL[i];
-      measure[i].DoffGAL   = DoffGAL[i];
       measure[i].M         = M[i];
       measure[i].Mcal      = Mcal[i];
@@ -121 +117 @@
     free (R       );
     free (D       );
-    free (RoffGAL );
-    free (DoffGAL );
     free (M       );
     free (Mcal    );
@@ -362 +356 @@
     gfits_define_bintable_column (&theader, "D", "RA",       "ra",                         "degrees", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "D", "DEC",      "dec",                        "degrees", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "ROFF_GAL", "ra offset",                  "arcsec", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "DOFF_GAL", "dec offset",                 "arcsec", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "MAG_SYS",  "magnitude (sys)",             NULL,    1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "MAG_CAL",  "magnitude (cal)",             NULL,    1.0, 0.0);
@@ -382 +374 @@
 
     // generate the output array that carries the data
-    ohana_memcheck (1);
     gfits_create_table (&theader, &ftable);
-    ohana_memcheck (1);
 
     // create intermediate storage arrays
     double *R         ; ALLOCATE (R        ,  double, catalog->Nmeasure);
     double *D         ; ALLOCATE (D        ,  double, catalog->Nmeasure);
-    float  *RoffGAL   ; ALLOCATE (RoffGAL  ,  float,  catalog->Nmeasure);
-    float  *DoffGAL   ; ALLOCATE (DoffGAL  ,  float,  catalog->Nmeasure);
     float  *M         ; ALLOCATE (M        ,  float,  catalog->Nmeasure);
     float  *Mcal      ; ALLOCATE (Mcal     ,  float,  catalog->Nmeasure);
@@ -407 +395 @@
     int    *catID     ; ALLOCATE (catID    ,  int  ,  catalog->Nmeasure);
     short  *photcode  ; ALLOCATE (photcode ,  short,  catalog->Nmeasure);
-    ohana_memcheck (1);
 
     // assign the storage arrays
@@ -414 +401 @@
       R[i]        = measure[i].R        ;
       D[i]        = measure[i].D        ;
-      RoffGAL[i]  = measure[i].RoffGAL  ;
-      DoffGAL[i]  = measure[i].DoffGAL  ;
       M[i]        = measure[i].M        ;
       Mcal[i]     = measure[i].Mcal     ;
@@ -433 +418 @@
       photcode[i] = measure[i].photcode ;
     }
-    ohana_memcheck (1);
 
     // add the columns to the output array
     gfits_set_bintable_column (&theader, &ftable, "RA",         R,         catalog->Nmeasure);
-    ohana_memcheck (1);
     gfits_set_bintable_column (&theader, &ftable, "DEC",        D,         catalog->Nmeasure);
-    ohana_memcheck (1);
-    gfits_set_bintable_column (&theader, &ftable, "ROFF_GAL",   RoffGAL,   catalog->Nmeasure);
-    gfits_set_bintable_column (&theader, &ftable, "DOFF_GAL",   DoffGAL,   catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_SYS",    M,         catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_CAL",    Mcal,      catalog->Nmeasure);
@@ -461 +441 @@
     free (R       );
     free (D       );
-    free (RoffGAL );
-    free (DoffGAL );
     free (M       );
     free (Mcal    );