Changeset 37804 for branches/eam_branches/ipp-20140904/ppTranslate/src/ppMops.h

Timestamp:

Jan 11, 2015, 2:05:35 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140904

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMops.h (modified) (3 diffs)

branches/eam_branches/ipp-20140904/ppTranslate/src/ppMops.h

@@ -6 +6 @@
 
 #define IN_EXTNAME "SkyChip.psf"        // Extension name for data in input
-#define OBSERVATORY_CODE "F51"          // IAU Observatory Code
+// #define OBSERVATORY_CODE "F51"          // IAU Observatory Code
 #define OUT_EXTNAME "MOPS_TRANSIENT_DETECTIONS" // Extension name for data in output
 #define SOURCE_MASK (PM_SOURCE_MODE_FAIL | PM_SOURCE_MODE_BADPSF | PM_SOURCE_MODE_SATURATED | \
@@ -23 +23 @@
   psS64 warp_id;                      // Warp stage identifier
   psS64 diff_id;                      // Diff stage identifier
+  psString camera;                    // Camera name
+  psString obscode;                   // observatory code (derived from camera)
   bool positive;                      // Sense of subtraction, T=positive, F=negative
   float zp, zpErr;                    // Magnitude zero point and error
@@ -59 +61 @@
   psVector *raExtErr, *decExtErr;     // Error in sky coordinates for RA_EXT and DEC_EXT
   psVector *mask;                     // Mask for detections
-    float platescale; //Plate scale at centroid
+  float platescale;                   // Plate scale at centroid
+  psString fpashutoutc;               // FPA shutoutc 
 } ppMopsDetections;