Changeset 33532

Timestamp:

Mar 15, 2012, 12:46:41 PM (14 years ago)

Author:

eugene

Message:

allow relastro_client to take -photcode, +photcode options, also pass -basic-image-search

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/UpdateObjectOffsets.c (modified) (1 diff)
• src/initialize.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/relastro/include/relastro.h

@@ -423 +423 @@
 int BrightCatalogSplitFree (CatalogSplitter *catalogs);
 
-PhotCode **ParsePhotcodeList (char *rawlist, int *nphotcodes);
+PhotCode **ParsePhotcodeList (char *rawlist, int *nphotcodes, int needAve);

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -114 +114 @@
     if (MaxDensityUse) { snprintf (tmpline, 1024, "%s -max-density %f", command, MaxDensityValue);   strcpy (command, tmpline); }
     
+    if (USE_BASIC_CHECK) { snprintf (tmpline, 1024, "%s -basic-image-search", command);              strcpy (command, tmpline); }
     if (FlagOutlier)   { snprintf (tmpline, 1024, "%s -clip %d",        command, CLIP_THRESH);       strcpy (command, tmpline); }
     

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/initialize.c

@@ -13 +13 @@
   fprintf (stderr, "PHOTCODE_B_LIST: %s\n", PHOTCODE_B_LIST);
 
-  photcodesKeep = ParsePhotcodeList (PHOTCODE_KEEP_LIST, &NphotcodesKeep);
-  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip);
-  photcodesGroupA = ParsePhotcodeList (PHOTCODE_A_LIST, &NphotcodesGroupA);
-  photcodesGroupB = ParsePhotcodeList (PHOTCODE_B_LIST, &NphotcodesGroupB);
+  photcodesKeep = ParsePhotcodeList (PHOTCODE_KEEP_LIST, &NphotcodesKeep, FALSE);
+  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip, FALSE);
+  photcodesGroupA = ParsePhotcodeList (PHOTCODE_A_LIST, &NphotcodesGroupA, TRUE);
+  photcodesGroupB = ParsePhotcodeList (PHOTCODE_B_LIST, &NphotcodesGroupB, TRUE);
 
   initstats (STATMODE);
@@ -51 +51 @@
   fprintf (stderr, "PHOTCODE_B_LIST: %s\n", PHOTCODE_B_LIST);
 
-  photcodesKeep = ParsePhotcodeList (PHOTCODE_KEEP_LIST, &NphotcodesKeep);
-  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip);
-  photcodesGroupA = ParsePhotcodeList (PHOTCODE_A_LIST, &NphotcodesGroupA);
-  photcodesGroupB = ParsePhotcodeList (PHOTCODE_B_LIST, &NphotcodesGroupB);
+  photcodesKeep = ParsePhotcodeList (PHOTCODE_KEEP_LIST, &NphotcodesKeep, FALSE);
+  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip, FALSE);
+  photcodesGroupA = ParsePhotcodeList (PHOTCODE_A_LIST, &NphotcodesGroupA, TRUE);
+  photcodesGroupB = ParsePhotcodeList (PHOTCODE_B_LIST, &NphotcodesGroupB, TRUE);
 
   initstats (STATMODE);
@@ -63 +63 @@
 }
 
-PhotCode **ParsePhotcodeList (char *rawlist, int *nphotcodes) {
+PhotCode **ParsePhotcodeList (char *rawlist, int *nphotcodes, int needAve) {
 
   *nphotcodes = 0;
@@ -84 +84 @@
       exit (1);
     }
-    if (photcodes[Nphotcodes][0].type != PHOT_SEC) {
+    if (needAve && (photcodes[Nphotcodes][0].type != PHOT_SEC)) {
       fprintf (stderr, "photcode %s is not an filter type (SEC)\n", codename);
       exit (1);