Changeset 28993 for branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src/dvomergeCreate.c

Timestamp:

Aug 20, 2010, 11:15:36 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src/dvomergeCreate.c (modified) (6 diffs)

branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src/dvomergeCreate.c

@@ -10 +10 @@
   SkyList *inlist;
   Catalog incatalog, outcatalog;
-  char filename[256], *input1, *input2, *output;
+  char filename[256];
+  char filename1[256];
+  char *codesFilename;
+  char *input1, *input2, *output;
   IDmapType IDmap1, IDmap2;
 
@@ -22 +25 @@
   dvomergeImagesCreate (&IDmap1, input1, &IDmap2, input2, output);
 
-  // the first input defines the photcode table & db layout
-  sprintf (filename, "%s/Photcodes.dat", input1);
+  PhotCodeData *input1Photcodes = NULL;
+  PhotCodeData *input2Photcodes = NULL;
+  PhotCodeData *outputPhotcodes = NULL;
+  int *secfiltMap1 = NULL;
+  int *secfiltMap2 = NULL;
+
+  // Read the input1 photcodes
+  SetPhotcodeTable(NULL);
+  sprintf (filename1, "%s/Photcodes.dat", input1);
+  if (!LoadPhotcodes (filename1, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", filename1);
+    exit (1);
+  }
+  input1Photcodes = GetPhotcodeTable();
+
+  // Read the input2 photcodes
+  SetPhotcodeTable(NULL);
+  sprintf (filename, "%s/Photcodes.dat", input2);
   if (!LoadPhotcodes (filename, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", filename);
     exit (1);
   }
-  // save the photcodes in the output catdir
+  input2Photcodes = GetPhotcodeTable();
+
+  if (ALTERNATE_PHOTCODE_FILE) {
+    SetPhotcodeTable(NULL);
+    // First attempt to read file as fits table ...
+    if (!LoadPhotcodes(ALTERNATE_PHOTCODE_FILE, NULL, FALSE)) {
+      // and if that fails try it as a text file
+      if (!LoadPhotcodesText(ALTERNATE_PHOTCODE_FILE)) {
+        fprintf (stderr, "failed to read photcode file %s\n", ALTERNATE_PHOTCODE_FILE);
+        exit (1);
+      }
+    }
+    outputPhotcodes = GetPhotcodeTable();
+
+    secfiltMap1 = GetSecFiltMap(outputPhotcodes, input1Photcodes);
+    if (!secfiltMap1) {
+      fprintf (stderr, "failed to map %s secfilt photcodes to alternate photcodes table %s\n", input1,
+        ALTERNATE_PHOTCODE_FILE);
+      exit (1);
+    }
+
+    codesFilename = ALTERNATE_PHOTCODE_FILE;
+
+  } else {
+    // Use the first input file's photcodes
+    outputPhotcodes = input1Photcodes;
+    codesFilename = filename1;
+    // secfitMap1 can remain NULL since input1 defines the set of codes
+  }
+
+  secfiltMap2 = GetSecFiltMap(outputPhotcodes, input2Photcodes);
+  if (!secfiltMap2) {
+    fprintf (stderr, "falied to map %s secfilt photcodes to output photcodes table %s\n", input2,
+      codesFilename);
+    exit (1);
+  }
+
+  // save the output photcodes in the output catdir
+  SetPhotcodeTable(outputPhotcodes);
   sprintf (filename, "%s/Photcodes.dat", output);
   if (!check_file_access (filename, TRUE, TRUE, VERBOSE)) {
@@ -64 +121 @@
     if (VERBOSE) fprintf (stderr, "output: %s\n", outsky[0].regions[i].name);
 
+    if (outputPhotcodes) {
+        SetPhotcodeTable(outputPhotcodes);
+    }
     // load / create output catalog
     LoadCatalog (&outcatalog, &outsky[0].regions[i], outsky[0].filename[i], "w");
 
+    if (input1Photcodes) {
+        SetPhotcodeTable(input1Photcodes);
+    }
     // combine only tables at equal or larger depth
       
@@ -84 +147 @@
       }
       dvo_update_image_IDs (&IDmap1, &incatalog);
-      merge_catalogs_new (&outsky[0].regions[i], &outcatalog, &incatalog);
+      merge_catalogs_new (&outsky[0].regions[i], &outcatalog, &incatalog, secfiltMap1);
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
     }
     SkyListFree (inlist);
+
+    if (input2Photcodes) {
+      SetPhotcodeTable(input2Photcodes);
+    }
 
     // load in all of the tables from input2 for this region
@@ -95 +162 @@
       if (VERBOSE) fprintf (stderr, "input 2: %s\n", inlist[0].regions[j][0].name);
 
-      // load input catalog (1)
+      // load input catalog (2)
       LoadCatalog (&incatalog, inlist[0].regions[j], inlist[0].filename[j], "r");
 
@@ -105 +172 @@
       }
       dvo_update_image_IDs (&IDmap2, &incatalog);
-      merge_catalogs_old (&outsky[0].regions[i], &outcatalog, &incatalog, RADIUS);
+      merge_catalogs_old (&outsky[0].regions[i], &outcatalog, &incatalog, RADIUS, secfiltMap2);
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);