Changeset 35416 for trunk/Ohana/src/libdvo/src/ImageMetadata.c

Timestamp:

Apr 19, 2013, 4:31:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130307 : parallelize dvosecfilt, use dvo_average,measure,secfilt_init functions more broadly; move image calibration to relphot_images; add synthetic photometry referece (w-band); put relphot MARKTIME & INITTIME in macros; in dvo_clients, mextract fields which need image data use a subset image metadata table (instead of loading full Images.dat table); create FIELD and MOSAIC fields for mextract; somewhat better rules for photcode:ave & similar selections in mextract; add hpm_* concept in relastro (high-speed proper motions); fix precision errors in dvopsps; check for dvopsps exit conditions; error-bar clipping to limits of plotting window; parallelize delstar -dup-images; do NOT delete parents (because parent IDs are broken after dvomerge); minor handshake when setting up KAPA connection; avextract and related do not need to launch remote jobs on all clients if region does not include tables from all hosts; add fitplx and xsection functions to mana; enable addstar of diff cmfs (at least PS1_DV3)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/ImageMetadata.c (modified) (10 diffs)

trunk/Ohana/src/libdvo/src/ImageMetadata.c

@@ -63 +63 @@
   GET_COLUMN (crval1,   "CRVAL1",         double);
   GET_COLUMN (crval2,   "CRVAL2",         double);
+  GET_COLUMN (theta,    "THETA",          float);
   GET_COLUMN (Mcal,     "MCAL",           float);
   GET_COLUMN (secz,     "SECZ",           float);
@@ -75 +76 @@
     image[i].crval1   = crval1[i]  ;
     image[i].crval2   = crval2[i]  ;
+    image[i].theta    = theta[i]  ;
     image[i].Mcal     = Mcal[i]    ;
     image[i].secz     = secz[i]    ;
@@ -87 +89 @@
   free (crval1);
   free (crval2);
+  free (theta);
   free (Mcal);
   free (secz);
@@ -112 +115 @@
   FTable ftable;
 
+  BuildChipMatch (image, Nimage);
+
   gfits_init_header (&header);
   header.extend = TRUE;
@@ -124 +129 @@
   gfits_define_bintable_column (&theader, "D", "CRVAL1", "ra at center", "degrees", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "D", "CRVAL2", "dec at center", "degrees", 1.0, 0.0);
+  gfits_define_bintable_column (&theader, "E", "THETA", "camera rot angle", "degrees", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "E", "MCAL", "zero point offset", "magnitudes", 1.0, 0.0);
   gfits_define_bintable_column (&theader, "E", "SECZ", "airmass", "none", 1.0, 0.0);
@@ -134 +140 @@
   unsigned int *imageID, *externID, *expname;
   double *crval1, *crval2;
-  float *Mcal, *Xcenter, *Ycenter, *secz;
+  float *Mcal, *Xcenter, *Ycenter, *secz, *theta;
 
   // create intermediate storage arrays
@@ -142 +148 @@
   ALLOCATE (crval1,   double,         Nimage);
   ALLOCATE (crval2,   double,         Nimage);
+  ALLOCATE (theta,    float,          Nimage);
   ALLOCATE (Mcal,     float,          Nimage);
   ALLOCATE (secz,     float,          Nimage);
@@ -149 +156 @@
   // assign the storage arrays
   for (i = 0; i < Nimage; i++) {
+    int Nmosaic = FindMosaicForImage (image, Nimage, i);
+    if (!Nmosaic) continue;
+    Nmosaic --;
     imageID[i]  = image[i].imageID;
     externID[i] = image[i].externID;
-    crval1[i]   = image[i].coords.crval1;
-    crval2[i]   = image[i].coords.crval2;
+    crval1[i]   = image[Nmosaic].coords.crval1;
+    crval2[i]   = image[Nmosaic].coords.crval2;
+
+    theta[i]    = DEG_RAD*atan2(image[Nmosaic].coords.pc1_2, image[Nmosaic].coords.pc1_1);
+
     Mcal[i]     = image[i].Mcal;
     secz[i]     = image[i].secz;
@@ -172 +185 @@
   gfits_set_bintable_column (&theader, &ftable, "CRVAL1",         crval1,  Nimage);
   gfits_set_bintable_column (&theader, &ftable, "CRVAL2",         crval2,  Nimage);
+  gfits_set_bintable_column (&theader, &ftable, "THETA",          theta,   Nimage);
   gfits_set_bintable_column (&theader, &ftable, "MCAL",           Mcal,    Nimage);
   gfits_set_bintable_column (&theader, &ftable, "SECZ",           secz,    Nimage);
@@ -182 +196 @@
   free (crval1);
   free (crval2);
+  free (theta);
   free (Mcal);
   free (secz);