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

Timestamp:

Jul 17, 2014, 10:21:10 AM (12 years ago)

Author:

eugene

Message:

various changes due to mods to average.d and measure.d; new parsing concept for photocode-related fields

File:

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

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

@@ -41 +41 @@
   }
 
+# if (0)
 /* selection criteria */
 /* selections based on Measure quantities */
@@ -78 +79 @@
 static time_t TimeReference;
 static int TimeFormat;
-
+# endif
+
+# if (0)
 int GetTimeSelection (time_t *tz, time_t *te) {
   *tz = tzero;
@@ -298 +301 @@
   return;
 }
-
-/* (re)load photcodes from photcode table */
-int InitPhotcodes () {
-
-  double ZERO_POINT;
-  char MasterPhotcodeFile[256];
-  char CatdirPhotcodeFile[256];
-  char *catdir;
-
-  if (VarConfig ("ZERO_PT", "%lf", &ZERO_POINT) == (char *) NULL) {
-    gprint (GP_ERR, "ZERO_PT undefined in config\n");
-    return (FALSE);
-  }
-  SetZeroPoint (ZERO_POINT);
-
-  catdir = GetCATDIR();
-  if (catdir == NULL) {
-    CatdirPhotcodeFile[0] = 0;
-  } else {
-    sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", catdir);
-  }
-
-  if (VarConfig ("PHOTCODE_FILE", "%s", MasterPhotcodeFile) == (char *) NULL) {
-    gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
-    return (FALSE);
-  }
-
-  // XXX now that DVO does not allow write access, we can drop the MasterPhotcodeFile
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, FALSE)) {
-    gprint (GP_ERR, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
-    return (FALSE);
-  }
-  return (TRUE);
-}
-
+# endif
+
+# if (0)
 int ListPhotSelections () {
 
@@ -1121 +1092 @@
   return (list);
 }
-
+# endif
+
+# if (0)
 double GetMeasure (int param, Average *average, Measure *measure, double mag) {
 
@@ -1135 +1108 @@
       break;
     case MEAS_RA: /* OK */
-      value = average[0].R - measure[0].dR / 3600.0;
+      value = measure[0].R;
       break;
     case MEAS_DEC: /* OK */
-      value = average[0].D - measure[0].dD / 3600.0;
+      value = measure[0].D;
       break;
     case MEAS_DOPHOT: /* OK */
@@ -1156 +1129 @@
       break;
     case MEAS_RA_OFFSET: /* OK */
-      value = measure[0].dR;
+      value = dvoOffsetR(measure, average);
       break;
     case MEAS_DEC_OFFSET: /* OK */
-      value = measure[0].dD;
+      value = dvoOffsetD(measure, average);
       break;
     case MEAS_FWHM: /* OK */
@@ -1172 +1145 @@
       value = measure[0].Xccd;
 # else
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
+      ra  = measure[0].R;
+      dec = measure[0].D;
       image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
@@ -1185 +1158 @@
       value = measure[0].Yccd;
 # else
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
+      ra  = measure[0].R;
+      dec = measure[0].D;
       image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
@@ -1195 +1168 @@
 # if 0
     case MEAS_XMOSAIC: /* OK */
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
+      ra  = measure[0].R;
+      dec = measure[0].D;
       mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
       if (mosaic == NULL) break;
@@ -1203 +1176 @@
       break;
     case MEAS_YMOSAIC: /* OK */
-      ra  = average[0].R - measure[0].dR / 3600.0;
-      dec = average[0].D - measure[0].dD / 3600.0;
+      ra  = measure[0].R;
+      dec = measure[0].D;
       mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
       if (mosaic == NULL) break;
@@ -1214 +1187 @@
   return (value);
 }
+# endif
 
 /** the mosaic entries do not use the registered mosaic found