Changeset 40477 for branches/czw_branch/20170908/Ohana/src/dvopsps/include/dvopsps.h

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/dvopsps/include/dvopsps.h (modified) (4 diffs)

branches/czw_branch/20170908/Ohana/src/dvopsps/include/dvopsps.h

@@ -19 +19 @@
   float raErr;
   float decErr;
-  float zp;
-  float zpFactor;
+  float zpPSF;
+  float zpFactorPSF;
+  float zpAPER;
+  float zpFactorAPER;
   float telluricExt;
   float airmass;
@@ -34 +36 @@
   unsigned int flags;
   unsigned int objflags;
+  unsigned int filtflags;
 } Detections;
 
@@ -45 +48 @@
 
 int          SAVE_REMOTE;
+int          TEST_MODE;
 
 int          PARALLEL;
@@ -96 +100 @@
 int    insert_detections_mysql_array      PROTO((MYSQL *mysql, Detections *detections, int Ndetections));
 int    insert_detections_mysql_detvalue   PROTO((IOBuffer *buffer, Detections *detection));
-int    assign_detection_values            PROTO((Detections *detection, Measure *measure, Average *average));
+int    assign_detection_values            PROTO((Detections *detection, Measure *measure, Average *average, SecFilt *secfilt));
 
 int    init_detections                    PROTO((void));