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

Timestamp:

Aug 24, 2005, 8:51:56 AM (21 years ago)

Author:

eugene

Message:

adding internal vs external formats for average, measure, secfilt

File:

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

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

@@ -22 +22 @@
     if (TimeSelect && (M.t < tzero)) continue; \
     if (TimeSelect && (M.t > tend)) continue; \
-    if (ErrSelect  && (M.dM > ErrValue)) continue; \
+    if (ErrSelect  && (M.dM_PS > ErrValue)) continue; \
     if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
     if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
@@ -432 +432 @@
   if ((N = get_argument (*argc, argv, "-errorlim"))) {
     remove_argument (N, argc, argv);
-    ErrValue = 1000*atof (argv[N]);
+    ErrValue = atof (argv[N]);
     remove_argument (N, argc, argv);
     ErrSelect = TRUE;
@@ -622 +622 @@
       for (i = 0; i < average[0].Nm; i++) {
         if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].source))) continue;
-        if (ErrSelect && (measure[i].dM > ErrValue)) continue;
+        if (ErrSelect && (measure[i].dM_PS > ErrValue)) continue;
         if (FlagSelect && (measure[i].flags != FlagValue)) continue;
         if (TypeSelect && (TypeValue != GetMeasureTypeCode (&measure[i]))) continue;
@@ -789 +789 @@
   /* for ErrSelect, check average errors */
   if (ErrSelect) {
-    dM = iPhotdM (code, average, secfilt);
+    dM = PhotdM (code, average, secfilt);
     if (dM > ErrValue) return (NO_MAG);
   }
@@ -847 +847 @@
    average[].M is stored as 1000*mag where mag is PhotAbs
    measure[].M for PHOT_REL is the same 
+   XXX EAM : note that we are transitioning away from millimag internal storage 
 */ 
 
@@ -1063 +1064 @@
       break;
     case MEAS_dMAG: /* OK */
-      value = 0.001*measure[0].dM;
+      value = measure[0].dM_PS;
       break;
     case MEAS_AIRMASS: /* OK */
-      value = 0.001*measure[0].airmass;
+      value = measure[0].airmass_PS;
       break;
     case MEAS_EXPTIME: /* OK */
-      value = pow (10.0, measure[0].dt * 0.0004);
+      value = pow (10.0, measure[0].dt_PS * 0.4);
       break;
     case MEAS_PHOTCODE: /* OK */