Changeset 6683 for trunk/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Mar 26, 2006, 10:46:32 AM (20 years ago)

Author:

eugene

Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

File:

• trunk/Ohana/src/opihi/dvo/photometry.c (modified) (8 diffs)

trunk/Ohana/src/opihi/dvo/photometry.c

@@ -225 +225 @@
 
   param = AVE_ZERO;
-  if (!strcasecmp (parname, "ra"))    param = AVE_RA;
-  if (!strcasecmp (parname, "dec"))   param = AVE_DEC;
+  if (!strcasecmp (parname, "RA"))    param = AVE_RA;
+  if (!strcasecmp (parname, "DEC"))   param = AVE_DEC;
+
+  if (!strcasecmp (parname, "dRA"))   param = AVE_RA_ERR;
+  if (!strcasecmp (parname, "dDEC"))  param = AVE_DEC_ERR;
+
+  if (!strcasecmp (parname, "uRA"))   param = AVE_U_RA;
+  if (!strcasecmp (parname, "uDEC"))  param = AVE_U_DEC;
+  if (!strcasecmp (parname, "duRA"))  param = AVE_U_RA_ERR;
+  if (!strcasecmp (parname, "duDEC")) param = AVE_U_DEC_ERR;
+
+  if (!strcasecmp (parname, "par"))   param = AVE_PAR;
+  if (!strcasecmp (parname, "dpar"))  param = AVE_PAR_ERR;
+
   if (!strcasecmp (parname, "dmag"))  param = AVE_dMAG;
   if (!strcasecmp (parname, "mag"))   param = AVE_MAG;
@@ -564 +576 @@
   switch (param) {
     case AVE_RA:
-      value = average[0].R_PS;
+      value = average[0].R;
       break;
     case AVE_DEC:
-      value = average[0].D_PS;
-      break;
+      value = average[0].D;
+      break;
+    case AVE_RA_ERR:
+      value = average[0].dR;
+      break;
+    case AVE_DEC_ERR:
+      value = average[0].dD;
+      break;
+
+    case AVE_U_RA:
+      value = average[0].uR;
+      break;
+    case AVE_U_DEC:
+      value = average[0].uD;
+      break;
+    case AVE_U_RA_ERR:
+      value = average[0].duR;
+      break;
+    case AVE_U_DEC_ERR:
+      value = average[0].duD;
+      break;
+
+    case AVE_PAR:
+      value = average[0].P;
+      break;
+    case AVE_PAR_ERR:
+      value = average[0].dP;
+      break;
+
+
     case AVE_NMEAS:
       value = average[0].Nm;
@@ -924 +964 @@
   }
 
- skip: 
+skip: 
   if (M1 != NULL) free (M1);
   if (M2 != NULL) free (M2);
@@ -1058 +1098 @@
       break;
     case MEAS_RA: /* OK */
-      value = average[0].R_PS - measure[0].dR_PS / 3600.0;
+      value = average[0].R - measure[0].dR_PS / 3600.0;
       break;
     case MEAS_DEC: /* OK */
-      value = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      value = average[0].D - measure[0].dD_PS / 3600.0;
       break;
     case MEAS_dMAG: /* OK */
@@ -1094 +1134 @@
       break;
     case MEAS_XCCD: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1102 +1142 @@
       break;
     case MEAS_YCCD: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       image = MatchImage (measure[0].t, measure[0].source);
       if (image == NULL) break;
@@ -1110 +1150 @@
       break;
     case MEAS_XMOSAIC: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;
@@ -1118 +1158 @@
       break;
     case MEAS_YMOSAIC: /* OK */
-      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
-      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = average[0].R - measure[0].dR_PS / 3600.0;
+      dec = average[0].D - measure[0].dD_PS / 3600.0;
       mosaic = MatchMosaic (measure[0].t, measure[0].source);
       if (mosaic == NULL) break;