Changeset 39262 for trunk/Ohana/src/relphot

Timestamp:

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

Author:

eugene

Message:

updates for Mflat

Location:

trunk/Ohana/src/relphot/src

Files:

• BrightCatalog.c (modified) (8 diffs)
• setMrelCatalog.c (modified) (4 diffs)

trunk/Ohana/src/relphot/src/BrightCatalog.c

@@ -67 +67 @@
     GET_COLUMN(M,         "MAG_SYS",    float);
     GET_COLUMN(Mcal,      "MAG_CAL",    float);
+    GET_COLUMN(Mflat,     "MAG_FLAT",   float);
     GET_COLUMN(dM,        "MAG_ERR",    float);
     GET_COLUMN(airmass,   "AIRMASS",    float);
@@ -89 +90 @@
       measure[i].M         = M[i];
       measure[i].Mcal      = Mcal[i];
+      measure[i].Mflat     = Mflat[i];
       measure[i].dM        = dM[i];
       measure[i].airmass   = airmass[i];
@@ -109 +111 @@
     free (M       );
     free (Mcal    );
+    free (Mflat   );
     free (dM      );
     free (airmass );
@@ -269 +272 @@
     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);
+    gfits_define_bintable_column (&theader, "E", "MAG_FLAT", "magnitude (flat)",            NULL,    1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "MAG_ERR",  "magnitude (err)",             NULL,    1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "AIRMASS",  "airmass",                     NULL,    1.0, 0.0);
@@ -290 +294 @@
     float  *M         ; ALLOCATE (M        ,  float,  catalog->Nmeasure);
     float  *Mcal      ; ALLOCATE (Mcal     ,  float,  catalog->Nmeasure);
+    float  *Mflat     ; ALLOCATE (Mflat    ,  float,  catalog->Nmeasure);
     float  *dM        ; ALLOCATE (dM       ,  float,  catalog->Nmeasure);
     float  *airmass   ; ALLOCATE (airmass  ,  float,  catalog->Nmeasure);
@@ -310 +315 @@
       M[i]        = measure[i].M        ;
       Mcal[i]     = measure[i].Mcal     ;
+      Mflat[i]    = measure[i].Mflat    ;
       dM[i]       = measure[i].dM       ;
       airmass[i]  = measure[i].airmass  ;
@@ -329 +335 @@
     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, "MAG_FLAT",   Mflat,     catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",    dM,        catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "AIRMASS",    airmass,   catalog->Nmeasure);
@@ -346 +353 @@
     free (M       );
     free (Mcal    );
+    free (Mflat   );
     free (dM      );
     free (airmass );

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -1 +1 @@
 # include "relphot.h"
+
+/*
+# define TEST_OBJ_ID 0x3ae2
+# define TEST_CAT_ID 0x16c5f
+*/
+# define TEST_OBJ_ID 0
+# define TEST_CAT_ID 0
+
 int markMeasureByRanking (StatDataSet *dataset, Measure *measure, int minrank, DVOMeasureFlags flags);
 
@@ -113 +121 @@
 
   // option for a test print
-  if (FALSE && (averageT[0].objID == 0x7146) && (averageT[0].catID == 0x49d8)) {
+  if ((averageT[0].objID == TEST_OBJ_ID) && (averageT[0].catID == TEST_CAT_ID)) {
     fprintf (stderr, "test obj\n");
     print_measure_set_alt (average, secfilt, measure);
@@ -353 +361 @@
 
     if (isSetMrelFinal) {
-      if (FALSE && (average->objID == 0x1) && (average->catID)) {
+      if ((average[0].objID == TEST_OBJ_ID) && (average[0].catID == TEST_CAT_ID)) {
         fprintf (stderr, "test obj\n");
       }
@@ -723 +731 @@
 
   // option for a test print
-  if (FALSE && (average[0].objID == 0x0000049c) && (average[0].catID == 0x00016c5e)) {
+  if ((average[0].objID == TEST_OBJ_ID) && (average[0].catID == TEST_CAT_ID)) {
     fprintf (stderr, "test obj\n");
     print_measure_set_alt (average, secfilt, measure);