Changeset 34888

Timestamp:

Jan 7, 2013, 4:20:21 PM (14 years ago)

Author:

eugene

Message:

add ubercalDist to ImageSubset

Location:

branches/eam_branches/ipp-20121219/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (2 diffs)
• src/ImageSubset.c (modified) (8 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/relphot/include/relphot.h

@@ -107 +107 @@
   unsigned int tzero;
   unsigned char trate;
+  short ubercalDist;
 } ImageSubset;
 

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/ImageOps.c

@@ -96 +96 @@
     image[i].tzero         = input[i].tzero        ;
     image[i].trate         = input[i].trate        ;
+    image[i].ubercalDist   = input[i].ubercalDist  ;
   }
   LineNumber = line_number;
@@ -128 +129 @@
     subset[i].tzero         = image[i].tzero        ;
     subset[i].trate         = image[i].trate        ;
+    subset[i].ubercalDist   = image[i].ubercalDist  ;
   }
   return subset;

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/ImageSubset.c

@@ -65 +65 @@
   GET_COLUMN (tzero,   "TZERO",      int);
   GET_COLUMN (trate,   "TRATE",      short);
+  GET_COLUMN (ucdist,  "UBERCAL_DIST", short);
 
   // XXX free the fits table data here 
@@ -77 +78 @@
     image[i].tzero         = tzero[i];
     image[i].trate         = trate[i];
+    image[i].ubercalDist   = ucdist[i];
   }
   fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
@@ -87 +89 @@
   free (tzero);
   free (trate);
+  free (ucdist);
 
   *nimage = Nrow;
@@ -124 +127 @@
   gfits_define_bintable_column (&theader, "I", "TRATE", "tti rate", NULL, 1.0, 0.0);
 
+  gfits_define_bintable_column (&theader, "I", "UBERCAL_DIST", "ubercal distance", NULL, 1.0, 1.0*0x80);
+
   // generate the output array that carries the data
   gfits_create_table (&theader, &ftable);
@@ -130 +135 @@
   unsigned int *imageID, *map, *flags, *tzero;
   unsigned short *trate;
+  short *ucdist;
 
   // create intermediate storage arrays
@@ -139 +145 @@
   ALLOCATE (tzero,   unsigned int,   Nimage);
   ALLOCATE (trate,   unsigned short, Nimage);
+  ALLOCATE (ucdist,  short,          Nimage);
 
   // assign the storage arrays
@@ -149 +156 @@
     tzero[i]   = image[i].tzero;
     trate[i]   = image[i].trate;
+    ucdist[i]  = image[i].ubercalDist;
   }
 
   // add the columns to the output array
-  gfits_set_bintable_column (&theader, &ftable, "MCAL",       Mcal,    Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",   dMcal,   Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "IMAGE_ID",   imageID, Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "PHOTOM_MAP", map,     Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "FLAGS",      flags,   Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "TZERO",      tzero,   Nimage);
-  gfits_set_bintable_column (&theader, &ftable, "TRATE",      trate,   Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "MCAL",         Mcal,    Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",     dMcal,   Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "IMAGE_ID",     imageID, Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "PHOTOM_MAP",   map,     Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "FLAGS",        flags,   Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "TZERO",        tzero,   Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "TRATE",        trate,   Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "UBERCAL_DIST", ucdist,  Nimage);
 
   free (Mcal);
@@ -167 +176 @@
   free (tzero);
   free (trate);
+  free (ucdist);
 
   FILE *f = fopen (filename, "w");