Changeset 38674

Timestamp:

Aug 11, 2015, 8:35:08 AM (11 years ago)

Author:

eugene

Message:

FGshape added

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/initialize_dvopsps.c (modified) (1 diff)
• src/insert_FGshape_dvopsps.c (added)
• src/insert_FGshape_dvopsps_catalog.c (added)
• src/insert_objects_dvopsps_catalog.c (modified) (1 diff)

trunk/Ohana/src/dvopsps/Makefile

@@ -32 +32 @@
 $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
 $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_FGshape_dvopsps.$(ARCH).o \
+$(SRC)/insert_FGshape_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
 $(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \
@@ -52 +54 @@
 $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
 $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
+$(SRC)/insert_FGshape_dvopsps.$(ARCH).o \
+$(SRC)/insert_FGshape_dvopsps_catalog.$(ARCH).o \
 $(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
 $(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \

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

@@ -115 +115 @@
 int    insert_FWobjects_mysql_commit        PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, IOBuffer *cpy_buffer, MYSQL *mysql));
 
+int    insert_FGshape_dvopsps               PROTO(());
+int    insert_FGshape_dvopsps_parallel      PROTO((SkyList *sky));
+int    insert_FGshape_dvopsps_catalog       PROTO((Catalog *catalog, char *basename, MYSQL *mysql));
+                                          
+int    insert_FGshape_mysql_create_tables   PROTO((char *basename, MYSQL *mysql));
+int    insert_FGshape_mysql_init            PROTO((IOBuffer *ave_buffer, IOBuffer *cpy_buffer, char *basename));
+int    insert_FGshape_mysql_value           PROTO((IOBuffer *ave_buffer, IOBuffer *cpy_buffer, Average *average, GalPhot *galphot, int Ngalphot));
+int    insert_FGshape_mysql_commit          PROTO((IOBuffer *ave_buffer, IOBuffer *cpy_buffer, MYSQL *mysql));
+
 int    insert_skytable                    PROTO(());
 

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

@@ -21 +21 @@
     status = insert_FWobjects_dvopsps ();
   }
+  if (!strcasecmp (argv[1], "forced_galaxy_shape")) {
+    status = insert_FGshape_dvopsps ();
+  }
   if (!strcasecmp (argv[1], "skytable")) {
     status = insert_skytable ();

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

@@ -28 +28 @@
     status = insert_FWobjects_dvopsps ();
   }
+  if (!strcasecmp (argv[1], "forced_galaxy_shape")) {
+    status = insert_FGshape_dvopsps ();
+  }
   if (status == -1) {
     fprintf (stderr, "invalid mode, should be : detections, skytable\n");

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

@@ -21 +21 @@
   fprintf (stderr, "\n");
 
-  fprintf (stderr, " (mode) is one of detections, objects, forced_warp_objects, skytable\n");
+  fprintf (stderr, " (mode) is one of detections, objects, forced_warp_objects, forced_galaxy_shaoe, skytable\n");
 
   fprintf (stderr, "\n");

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

@@ -43 +43 @@
     // fprintf (stderr, "%f : %d %d %d\n", average[i].ChiSqPM, isinf(average[i].ChiSqPM), isnan(average[i].ChiSqPM), isfinite(average[i].ChiSqPM));
 
-    // Average is a bigger table, but Nsecfilt*secfilt might be bigger, so check both
+    // Average is a big table, but Nsecfilt*secfilt might be bigger, so check both
     if ((ave_buffer.Nbuffer > MAX_BUFFER) || (sec_buffer.Nbuffer > MAX_BUFFER)) {
       insert_objects_mysql_commit (&ave_buffer, &sec_buffer, mysql);
       if (DEBUG) fprintf (stderr, "inserted %d rows\n", Ninsert);
       Ninsert = 0;
-      if (0) {
-        FlushIOBuffer (&ave_buffer);
-        FlushIOBuffer (&sec_buffer);
-      } else {
-        ave_buffer.Nbuffer = 0;
-        bzero (ave_buffer.buffer, ave_buffer.Nalloc);
-        sec_buffer.Nbuffer = 0;
-        bzero (sec_buffer.buffer, sec_buffer.Nalloc);
-      }
+      ave_buffer.Nbuffer = 0;
+      bzero (ave_buffer.buffer, ave_buffer.Nalloc);
+      sec_buffer.Nbuffer = 0;
+      bzero (sec_buffer.buffer, sec_buffer.Nalloc);
       insert_objects_mysql_init (&ave_buffer, &sec_buffer, cleanname);
     }