Changeset 38379
- Timestamp:
- Jun 5, 2015, 12:03:40 PM (11 years ago)
- Location:
- branches/eam_branches/ohana.20150429/src/relphot
- Files:
-
- 8 edited
-
include/relphot.h (modified) (1 diff)
-
src/StarOps.c (modified) (3 diffs)
-
src/args.c (modified) (2 diffs)
-
src/launch_region_hosts.c (modified) (1 diff)
-
src/load_catalogs.c (modified) (3 diffs)
-
src/reload_catalogs.c (modified) (3 diffs)
-
src/relphot_objects.c (modified) (2 diffs)
-
src/relphot_synthphot.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ohana.20150429/src/relphot/include/relphot.h
r38372 r38379 213 213 char *BOUNDARY_TREE; 214 214 215 int SET_MREL_VERSION;215 // XXX deprecate int SET_MREL_VERSION; 216 216 int IS_DIFF_DB; 217 217 -
branches/eam_branches/ohana.20150429/src/relphot/src/StarOps.c
r37116 r38379 128 128 129 129 for (i = 0; i < Ncatalog; i++) { 130 // pass == -1 for anything other than the final pass 131 switch (SET_MREL_VERSION) { 132 case 0: 133 setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt); 134 break; 135 case 1: 136 setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt); 137 break; 138 default: 139 fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION); 140 exit (2); 141 } 130 setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt); 142 131 SetMrelInfoAccum (&summary, &results); 143 132 } … … 175 164 176 165 for (i = 0; i < Ncatalog; i++) { 177 switch (SET_MREL_VERSION) { 178 // case 0: 179 // setMrel_catalog (catalog, i, pass, flatcorr, &results, Nsecfilt); 180 // break; 181 case 1: 182 setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt); 183 break; 184 default: 185 fprintf (stderr, "invalid setMrel version %d (use 1)\n", SET_MREL_VERSION); 186 exit (2); 187 } 166 setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt); 188 167 SetMrelInfoAccum (&summary, &results); 189 168 } … … 293 272 294 273 // pass == -1 for anything other than the final pass 295 switch (SET_MREL_VERSION) { 296 case 0: 297 setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt); 298 break; 299 case 1: 300 setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt); 301 break; 302 default: 303 fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION); 304 exit (2); 305 } 274 setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt); 306 275 SetMrelInfoAccum (&threadinfo->summary, &results); 307 276 } -
branches/eam_branches/ohana.20150429/src/relphot/src/args.c
r38062 r38379 76 76 } 77 77 78 SET_MREL_VERSION = 1;79 if ((N = get_argument (argc, argv, "-set-mrel-version"))) {80 remove_argument (N, &argc, argv);81 SET_MREL_VERSION = atof(argv[N]);82 remove_argument (N, &argc, argv);83 }84 85 78 VERBOSE = VERBOSE2 = FALSE; 86 79 if ((N = get_argument (argc, argv, "-v"))) { … … 529 522 } 530 523 531 SET_MREL_VERSION = 1;532 if ((N = get_argument (argc, argv, "-set-mrel-version"))) {533 remove_argument (N, &argc, argv);534 SET_MREL_VERSION = atof(argv[N]);535 remove_argument (N, &argc, argv);536 }537 538 524 VERBOSE = VERBOSE2 = FALSE; 539 525 if ((N = get_argument (argc, argv, "-v"))) { -
branches/eam_branches/ohana.20150429/src/relphot/src/launch_region_hosts.c
r38372 r38379 41 41 ImageTableSave (filename, host->image, host->Nimage); 42 42 43 char command[1024];44 s nprintf (command, 1024, "relphot %s", PhotcodeList);45 strextend ( command, "-parallel-images %s", filename);46 strextend ( command, "-region-hosts %s", REGION_FILE);47 strextend ( command, "-region-hostID %d", host->hostID);48 strextend ( command, "-D CATDIR %s", CATDIR);49 strextend ( command, "-region %f %f %f %f", host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat);50 strextend ( command, "-statmode %s", STATMODE);51 strextend ( command, "-D CAMERA %s", CAMERA);52 strextend ( command, "-D STAR_TOOFEW %d", STAR_TOOFEW);53 strextend ( command, "-minerror %f", MIN_ERROR);54 strextend ( command, "-cloud-limit %f", CLOUD_TOLERANCE);43 char *command = NULL; 44 strextend (&command, "relphot %s", PhotcodeList); 45 strextend (&command, "-parallel-images %s", filename); 46 strextend (&command, "-region-hosts %s", REGION_FILE); 47 strextend (&command, "-region-hostID %d", host->hostID); 48 strextend (&command, "-D CATDIR %s", CATDIR); 49 strextend (&command, "-region %f %f %f %f", host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat); 50 strextend (&command, "-statmode %s", STATMODE); 51 strextend (&command, "-D CAMERA %s", CAMERA); 52 strextend (&command, "-D STAR_TOOFEW %d", STAR_TOOFEW); 53 strextend (&command, "-minerror %f", MIN_ERROR); 54 strextend (&command, "-cloud-limit %f", CLOUD_TOLERANCE); 55 55 56 if (VERBOSE) strextend ( command, "-v");57 if (VERBOSE2) strextend ( command, "-vv");58 if (RESET) strextend ( command, "-reset");59 if (RESET_ZEROPTS) strextend ( command, "-reset-zpts");60 if (!KEEP_UBERCAL) strextend ( command, "-reset-ubercal");61 if (DophotSelect) strextend ( command, "-dophot %d", DophotValue);62 if (ImagSelect) strextend ( command, "-instmag %f %f", ImagMin, ImagMax);63 if (MaxDensityUse) strextend ( command, "-max-density %f", MaxDensityValue);64 if (SyntheticPhotometry) strextend ( command, "-synthphot");56 if (VERBOSE) strextend (&command, "-v"); 57 if (VERBOSE2) strextend (&command, "-vv"); 58 if (RESET) strextend (&command, "-reset"); 59 if (RESET_ZEROPTS) strextend (&command, "-reset-zpts"); 60 if (!KEEP_UBERCAL) strextend (&command, "-reset-ubercal"); 61 if (DophotSelect) strextend (&command, "-dophot %d", DophotValue); 62 if (ImagSelect) strextend (&command, "-instmag %f %f", ImagMin, ImagMax); 63 if (MaxDensityUse) strextend (&command, "-max-density %f", MaxDensityValue); 64 if (SyntheticPhotometry) strextend (&command, "-synthphot"); 65 65 66 if (UPDATE) strextend ( command, "-update");67 if (MOSAIC_ZEROPT) strextend ( command, "-mosaic");68 if (FREEZE_IMAGES) strextend ( command, "-imfreeze");69 if (FREEZE_MOSAICS) strextend ( command, "-mosfreeze");70 if (PARALLEL) strextend ( command, "-parallel");71 if (PARALLEL_MANUAL) strextend ( command, "-parallel-manual");72 if (PARALLEL_SERIAL) strextend ( command, "-parallel-serial");66 if (UPDATE) strextend (&command, "-update"); 67 if (MOSAIC_ZEROPT) strextend (&command, "-mosaic"); 68 if (FREEZE_IMAGES) strextend (&command, "-imfreeze"); 69 if (FREEZE_MOSAICS) strextend (&command, "-mosfreeze"); 70 if (PARALLEL) strextend (&command, "-parallel"); 71 if (PARALLEL_MANUAL) strextend (&command, "-parallel-manual"); 72 if (PARALLEL_SERIAL) strextend (&command, "-parallel-serial"); 73 73 74 74 // XXX deprecate this if we are happy with the new version 75 if (SET_MREL_VERSION != 1) strextend (command, "-set-mrel-version %d", SET_MREL_VERSION);75 // if (SET_MREL_VERSION != 1) strextend (command, "-set-mrel-version %d", SET_MREL_VERSION); 76 76 77 77 fprintf (stderr, "command: %s\n", command); -
branches/eam_branches/ohana.20150429/src/relphot/src/load_catalogs.c
r38372 r38379 34 34 // XXX keep in mind that not all catalogs are loaded 35 35 dvo_catalog_init (&catalog[i], TRUE); 36 dvo_catalog_init (&tcatalog, TRUE); 36 37 37 38 // does this host ID match the desired location for the table? … … 42 43 snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name); 43 44 tcatalog.filename = hostID ? hostfile : skylist[0].filename[i]; 44 tcatalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data45 tcatalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data46 tcatalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data47 45 tcatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point 48 46 tcatalog.Nsecfilt = GetPhotcodeNsecfilt (); // set the desired number in case we need to create the catalog 47 48 // tcatalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data 49 // tcatalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data 50 // tcatalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data 49 51 50 52 if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE2, "r")) { … … 153 155 // MaxDensityUse, MaxDensityValue 154 156 155 char command[1024];156 s nprintf (command, 1024, "relphot_client %s -load %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D CAMERA %s -D MAG_LIM %f -D SIGMA_LIM %f",157 char *command = NULL; 158 strextend (&command, "relphot_client %s -load %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D CAMERA %s -D MAG_LIM %f -D SIGMA_LIM %f", 157 159 PhotcodeList, table->hosts[i].results, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, CAMERA, MAG_LIM, SIGMA_LIM); 158 160 159 char tmpline[1024]; 160 if (VERBOSE) { snprintf (tmpline, 1024, "%s -v", command); strcpy (command, tmpline); } 161 if (VERBOSE2) { snprintf (tmpline, 1024, "%s -vv", command); strcpy (command, tmpline); } 162 if (RESET) { snprintf (tmpline, 1024, "%s -reset", command); strcpy (command, tmpline); } 163 if (RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts", command); strcpy (command, tmpline); } 164 if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal", command); strcpy (command, tmpline); } 165 if (DophotSelect) { snprintf (tmpline, 1024, "%s -dophot %d", command, DophotValue); strcpy (command, tmpline); } 166 if (ImagSelect) { snprintf (tmpline, 1024, "%s -instmag %f %f", command, ImagMin, ImagMax); strcpy (command, tmpline); } 167 if (MaxDensityUse) { snprintf (tmpline, 1024, "%s -max-density %f", command, MaxDensityValue); strcpy (command, tmpline); } 168 if (SyntheticPhotometry) { snprintf (tmpline, 1024, "%s -synthphot", command); strcpy (command, tmpline); } 161 if (VERBOSE) { strextend (&command, "-v"); } 162 if (VERBOSE2) { strextend (&command, "-vv"); } 163 if (RESET) { strextend (&command, "-reset"); } 164 if (RESET_ZEROPTS) { strextend (&command, "-reset-zpts"); } 165 if (!KEEP_UBERCAL) { strextend (&command, "-reset-ubercal"); } 166 if (DophotSelect) { strextend (&command, "-dophot %d", DophotValue); } 167 if (ImagSelect) { strextend (&command, "-instmag %f %f", ImagMin, ImagMax); } 168 if (MaxDensityUse) { strextend (&command, "-max-density %f", MaxDensityValue); } 169 if (SyntheticPhotometry) { strextend (&command, "-synthphot"); } 169 170 170 171 if (TimeSelect) { 171 172 char *tstart = ohana_sec_to_date (TSTART); 172 173 char *tstop = ohana_sec_to_date (TSTOP); 173 s nprintf (tmpline, 1024, "%s -time %s %s", command, tstart, tstop);174 strextend (&command, "-time %s %s", tstart, tstop); 174 175 free (tstart); 175 176 free (tstop); 176 strcpy (command, tmpline);177 177 } 178 178 -
branches/eam_branches/ohana.20150429/src/relphot/src/reload_catalogs.c
r38372 r38379 56 56 TIMESTAMP(time1); 57 57 58 catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data59 catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data60 catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data58 // catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data 59 // catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data 60 // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data 61 61 catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; 62 62 catalog.Nsecfilt = GetPhotcodeNsecfilt (); // set the desired number in case we need to create the catalog … … 207 207 group->hosts[i][0].pathname = tmppath; 208 208 209 char command[1024]; 210 snprintf (command, 1024, "relphot_client %s -update-catalogs %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f", 211 PhotcodeList, imageFile, group->hosts[i][0].hostID, CATDIR, group->hosts[i][0].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR); 209 char *command = NULL; 210 strextend (&command, "relphot_client %s -update-catalogs %s", PhotcodeList, imageFile); 211 strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", group->hosts[i][0].hostID, CATDIR, group->hosts[i][0].pathname); 212 strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax); 213 strextend (&command, "-statmode %s", STATMODE); 214 strextend (&command, "-D CAMERA %s", CAMERA); 215 strextend (&command, "-D STAR_TOOFEW %d -minerror %f", STAR_TOOFEW, MIN_ERROR); 212 216 213 217 // options & configs which affect relphot_client -update-catalogs … … 221 225 // MIN_ERROR 222 226 223 char tmpline[1024]; 224 if (VERBOSE) { snprintf (tmpline, 1024, "%s -v", command); strcpy (command, tmpline); } 225 if (VERBOSE2) { snprintf (tmpline, 1024, "%s -vv", command); strcpy (command, tmpline); } 226 if (RESET) { snprintf (tmpline, 1024, "%s -reset", command); strcpy (command, tmpline); } 227 if (RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts", command); strcpy (command, tmpline); } 228 if (UPDATE) { snprintf (tmpline, 1024, "%s -update", command); strcpy (command, tmpline); } 229 if (IS_DIFF_DB) { snprintf (tmpline, 1024, "%s -is-diff-db", command); strcpy (command, tmpline); } 230 if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal", command); strcpy (command, tmpline); } 231 if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT); strcpy (command, tmpline); } 232 if (BOUNDARY_TREE) { snprintf (tmpline, 1024, "%s -boundary-tree %s", command, BOUNDARY_TREE); strcpy (command, tmpline); } 233 if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION); strcpy (command, tmpline); } 234 if (AreaSelect) { snprintf (tmpline, 1024, "%s -area %f %f %f %f", command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); } 227 if (VERBOSE) { strextend (&command, "-v"); } 228 if (VERBOSE2) { strextend (&command, "-vv"); } 229 if (RESET) { strextend (&command, "-reset"); } 230 if (RESET_ZEROPTS) { strextend (&command, "-reset-zpts"); } 231 if (UPDATE) { strextend (&command, "-update"); } 232 if (IS_DIFF_DB) { strextend (&command, "-is-diff-db"); } 233 if (!KEEP_UBERCAL) { strextend (&command, "-reset-ubercal"); } 234 if (UPDATE_CATFORMAT) { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); } 235 if (BOUNDARY_TREE) { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); } 236 237 // deprecate 238 // if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", SET_MREL_VERSION); } // XXXX deprecate this... 239 240 if (AreaSelect) { strextend (&command, "-area %f %f %f %f", AreaXmin, AreaXmax, AreaYmin, AreaYmax); } 235 241 if (TimeSelect) { 236 242 char *tstart = ohana_sec_to_date (TSTART); 237 243 char *tstop = ohana_sec_to_date (TSTOP); 238 s nprintf (tmpline, 1024, "%s -time %s %s", command, tstart, tstop);244 strextend (&command, "-time %s %s", tstart, tstop); 239 245 free (tstart); 240 246 free (tstop); 241 strcpy (command, tmpline);242 247 } 243 248 -
branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c
r38372 r38379 40 40 snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name); 41 41 catalog.filename = hostID ? hostfile : skylist[0].filename[i]; 42 catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data43 catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data44 catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data42 // catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data 43 // catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data 44 // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data 45 45 catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; 46 46 catalog.Nsecfilt = GetPhotcodeNsecfilt (); … … 154 154 // MaxDensityUse, MaxDensityValue 155 155 156 char command[1024];157 s nprintf (command, 1024, "relphot_client -update-objects -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f",156 char *command = NULL; 157 strextend (&command, "relphot_client -update-objects -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f", 158 158 table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR); 159 159 160 char tmpline[1024];161 if (VERBOSE ) { snprintf (tmpline, 1024, "%s -v", command); strcpy (command, tmpline); }162 if ( VERBOSE2) { snprintf (tmpline, 1024, "%s -vv", command); strcpy (command, tmpline); }163 if (RESET ) { snprintf (tmpline, 1024, "%s -reset", command); strcpy (command, tmpline); }164 if ( RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts", command); strcpy (command, tmpline); }165 if ( UPDATE) { snprintf (tmpline, 1024, "%s -update", command); strcpy (command, tmpline); }166 if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal", command); strcpy (command, tmpline); } 167 if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION); strcpy (command, tmpline); }160 if (VERBOSE) { strextend (&command, "-v"); } 161 if (VERBOSE2) { strextend (&command, "-vv"); } 162 if (RESET) { strextend (&command, "-reset"); } 163 if (RESET_ZEROPTS) { strextend (&command, "-reset-zpts"); } 164 if (UPDATE) { strextend (&command, "-update"); } 165 if (!KEEP_UBERCAL) { strextend (&command, "-reset-ubercal"); } 166 167 // if (SET_MREL_VERSION != 1) { strextend (&command, "-set-mrel-version %d", SET_MREL_VERSION); } 168 168 169 169 fprintf (stderr, "command: %s\n", command); -
branches/eam_branches/ohana.20150429/src/relphot/src/relphot_synthphot.c
r38372 r38379 41 41 snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name); 42 42 catalog.filename = hostID ? hostfile : skylist[0].filename[i]; 43 catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data44 catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data45 catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data43 // catalog.catformat = dvo_catalog_catformat (CATFORMAT); // set the default catformat from config data 44 // catalog.catmode = dvo_catalog_catmode (CATMODE); // set the default catmode from config data 45 // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data 46 46 catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; 47 47 catalog.Nsecfilt = GetPhotcodeNsecfilt (); … … 110 110 // VERBOSE, VERBOSE2 111 111 112 char command[1024]; 113 snprintf (command, 1024, "relphot_client -synthphot_means %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f", 114 SYNTH_ZERO_POINTS, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax); 112 char *command = NULL; 113 strextend (&command, "relphot_client -synthphot_means %s", SYNTH_ZERO_POINTS); 114 strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", table->hosts[i].hostID, CATDIR, table->hosts[i].pathname); 115 strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax); 115 116 116 char tmpline[1024]; 117 if (VERBOSE) { snprintf (tmpline, 1024, "%s -v", command); strcpy (command, tmpline); } 118 if (VERBOSE2) { snprintf (tmpline, 1024, "%s -vv", command); strcpy (command, tmpline); } 119 if (UPDATE) { snprintf (tmpline, 1024, "%s -update", command); strcpy (command, tmpline); } 117 if (VERBOSE) { strextend (&command, "-v"); } 118 if (VERBOSE2) { strextend (&command, "-vv"); } 119 if (UPDATE) { strextend (&command, "-update"); } 120 120 121 121 fprintf (stderr, "command: %s\n", command);
Note:
See TracChangeset
for help on using the changeset viewer.
