Changeset 34839 for branches/eam_branches/ipp-20121130/ippToPsps/src/Dvo.c

Timestamp:

Dec 18, 2012, 5:57:19 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/ippToPsps

Files:

• . (modified) (1 prop)
• src/Dvo.c (modified) (2 diffs)

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

@@ -21 +21 @@
     if (this->mysql) mysql_close(this->mysql);
 
-    free(this);
+    // libohana redirects free and gets confused by thigns allocated by calloc
+    // so call the real free funtion through this warpper
+    real_free(this);
 }
 
@@ -94 +96 @@
                 PhotCode *code = GetPhotcodebyCode(meas->photcode);
                 sprintf(sql, 
-                        "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)",
+                        "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
                         meas->detID,   // ippDetectID
                         meas->extID,   // detectID
                         (uint64_t)ave->catID*1000000000 + (uint64_t)ave->objID, // ippObjID
-                        dvoDetections[i].ave.extID,   // objID
-                        meas->dbFlags,                // flags
+                        ave->extID,   // objID
+                        meas->dbFlags,  // flags
                         code->C * 0.001 + code->K * (meas->airmass - 1) - meas->Mcal,   // zp
-                        meas->dMcal,                  // zpErr
+                        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
+                        meas->dXccd * 0.01 * fabs(meas->pltscale), // estimate of raErr
+                        meas->dYccd * 0.01 * fabs(meas->pltscale) // estimate of decErr
                         );