Changeset 30631 for branches/czw_branch/20101203/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/photometry.c (modified) (3 diffs)

branches/czw_branch/20101203/Ohana/src/opihi/dvo/photometry.c

@@ -778 +778 @@
   } else {
     
-    if (0.01 * measure[0].FWx < 3.0) return (FALSE);
-    if (0.01 * measure[0].FWx > 10.0) return (FALSE);
+    if (FromShortPixels(measure[0].FWx < 3.0)) return (FALSE);
+    if (FromShortPixels(measure[0].FWx > 10.0)) return (FALSE);
 
     return (TRUE);
@@ -810 +810 @@
     Nm = 0;
     for (i = 0; i < average[0].Nmeasure; i++) {
-      fwhm = measure[i].FWx / 100.0;
+      fwhm = FromShortPixels(measure[i].FWx);
       switch (FWHMsign) {
         case 0:
@@ -1166 +1166 @@
       break;
     case MEAS_FWHM: /* OK */
-      value = 0.01*measure[0].FWx;
+      value = FromShortPixels(measure[0].FWx);
       break;
     case MEAS_DB_FLAGS: /* ? */