Changeset 37807 for trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

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

trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -85 +85 @@
 
 /* return measure.field based on the selection */
-dbValue dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
+dbValue dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, Lensing *lensing, StarPar *starpar, dbField *field) {
 
   int Nsec;
@@ -249 +249 @@
         case MAG_OPTION_UC_DIST:
         case MAG_OPTION_FLAGS:
+        case MAG_OPTION_X11_SM_OBJ: 
+        case MAG_OPTION_X12_SM_OBJ: 
+        case MAG_OPTION_X22_SM_OBJ: 
+        case MAG_OPTION_E1_SM_OBJ: 
+        case MAG_OPTION_E2_SM_OBJ: 
+        case MAG_OPTION_X11_SH_OBJ: 
+        case MAG_OPTION_X12_SH_OBJ: 
+        case MAG_OPTION_X22_SH_OBJ: 
+        case MAG_OPTION_E1_SH_OBJ: 
+        case MAG_OPTION_E2_SH_OBJ: 
+        case MAG_OPTION_X11_SM_PSF: 
+        case MAG_OPTION_X12_SM_PSF: 
+        case MAG_OPTION_X22_SM_PSF: 
+        case MAG_OPTION_E1_SM_PSF: 
+        case MAG_OPTION_E2_SM_PSF: 
+        case MAG_OPTION_X11_SH_PSF: 
+        case MAG_OPTION_X12_SH_PSF: 
+        case MAG_OPTION_X22_SH_PSF: 
+        case MAG_OPTION_E1_SH_PSF: 
+        case MAG_OPTION_E2_SH_PSF: 
+        case MAG_OPTION_F_AP_R5: 
+        case MAG_OPTION_F_ERR_AP_R5: 
+        case MAG_OPTION_F_STDEV_AP_R5: 
+        case MAG_OPTION_F_FILL_AP_R5: 
+        case MAG_OPTION_F_AP_R6: 
+        case MAG_OPTION_F_ERR_AP_R6: 
+        case MAG_OPTION_F_STDEV_AP_R6: 
+        case MAG_OPTION_F_FILL_AP_R6: 
+
         case MAG_OPTION_NONE:
           break;
@@ -474 +503 @@
       break;
 
-    case MEAS_REF_COLOR:
+    case MEAS_REF_COLOR_BLUE:
       value.Flt = average[0].refColorBlue;
+      break;
+    case MEAS_REF_COLOR_RED:
+      value.Flt = average[0].refColorRed;
       break;
 
@@ -528 +560 @@
 # endif
       break;
-    case MEAS_XFIX: /* OK */
-      value.Flt = measure[0].Xfix;
-      break;
-    case MEAS_YFIX: /* OK */
-      value.Flt = measure[0].Yfix;
-      break;
-    case MEAS_XCCD_ERR: /* OK */
-      value.Flt = FromShortPixels(measure[0].dXccd);
-      break;
-    case MEAS_YCCD_ERR: /* OK */
-      value.Flt = FromShortPixels(measure[0].dYccd);
-      break;
-    case MEAS_POS_SYS_ERR: /* OK */
-      value.Flt = FromShortPixels(measure[0].dRsys);
-      break;
+    case MEAS_XFIX: { value.Flt = measure[0].Xfix; break; }
+    case MEAS_YFIX: { value.Flt = measure[0].Yfix; break; }
+    case MEAS_XCCD_ERR: { value.Flt = FromShortPixels(measure[0].dXccd); break; }
+    case MEAS_YCCD_ERR: { value.Flt = FromShortPixels(measure[0].dYccd); break; }
+    case MEAS_POS_SYS_ERR: { value.Flt = FromShortPixels(measure[0].dRsys); }
+
+    case MEAS_XOFF_KH:  { value.Flt = measure[0].XoffKH;  break; }
+    case MEAS_YOFF_KH:  { value.Flt = measure[0].YoffKH;  break; }
+    case MEAS_XOFF_DCR: { value.Flt = measure[0].XoffDCR; break; }
+    case MEAS_YOFF_DCR: { value.Flt = measure[0].YoffDCR; break; }
+    case MEAS_ROFF_GAL: { value.Flt = measure[0].RoffGAL; break; }
+    case MEAS_DOFF_GAL: { value.Flt = measure[0].DoffGAL; break; }
 
     case MEAS_XFIELD: /* offset relative to exposure center in ra,dec space */
@@ -581 +610 @@
     case MEAS_XMOSAIC: /* offset relative to exposure center in camera coords */
       if (!haveMosaicMeas) {
-        if (REMOTE_CLIENT) {
-          mosaic = MatchMosaicMetadata (measure[0].imageID);
-        } else {
-          // fprintf (stderr, "non-parallel Xmos broken\n");
-          // abort();
-          // mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
-          mosaic = MatchMosaicMetadata (measure[0].imageID);
-        }
+        mosaic = MatchMosaicMetadata (measure[0].imageID);
         if (mosaic == NULL) break;
         double Rm = measure[0].R;
@@ -598 +620 @@
     case MEAS_YMOSAIC: /* OK */
       if (!haveMosaicMeas) {
-        if (REMOTE_CLIENT) {
-          mosaic = MatchMosaicMetadata (measure[0].imageID);
-        } else {
-          // fprintf (stderr, "non-parallel Xmos broken\n");
-          // abort();
-          // mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
-          mosaic = MatchMosaicMetadata (measure[0].imageID);
-        }
+        mosaic = MatchMosaicMetadata (measure[0].imageID);
         if (mosaic == NULL) break;
         double Rm = measure[0].R;
@@ -680 +695 @@
       break;
 
-    case MEAS_MCAL_OFFSET: /* OK */
-      value.Flt = measure[0].Mcal;
-      break;
+    case MEAS_MCAL_OFFSET: { value.Flt = measure[0].Mcal; break; }
 
     case MEAS_FLAT: /* OK */
@@ -717 +730 @@
       }
       break;
+
+    case MEAS_E_BV:             { value.Flt = starpar->Ebv;      break; }
+    case MEAS_E_BV_ERR:         { value.Flt = starpar->dEbv;     break; }
+    case MEAS_DISTANCE_MOD:     { value.Flt = starpar->DistMag;  break; }
+    case MEAS_DISTANCE_MOD_ERR: { value.Flt = starpar->dDistMag; break; }
+    case MEAS_M_R:              { value.Flt = starpar->M_r;      break; }
+    case MEAS_M_R_ERR:          { value.Flt = starpar->dM_r;     break; }
+    case MEAS_FEH:              { value.Flt = starpar->FeH;      break; }
+    case MEAS_FEH_ERR:          { value.Flt = starpar->dFeH;     break; }
+    case MEAS_URA_GALMODEL:     { value.Flt = starpar->uRA;      break; }
+    case MEAS_UDEC_GALMODEL:    { value.Flt = starpar->uDEC;     break; }
+    case MEAS_RA_GALMODEL:      { value.Flt = starpar->R;        break; }
+    case MEAS_DEC_GALMODEL:     { value.Flt = starpar->D;        break; }
 
     // case MEAS_FLUX_PSF: /* OK */