Changeset 34749 for trunk/Ohana/src/relastro

Timestamp:

Nov 30, 2012, 10:06:05 AM (14 years ago)

Author:

eugene

Message:

merge from eam/20120905 (updates to delstar, setposangle, update to ps1-v4 schema to add measure.Xoff,Yoff)

Location:

trunk/Ohana/src/relastro/src

Files:

• ConfigInit.c (modified) (3 diffs)
• ImageOps.c (modified) (1 diff)
• UpdateObjects.c (modified) (1 diff)
• args.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/ConfigInit.c

@@ -5 +5 @@
   char  *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
   struct stat filestat;
   int status;
@@ -46 +45 @@
   ScanConfig(config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig(config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig(config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
 
   // Defaults for WHERE_A are established in db_utils.c: intializeConstraints
@@ -73 +71 @@
   /* update master photcode table if not defined */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -174 +174 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Nmeasure; j++) {
-      // XXX : update to optionally restrict by photcode equiv a la relphot
-      // ecode = GetPhotcodeEquivCodebyCode (catalog[i].measure[j].photcode);
-      // if (photcode[0].code != ecode) continue;
+      if (NphotcodesSkip > 0) {
+        int k;
+        int found = FALSE;
+        for (k = 0; (k < NphotcodesSkip) && !found; k++) {
+          if (photcodesSkip[k][0].code == catalog[i].measure[j].photcode) found = TRUE;
+          if (photcodesSkip[k][0].code == GetPhotcodeEquivCodebyCode(catalog[i].measure[j].photcode)) found = TRUE;
+        }
+        if (found) continue;
+      }  
       matchImage (catalog, j, i, MATCHCAT);
     }

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -112 +112 @@
         if (XVERB) {
           char *date = ohana_sec_to_date (measure[k].t);
-          fprintf (stderr, OFF_T_FMT" %f %f %s : 0x%08x : 0x%08x\n",  k, measure[k].dR, measure[k].dD, date, measure[k].dbFlags, measureBig[k].dbFlags);
+          int dbFlagsBig = measureBig ? measureBig[k].dbFlags : 0;
+          fprintf (stderr, OFF_T_FMT" %f %f %s : 0x%08x : 0x%08x\n",  k, measure[k].dR, measure[k].dD, date, measure[k].dbFlags, dbFlagsBig);
           free (date);
         }

trunk/Ohana/src/relastro/src/args.c

@@ -237 +237 @@
   }
 
-  PHOTCODE_SKIP_LIST = NULL;
+  PHOTCODE_SKIP_LIST = strcreate("SCOS.103a.E,SCOS.4414.OG590,SCOS.4415.OG590,SCOS.IIIaF.OG590,SCOS.IIIaF.RG610,SCOS.IIIaF.RG630,SCOS.IIIaJ.GG385,SCOS.IIIaJ.GG395,SCOS.IVN.RG715,SCOS.IVN.RG9");
   if ((N = get_argument (argc, argv, "-photcode"))) {
     remove_argument (N, &argc, argv);
-    PHOTCODE_SKIP_LIST = strcreate(argv[N]);
+    char *tmp1 = strcreate(argv[N]);
+
+    int Ntotal = strlen(tmp1) + strlen(PHOTCODE_SKIP_LIST) + 5;
+
+    char *tmp2 = NULL;
+    ALLOCATE (tmp2, char, Ntotal);
+    snprintf (tmp2, Ntotal, "%s,%s", PHOTCODE_SKIP_LIST, tmp1);
+
+    free (tmp1);
+    free (PHOTCODE_SKIP_LIST);
+
+    PHOTCODE_SKIP_LIST = tmp2;
     remove_argument (N, &argc, argv);
   }