Changeset 40477 for branches/czw_branch/20170908/Ohana/src/libdvo/src/dbExtractMeasures.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/dbExtractMeasures.c (modified) (3 diffs)

branches/czw_branch/20170908/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -316 +316 @@
         case MAG_OPTION_GAL_FLAGS:      
         case MAG_OPTION_GAL_TYPE:      
+        case MAG_OPTION_GAL_OBJ_ID:
+        case MAG_OPTION_GAL_CAT_ID:
+        case MAG_OPTION_GAL_DET_ID:
+        case MAG_OPTION_GAL_IMAGE_ID:
 
         case MAG_OPTION_NONE:
@@ -696 +700 @@
       break;
     case MEAS_PSF_QF_PERFECT: /* OK */
-      value.Flt = NAN;
+      value.Flt = measure[0].psfQFperf;
       break;
     case MEAS_PSF_CHISQ: /* OK */
@@ -740 +744 @@
       break;
 
-    case MEAS_MCAL_OFFSET: { value.Flt = measure[0].Mcal; break; }
+    case MEAS_MCAL_OFFSET_PSF:  { value.Flt = measure[0].McalPSF;  break; }
+    case MEAS_MCAL_OFFSET_APER: { value.Flt = measure[0].McalAPER; break; }
     case MEAS_FLAT: { value.Flt = measure[0].Mflat; break; }