Changeset 28717

Timestamp:

Jul 27, 2010, 10:26:06 AM (16 years ago)

Author:

bills

Message:

change format of input file to setphot include the error in the zero point. set dMcal to these values

Location:

trunk/Ohana/src/uniphot

Files:

• include/uniphot.h (modified) (1 diff)
• src/load_zpt_table.c (modified) (2 diffs)
• src/match_zpts_to_images.c (modified) (1 diff)
• src/update_catalog_setphot.c (modified) (2 diffs)

trunk/Ohana/src/uniphot/include/uniphot.h

@@ -41 +41 @@
 typedef struct {
     float zpt;
+    float zpt_err;
     e_time time;
     int found;

trunk/Ohana/src/uniphot/src/load_zpt_table.c

@@ -5 +5 @@
   int Nzpts, NZPTS;
   ZptTable *zpts;
-  double zpt, mjd;
+  double zpt, mjd, zpt_err;
 
   FILE *f;
@@ -19 +19 @@
   ALLOCATE (zpts, ZptTable, NZPTS);
 
-  // format is fixed: (time) (zpt)
+  // format is fixed: (time) (zpt) (zpt_err)
   int status;
-  while ((status = fscanf (f, "%lf %lf", &mjd, &zpt)) == 2) {
+  while ((status = fscanf (f, "%lf %lf %lf", &mjd, &zpt, &zpt_err)) == 3) {
     zpts[Nzpts].zpt = zpt;
+    zpts[Nzpts].zpt_err = zpt_err;
     zpts[Nzpts].time = ohana_mjd_to_sec (mjd);
     zpts[Nzpts].found = FALSE;

trunk/Ohana/src/uniphot/src/match_zpts_to_images.c

@@ -70 +70 @@
     // we have a match: set zpt and record the match
     image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt;
+    image[Ni].dMcal = zpts[Nz].zpt_err;
     image[Ni].flags &= ~ID_IMAGE_NOCAL; // clear the NOCAL flag
     zpts[Nz].found = TRUE;

trunk/Ohana/src/uniphot/src/update_catalog_setphot.c

@@ -74 +74 @@
 
   off_t i, j, m, id, idx, found;
-  float Mcal;
+  float Mcal, dMcal;
 
   found = 0;    
@@ -86 +86 @@
       id = index[idx];
       Mcal = image[id].Mcal;
+      dMcal = image[id].dMcal;
 
-      catalog[0].measure[m].Mcal = image[id].Mcal;
+      catalog[0].measure[m].Mcal = Mcal;
+      catalog[0].measure[m].dMcal = dMcal;
       found ++;
     }