Changeset 34772 for branches/czw_branch/20120906/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvodb.h (modified) (2 diffs)

branches/czw_branch/20120906/Ohana/src/libdvo/include/dvodb.h

@@ -45 +45 @@
       MAG_80, 
       MAG_UC_DIST, 
-      MAG_STACK_ID, 
+      MAG_STACK_DET_ID, 
       MAG_FLUX_PSF,
       MAG_FLUX_PSF_ERR,
@@ -122 +122 @@
       MEAS_XCCD_ERR, 
       MEAS_YCCD_ERR, 
+      MEAS_XOFF, 
+      MEAS_YOFF, 
       MEAS_POS_SYS_ERR, 
       MEAS_XMOSAIC,