Changeset 38441 for trunk/Ohana/src/relphot/src/relphot_synthphot.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relphot/src/relphot_synthphot.c (modified) (3 diffs)

trunk/Ohana/src/relphot/src/relphot_synthphot.c

@@ -40 +40 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
-    catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
-    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
-    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+    catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
+    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
+    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
+    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
+    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
+    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
     if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
@@ -50 +51 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
@@ -109 +110 @@
     // VERBOSE, VERBOSE2
 
-    char command[1024];
-    snprintf (command, 1024, "relphot_client -synthphot_means %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f", 
-              SYNTH_ZERO_POINTS, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
+    char *command = NULL;
+    strextend (&command, "relphot_client -synthphot_means %s", SYNTH_ZERO_POINTS);
+    strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", table->hosts[i].hostID, CATDIR, table->hosts[i].pathname);
+    strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
 
-    char tmpline[1024];
-    if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                    strcpy (command, tmpline); }
-    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
-    if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
+    if (VERBOSE)       { strextend (&command, "-v");      }
+    if (VERBOSE2)      { strextend (&command, "-vv");     }
+    if (UPDATE)        { strextend (&command, "-update"); }
 
     fprintf (stderr, "command: %s\n", command);