Changeset 37954

Timestamp:

Mar 5, 2015, 2:03:33 PM (11 years ago)

Author:

eugene

Message:

adding X,Yoff_CAM

Location:

branches/eam_branches/ipp-20150112/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (1 diff)
• src/dbExtractMeasures.c (modified) (1 diff)
• src/dbFields.c (modified) (1 diff)
• src/dvo_convert_PS1_V5.c (modified) (1 diff)

branches/eam_branches/ipp-20150112/Ohana/src/libdvo/include/dvodb.h

@@ -177 +177 @@
       MEAS_XOFF_DCR, 
       MEAS_YOFF_DCR, 
+      MEAS_XOFF_CAM, 
+      MEAS_YOFF_CAM, 
       MEAS_ROFF_GAL, 
       MEAS_DOFF_GAL, 

branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -570 +570 @@
     case MEAS_XOFF_DCR: { value.Flt = measure[0].XoffDCR; break; }
     case MEAS_YOFF_DCR: { value.Flt = measure[0].YoffDCR; break; }
+    case MEAS_XOFF_CAM: { value.Flt = measure[0].XoffCAM; break; }
+    case MEAS_YOFF_CAM: { value.Flt = measure[0].YoffCAM; break; }
     case MEAS_ROFF_GAL: { value.Flt = measure[0].RoffGAL; break; }
     case MEAS_DOFF_GAL: { value.Flt = measure[0].DoffGAL; break; }

branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dbFields.c

@@ -478 +478 @@
   if (!strcasecmp (fieldName, "XOFF_DCR"))       ESCAPE (MEAS_XOFF_DCR,       OPIHI_FLT);
   if (!strcasecmp (fieldName, "YOFF_DCR"))       ESCAPE (MEAS_YOFF_DCR,       OPIHI_FLT);
+  if (!strcasecmp (fieldName, "XOFF_CAM"))       ESCAPE (MEAS_XOFF_CAM,       OPIHI_FLT);
+  if (!strcasecmp (fieldName, "YOFF_CAM"))       ESCAPE (MEAS_YOFF_CAM,       OPIHI_FLT);
   if (!strcasecmp (fieldName, "ROFF_GAL"))       ESCAPE (MEAS_ROFF_GAL,       OPIHI_FLT);
   if (!strcasecmp (fieldName, "DOFF_GAL"))       ESCAPE (MEAS_DOFF_GAL,       OPIHI_FLT);

branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -114 +114 @@
     out[i].XoffDCR    = in[i].XoffDCR;
     out[i].YoffDCR    = in[i].YoffDCR;
+    out[i].XoffCAM    = in[i].XoffCAM;
+    out[i].YoffCAM    = in[i].YoffCAM;
     out[i].RoffGAL    = in[i].RoffGAL;
     out[i].DoffGAL    = in[i].DoffGAL;