Changeset 37923

Timestamp:

Feb 20, 2015, 3:29:33 PM (11 years ago)

Author:

eugene

Message:

fix FW mode, adding diffobj mode

Location:

trunk/Ohana/src/dvopsps

Files:

• Makefile (modified) (2 diffs)
• include/dvopsps.h (modified) (1 diff)
• src/dvopsps.c (modified) (1 diff)
• src/dvopsps_client.c (modified) (1 diff)
• src/insert_FWobjects_dvopsps_catalog.c (modified) (6 diffs)
• src/insert_diffobj_dvopsps.c (added)
• src/insert_diffobj_dvopsps_catalog.c (added)

trunk/Ohana/src/dvopsps/Makefile

@@ -32 +32 @@
 $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
 $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
+$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o
@@ -50 +52 @@
 $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
 $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
+$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps.$(ARCH).o \
 $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o

trunk/Ohana/src/dvopsps/include/dvopsps.h

@@ -121 +121 @@
 int    insert_skytable_mysql_init         PROTO((IOBuffer *buffer));
 
+int    insert_diffobj_dvopsps             PROTO(());
+int    insert_diffobj_dvopsps_parallel    PROTO((SkyList *sky));
+int    insert_diffobj_dvopsps_catalog     PROTO((Catalog *catalog, char *basename, MYSQL *mysql));
+
+int    insert_diffobj_mysql_create_tables PROTO((char *basename, MYSQL *mysql));
+int    insert_diffobj_mysql_init          PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, char *basename));
+int    insert_diffobj_mysql_value         PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt));
+int    insert_diffobj_mysql_commit        PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, MYSQL *mysql));
+
 Detections *DetectionsLoad                PROTO((char *filename, int *Ndetections));
 int         DetectionsSave                PROTO((char *filename, Detections *detections, int Ndetections));

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

@@ -14 +14 @@
   if (!strcasecmp (argv[1], "objects")) {
     status = insert_objects_dvopsps ();
+  }
+  if (!strcasecmp (argv[1], "diffobj")) {
+    status = insert_diffobj_dvopsps ();
   }
   if (!strcasecmp (argv[1], "forced_warp_objects")) {

trunk/Ohana/src/dvopsps/src/dvopsps_client.c

@@ -22 +22 @@
     status = insert_objects_dvopsps ();
   }
+  if (!strcasecmp (argv[1], "diffobj")) {
+    status = insert_diffobj_dvopsps ();
+  }
   if (!strcasecmp (argv[1], "forced_warp_objects")) {
     status = insert_FWobjects_dvopsps ();

trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c

@@ -6 +6 @@
   off_t i;
   int missingID = 0;
+  int noLensobj = 0;
 
   IOBuffer ave_buffer, sec_buffer, cpy_buffer;
@@ -42 +43 @@
     off_t m = average[i].lensobjOffset;
     off_t Nlensobj = average[i].Nlensobj;
+
+    // skip objects with no lensing object
+    if (!Nlensobj) {
+      noLensobj ++;
+      continue;
+    }
 
     // XXX check return status
@@ -76 +83 @@
     found ++;
   }
-  insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql);
-  if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt\n", 
-                        catalog[0].Naverage, Nsecfilt*catalog[0].Naverage);
+  if (Ninsert) {
+    insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql);
+  }
+  if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt, "OFF_T_FMT" lensobj\n", 
+                        catalog[0].Naverage, Nsecfilt*catalog[0].Naverage, catalog[0].Nlensobj);
   FreeIOBuffer (&ave_buffer);
   FreeIOBuffer (&sec_buffer);
@@ -84 +93 @@
   free (cleanname);
 
-  MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs\n", found, dtime, missingID);
+  MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs, %d with no lensobj\n", found, dtime, missingID, noLensobj);
   return (TRUE);
 }
@@ -158 +167 @@
     fprintf (stderr, "Nbuffer: %d\n", buffer.Nbuffer);
   }
+  buffer.Nbuffer = 0;
+  bzero (buffer.buffer, buffer.Nalloc);
 
   PrintIOBuffer (&buffer, "DROP TABLE %s_cpy\n", basename);
@@ -173 +184 @@
                  "PHOTCODE           SMALLINT, "
 
-                 "FLUX_AP_R5,        FLOAT, "
-                 "FLUX_ERR_AP_R5,    FLOAT, "
-                 "FLUX_STD_AP_R5,    FLOAT, "
-                 "FLUX_FIL_AP_R5,    FLOAT, "
-                 "FLUX_AP_R6,        FLOAT, "
-                 "FLUX_ERR_AP_R6,    FLOAT, "
-                 "FLUX_STD_AP_R6,    FLOAT, "
-                 "FLUX_FIL_AP_R6,    FLOAT, "
-
-                 "X11_SM_OBJ,        FLOAT, "
-                 "X12_SM_OBJ,        FLOAT, "
-                 "X22_SM_OBJ,        FLOAT, "
-                 "E1_SM_OBJ,         FLOAT, "
-                 "E2_SM_OBJ,         FLOAT, "
-                 "X11_SH_OBJ,        FLOAT, "
-                 "X12_SH_OBJ,        FLOAT, "
-                 "X22_SH_OBJ,        FLOAT, "
-                 "E1_SH_OBJ,         FLOAT, "
-                 "E2_SH_OBJ,         FLOAT, "
-
-                 "X11_SM_PSF,        FLOAT, "
-                 "X12_SM_PSF,        FLOAT, "
-                 "X22_SM_PSF,        FLOAT, "
-                 "E1_SM_PSF,         FLOAT, "
-                 "E2_SM_PSF,         FLOAT, "
-                 "X11_SH_PSF,        FLOAT, "
-                 "X12_SH_PSF,        FLOAT, "
-                 "X22_SH_PSF,        FLOAT, "
-                 "E1_SH_PSF,         FLOAT, "
-                 "E2_SH_PSF,         FLOAT, "
-
-                 "GAMMA,             FLOAT, "
-                 "E1,                FLOAT, "
-                 "E2,                FLOAT, "
+                 "FLUX_AP_R5         FLOAT, "
+                 "FLUX_ERR_AP_R5     FLOAT, "
+                 "FLUX_STD_AP_R5     FLOAT, "
+                 "FLUX_FIL_AP_R5     FLOAT, "
+                 "FLUX_AP_R6         FLOAT, "
+                 "FLUX_ERR_AP_R6     FLOAT, "
+                 "FLUX_STD_AP_R6     FLOAT, "
+                 "FLUX_FIL_AP_R6     FLOAT, "
+
+                 "X11_SM_OBJ         FLOAT, "
+                 "X12_SM_OBJ         FLOAT, "
+                 "X22_SM_OBJ         FLOAT, "
+                 "E1_SM_OBJ          FLOAT, "
+                 "E2_SM_OBJ          FLOAT, "
+                 "X11_SH_OBJ         FLOAT, "
+                 "X12_SH_OBJ         FLOAT, "
+                 "X22_SH_OBJ         FLOAT, "
+                 "E1_SH_OBJ          FLOAT, "
+                 "E2_SH_OBJ          FLOAT, "
+
+                 "X11_SM_PSF         FLOAT, "
+                 "X12_SM_PSF         FLOAT, "
+                 "X22_SM_PSF         FLOAT, "
+                 "E1_SM_PSF          FLOAT, "
+                 "E2_SM_PSF          FLOAT, "
+                 "X11_SH_PSF         FLOAT, "
+                 "X12_SH_PSF         FLOAT, "
+                 "X22_SH_PSF         FLOAT, "
+                 "E1_SH_PSF          FLOAT, "
+                 "E2_SH_PSF          FLOAT, "
+
+                 "GAMMA              FLOAT, "
+                 "E1                 FLOAT, "
+                 "E2                 FLOAT, "
 
                  "NMEAS              INT "