Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvopsps/include/dvopsps.h

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvopsps/include/dvopsps.h (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvopsps/include/dvopsps.h

@@ -9 +9 @@
 
 typedef struct {
-  int imageID;
-  unsigned int ippDetectID;
+  uint64_t objID;
   uint64_t detectID;
   uint64_t ippObjID;
-  uint64_t objID;
-  int      photcode;
-  unsigned int flags;
-  float zp;
-  float zpErr;
-  float airMass;
-  float expTime;
+  unsigned int ippDetectID;
+  int imageID;
+  int catID;
   double ra;
   double dec;
   float raErr;
   float decErr;
+  float zp;
+  float telluricExt;
+  float airmass;
+  float expTime;
+
+  float Mpsf;
+  float dMpsf;
+  float Mkron;
+  float dMkron;
+  float Map;
+  float dMap;
+
+  unsigned int flags;
 } Detections;
 
@@ -78 +86 @@
       
 int    insert_detections_mysql_commit     PROTO((IOBuffer *buffer, MYSQL *mysql));
-int    insert_detections_mysql_value      PROTO((IOBuffer *buffer, Average *average, Measure *measure));
+// int    insert_detections_mysql_value      PROTO((IOBuffer *buffer, Average *average, Measure *measure));
 int    insert_detections_mysql_init       PROTO((IOBuffer *buffer));
 
 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    init_detections                    PROTO(());