Changeset 34735 for branches/eam_branches/ipp-20120905/ippToPsps/src/Dvo.c

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/src/Dvo.c (modified) (1 diff)

branches/eam_branches/ipp-20120905/ippToPsps/src/Dvo.c

@@ -90 +90 @@
             }
             else {
+                Average *ave  = &dvoDetections[i].ave;
+                Measure *meas = &dvoDetections[i].meas;
+                PhotCode *code = GetPhotcodebyCode(meas->photcode);
                 sprintf(sql, 
-                        "INSERT INTO dvoDetection (imageID, ippDetectID, detectID, ippObjID, objID, flags) VALUES (%d, %u, %lu, %lu, %lu, %u)",
+                        "INSERT INTO dvoDetection (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES (%d, %u, %lu, %lu, %lu, %u, %f, %f, %f, %f, %lf, %lf, %f %f)",
                         image->imageID,    // imageID
-                        dvoDetections[i].meas.detID,   // ippDetectID
-                        dvoDetections[i].meas.extID,   // detectID
-                        (uint64_t)dvoDetections[i].ave.catID*1000000000 + (uint64_t)dvoDetections[i].ave.objID, // ippObjID
-                        dvoDetections[i].ave.extID, // objID
-                        dvoDetections[i].meas.dbFlags); // flags
+                        meas->detID,   // ippDetectID
+                        meas->extID,   // detectID
+                        (uint64_t)ave->catID*1000000000 + (uint64_t)ave->objID, // ippObjID
+                        dvoDetections[i].ave.extID,   // objID
+                        meas->dbFlags,                // flags
+                        code->C * 0.001 + code->K * (meas->airmass - 1) - meas->Mcal,   // zp
+                        meas->dMcal,                  // zpErr
+                        meas->airmass,
+                        pow(10.0, 0.4 * meas->dt),    // expTime
+                        ave->R - meas->dR / 3600.,    // ra
+                        ave->D - meas->dR / 3600.,    // dec
+                        meas->dXccd * meas->pltscale, // estimate of raErr
+                        meas->dYccd * meas->pltscale  // estimate of decErr
+                        );
 
                 mysql_query(this->mysql, sql);