Changeset 37048

Timestamp:

Jul 17, 2014, 10:20:02 AM (12 years ago)

Author:

eugene

Message:

measure.dR,dR -> measure.R,D; other minor adjustments

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_detections_dvopsps.c (modified) (3 diffs)
• insert_detections_dvopsps_catalog.c (modified) (5 diffs)
• insert_objects_dvopsps_catalog.c (modified) (5 diffs)
• insert_skytable.c (modified) (3 diffs)

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

@@ -2 +2 @@
 # define USE_MYSQL 1
 // # define SAVE_REMOTE 1
-
-# define MARKTIME(MSG,...) {                    \
-    float dtime;                                \
-    gettimeofday (&stop, (void *) NULL);        \
-    dtime = DTIME (stop, start);                \
-    fprintf (stderr, MSG, __VA_ARGS__); }
 
 // we have two ways of writing to the mysql database:
@@ -245 +239 @@
   buffer.Nalloc = 0;
 
-  struct timeval start, stop;
-
   if (Ndetections == 0) return TRUE;
 
@@ -254 +246 @@
   int Ninsert = 0;
 
-  gettimeofday (&start, (void *) NULL);
+  INITTIME;
   for (i = 0; i < Ndetections; i++) {
 

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -1 +1 @@
 # include "dvopsps.h"
 # define DEBUG 0
-
-# define MARKTIME(MSG,...) {                    \
-    float dtime;                                \
-    gettimeofday (&stop, (void *) NULL);        \
-    dtime = DTIME (stop, start);                \
-    fprintf (stderr, MSG, __VA_ARGS__); }
 
 int Ndetections = 0;
@@ -68 +62 @@
       detections[Ndetections].airMass      = measure->airmass;
       detections[Ndetections].expTime      = pow(10.0, 0.4 * measure->dt);    // expTime
-      detections[Ndetections].ra           = average->R - measure->dR / 3600.;    // ra
-      detections[Ndetections].dec          = average->D - measure->dD / 3600.;    // dec
+      detections[Ndetections].ra           = measure->R;    // ra
+      detections[Ndetections].dec          = measure->D;    // dec
       detections[Ndetections].raErr        = measure->dXccd * 0.01 * fabs(measure->pltscale); // estimate of raErr
       detections[Ndetections].decErr       = measure->dYccd * 0.01 * fabs(measure->pltscale); // estimate of decErr
@@ -107 +101 @@
   off_t i, j;
   int missingID = 0;
-  struct timeval start, stop;
 
   IOBuffer buffer;
@@ -117 +110 @@
   off_t found = 0;
 
-  gettimeofday (&start, (void *) NULL);
+  INITTIME;
   insert_detections_mysql_init (&buffer);
   int Ninsert = 0;
@@ -226 +219 @@
   float zp = code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal;
   float exptime = pow(10.0, 0.4 * measure->dt);
-  double ra  = average->R - measure->dR / 3600.0;
-  double dec = average->D - measure->dD / 3600.0;
+  double ra  = measure->R;
+  double dec = measure->D;
   double dR = measure->dXccd * 0.01 * fabs(measure->pltscale);
   double dD = measure->dYccd * 0.01 * fabs(measure->pltscale);

trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -2 +2 @@
 # define DEBUG 0
 
-# define MARKTIME(MSG,...) {                    \
-    float dtime;                                \
-    gettimeofday (&stop, (void *) NULL);        \
-    dtime = DTIME (stop, start);                \
-    fprintf (stderr, MSG, __VA_ARGS__); }
-
 int insert_objects_dvopsps_catalog (Catalog *catalog, char *basename, MYSQL *mysql) {
 
   off_t i;
   int missingID = 0;
-  struct timeval start, stop;
 
   IOBuffer ave_buffer, sec_buffer;
@@ -31 +24 @@
   insert_objects_mysql_create_tables (cleanname, mysql);
 
-  gettimeofday (&start, (void *) NULL);
+  INITTIME;
   insert_objects_mysql_init (&ave_buffer, &sec_buffer, cleanname);
   int Ninsert = 0;
@@ -323 +316 @@
     float stackPSFMag    = -999.0;
     float stackPSFMagErr = -999.0;
-    if (isfinite(secfilt->dFluxPSF) && isfinite(secfilt->FluxPSF) && (secfilt->dFluxPSF > 0.0)) {
-      float SN = secfilt->FluxPSF / secfilt->dFluxPSF;
+    if (isfinite(secfilt->dFpsfStk) && isfinite(secfilt->FpsfStk) && (secfilt->dFpsfStk > 0.0)) {
+      float SN = secfilt->FpsfStk / secfilt->dFpsfStk;
       if (SN > 3.0) {
-        stackPSFMag = -2.5 * log10(secfilt->FluxPSF) + 8.9;
-        stackPSFMagErr = secfilt->dFluxPSF / secfilt->FluxPSF;
+        stackPSFMag = -2.5 * log10(secfilt->FpsfStk) + 8.9;
+        stackPSFMagErr = secfilt->dFpsfStk / secfilt->FpsfStk;
       }
     }
@@ -333 +326 @@
     float stackKronMag    = -999.0;
     float stackKronMagErr = -999.0;
-    if (isfinite(secfilt->dFluxKron) && isfinite(secfilt->FluxKron) && (secfilt->dFluxKron > 0.0)) {
-      float SN = secfilt->FluxKron / secfilt->dFluxKron;
+    if (isfinite(secfilt->dFkronStk) && isfinite(secfilt->FkronStk) && (secfilt->dFkronStk > 0.0)) {
+      float SN = secfilt->FkronStk / secfilt->dFkronStk;
       if (SN > 3.0) {
-        stackKronMag = -2.5 * log10(secfilt->FluxKron) + 8.9;
-        stackKronMagErr = secfilt->dFluxKron / secfilt->FluxKron;
+        stackKronMag = -2.5 * log10(secfilt->FkronStk) + 8.9;
+        stackKronMagErr = secfilt->dFkronStk / secfilt->FkronStk;
       }
     }
@@ -347 +340 @@
     PRINT_FLOAT(sec_buffer, meanKronMagErr,  "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, meanPSFMagErr,   "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->Xm,     "%.6f, ");
+    PRINT_FLOAT(sec_buffer, secfilt->Mchisq, "%.6f, ");
     PRINT_FLOAT(sec_buffer, stackPSFMag,     "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, stackPSFMagErr,  "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, stackKronMag,    "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, stackKronMagErr, "%.6f, "); // 0.36 umag precision
-    PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
-    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);        
-    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Nused);        
-    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->M_20);         
-    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->M_80);         
+    PrintIOBuffer (sec_buffer, "%u,   ", secfilt->flags);       
+    PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->Ncode);        
+    PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->Nused);        
+    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mmin);         
+    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mmax);         
     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->ubercalDist);  
-    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Mstdev);       
+    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mstdev);       
     PrintIOBuffer (sec_buffer, "%lu  ", secfilt->stackDetectID);
     PrintIOBuffer (sec_buffer, "),\n");

trunk/Ohana/src/dvopsps/src/insert_skytable.c

@@ -2 +2 @@
 # define DEBUG 1
 # define USE_MYSQL 1
-
-# define MARKTIME(MSG,...) {                    \
-    float dtime;                                \
-    gettimeofday (&stop, (void *) NULL);        \
-    dtime = DTIME (stop, start);                \
-    fprintf (stderr, MSG, __VA_ARGS__); }
 
 // determine the relevant catalogs, launch parallel clients if desired
@@ -13 +7 @@
 
   off_t i;
-  struct timeval start, stop;
   SkyTable *sky = NULL;
 
@@ -34 +27 @@
 # endif
 
-  gettimeofday (&start, (void *) NULL);
+  INITTIME;
+
   insert_skytable_mysql_init (&buffer);
   int Ninsert = 0;