Changeset 40244 for branches/eam_branches/ohana.20170822/src/checkastro/src/BrightCatalog.c

Timestamp:

Dec 5, 2017, 6:04:35 AM (9 years ago)

Author:

eugene

Message:

split measure->Mcal into McalPSF and McalAPER

File:

• branches/eam_branches/ohana.20170822/src/checkastro/src/BrightCatalog.c (modified) (7 diffs)

branches/eam_branches/ohana.20170822/src/checkastro/src/BrightCatalog.c

@@ -71 +71 @@
     GET_COLUMN(dD,        "DEC_OFF",    float);
     GET_COLUMN(M,         "MAG_SYS",    float);
-    GET_COLUMN(Mcal,      "MAG_CAL",    float);
+    GET_COLUMN(McalPSF,   "MCAL_PSF",   float);
+    GET_COLUMN(McalAPER,  "MCAL_APER",  float);
     GET_COLUMN(dM,        "MAG_ERR",    float);
     GET_COLUMN(airmass,   "AIRMASS",    float);
@@ -95 +96 @@
       measure[i].dD        = dD[i];
       measure[i].M         = M[i];
-      measure[i].Mcal      = Mcal[i];
+      measure[i].McalPSF   = McalPSF[i];
+      measure[i].McalAPER  = McalAPER[i];
       measure[i].dM        = dM[i];
       measure[i].airmass   = airmass[i];
@@ -116 +118 @@
     free (dD      );
     free (M       );
-    free (Mcal    );
+    free (McalPSF );
+    free (McalAPER);
     free (dM      );
     free (airmass );
@@ -366 +369 @@
     float *dD        ; ALLOCATE (dD       ,  float, catalog->Nmeasure);
     float *M         ; ALLOCATE (M        ,  float, catalog->Nmeasure);
-    float *Mcal      ; ALLOCATE (Mcal     ,  float, catalog->Nmeasure);
+    float *McalPSF   ; ALLOCATE (McalPSF  ,  float, catalog->Nmeasure);
+    float *McalAPER  ; ALLOCATE (McalAPER ,  float, catalog->Nmeasure);
     float *dM        ; ALLOCATE (dM       ,  float, catalog->Nmeasure);
     float *airmass   ; ALLOCATE (airmass  ,  float, catalog->Nmeasure);
@@ -388 +392 @@
       dD[i]       = measure[i].dD       ;
       M[i]        = measure[i].M        ;
-      Mcal[i]     = measure[i].Mcal     ;
+      McalPSF[i]  = measure[i].McalPSF  ;
+      McalAPER[i] = measure[i].McalAPER ;
       dM[i]       = measure[i].dM       ;
       airmass[i]  = measure[i].airmass  ;
@@ -409 +414 @@
     gfits_set_bintable_column (&theader, &ftable, "DEC_OFF",    dD,        catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_SYS",    M,         catalog->Nmeasure);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_CAL",    Mcal,      catalog->Nmeasure);
+    gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",   McalPSF,   catalog->Nmeasure);
+    gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",  McalAPER,  catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",    dM,        catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "AIRMASS",    airmass,   catalog->Nmeasure);
@@ -428 +434 @@
     free (dD      );
     free (M       );
-    free (Mcal    );
+    free (McalPSF );
+    free (McalAPER);
     free (dM      );
     free (airmass );