Changeset 41620 for branches/eam_branches/relphot.20210521/src/reload_catalogs.c

Timestamp:

May 27, 2021, 11:41:52 AM (5 years ago)

Author:

eugene

Message:

consolidate reset operations for clarity

File:

• branches/eam_branches/relphot.20210521/src/reload_catalogs.c (modified) (3 diffs)

branches/eam_branches/relphot.20210521/src/reload_catalogs.c

@@ -90 +90 @@
     initTGroupBins (&catalog, 1);
 
-    initGridBins   (&catalog, 1); 
+    initGridBins   (); 
     TIMESTAMP(time3b);
 
@@ -237 +237 @@
     char *command = NULL;
     strextend (&command, "relphot_client %s -update-catalogs %s", PhotcodeList, imageFile);
-    strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", group->hosts[i][0].hostID, CATDIR, group->hosts[i][0].pathname);
+    strextend (&command, "-hostID %d", group->hosts[i][0].hostID);
+    strextend (&command, "-D CATDIR %s", CATDIR);
+    strextend (&command, "-hostdir %s", group->hosts[i][0].pathname);
     strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
     strextend (&command, "-statmode %s", STATMODE);
     strextend (&command, "-D CAMERA %s", CAMERA);
-    strextend (&command, "-D STAR_TOOFEW %d -minerror %f", STAR_TOOFEW, MIN_ERROR);
-
-    // options & configs which affect relphot_client -update-catalogs
-    // VERBOSE, VERBOSE2
-    // RESET
-    // RESET_ZEROPTS
-    // TimeSelect
-    // AreaSelect
-    // STATMODE
-    // STAR_TOOFEW
-    // MIN_ERROR
-    
+    strextend (&command, "-D STAR_TOOFEW %d", STAR_TOOFEW);
+    strextend (&command, "-minerror %f", MIN_ERROR);
+
     if (VERBOSE)           { strextend (&command, "-v"); }
     if (VERBOSE2)          { strextend (&command, "-vv"); }
     if (RESET)             { strextend (&command, "-reset"); }
     if (RESET_ZEROPTS)     { strextend (&command, "-reset-zpts"); }
+    if (RESET_FLATCORR)    { strextend (&command, "-reset-flat"); }
+    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
     if (PRESERVE_PS1)      { strextend (&command, "-preserve-ps1"); }
+    if (IS_DIFF_DB)        { strextend (&command, "-is-diff-db"); }
     if (UPDATE)            { strextend (&command, "-update"); }
-    if (IS_DIFF_DB)        { strextend (&command, "-is-diff-db"); }
-    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
     if (UPDATE_CATFORMAT)  { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
     if (BOUNDARY_TREE)     { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); }
@@ -266 +260 @@
     if (GRID_ZEROPT)       { strextend (&command, "-grid %s", GRID_MEANFILE); } 
     if (USE_BASIC_CHECK)   {  strextend (&command, "-basic-image-search"); }
+    // if (USE_ALL_IMAGES)    { strextend (&command, "-use-all-images"); }
     if (USE_MCAL_PSF_FOR_STACK_APER) { strextend (&command, "-use-mcal-psf-for-stack-aper"); }