Changeset 33403

Timestamp:

Mar 4, 2012, 1:32:12 PM (14 years ago)

Author:

eugene

Message:

add -update-catformat option to relphot to force output db to have desired format

Location:

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

Files:

• include/relphot.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/reload_catalogs.c (modified) (2 diffs)
• src/relphot.c (modified) (2 diffs)

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

@@ -134 +134 @@
 int    KEEP_UBERCAL;
 char  *OUTROOT;
+char  *UPDATE_CATFORMAT;
 int    PLOTDELAY;
 int    UpdateAverages;

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/args.c

@@ -162 +162 @@
   }
 
+  UPDATE_CATFORMAT = NULL;
+  if ((N = get_argument (argc, argv, "-update-catformat"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_CATFORMAT = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   SAVE_IMAGE_UPDATES = TRUE;
   if ((N = get_argument (argc, argv, "-skip-image-updates"))) {
@@ -444 +451 @@
   }  
 
+  UPDATE_CATFORMAT = NULL;
+  if ((N = get_argument (argc, argv, "-update-catformat"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_CATFORMAT = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   AreaSelect = FALSE;
   if ((N = get_argument (argc, argv, "-area"))) {

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/reload_catalogs.c

@@ -87 +87 @@
     TIMESTAMP(time5);
 
+    // modify the output format as desired (ignore current format on disk)
+    if (UPDATE_CATFORMAT) {
+      catalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
+    }
     dvo_catalog_save (&catalog, VERBOSE); 
     dvo_catalog_unlock (&catalog);
@@ -152 +156 @@
     
     char tmpline[1024];
-    if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                                           strcpy (command, tmpline); }
-    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                                           strcpy (command, tmpline); }
-    if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                                           strcpy (command, tmpline); }
-    if (KEEP_UBERCAL)  { snprintf (tmpline, 1024, "%s -keep-ubercal",   command);                    strcpy (command, tmpline); }
-    if (AreaSelect)    { snprintf (tmpline, 1024, "%s -area %f %f %f %f", command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); }
+    if (VERBOSE)          { snprintf (tmpline, 1024, "%s -v",                   command);                                         strcpy (command, tmpline); }
+    if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
+    if (RESET)            { snprintf (tmpline, 1024, "%s -reset",               command);                                         strcpy (command, tmpline); }
+    if (KEEP_UBERCAL)     { snprintf (tmpline, 1024, "%s -keep-ubercal",        command);                                         strcpy (command, tmpline); }
+    if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }
+    if (AreaSelect)       { snprintf (tmpline, 1024, "%s -area %f %f %f %f",    command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); }
     if (TimeSelect) { 
       char *tstart = ohana_sec_to_date (TSTART);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/relphot.c

@@ -217 +217 @@
     dbX.virtual = FALSE;
 
-    // copy Images.dat to another structure
+    // save Images.dat using the copied structure
+    if (UPDATE_CATFORMAT) {
+      // ensure the db format is updated
+      dbX.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
+      char photcodeFile[1024];
+      sprintf (photcodeFile, "%s/Photcodes.dat", CATDIR);
+      SavePhotcodesFITS (photcodeFile);
+    }
     dvo_image_save (&dbX, VERBOSE);
     dvo_image_unlock (&dbX); 
@@ -245 +252 @@
   MARKTIME("-- updated all catalogs: %f sec\n", dtime);
 
+  if (UPDATE_CATFORMAT) {
+    // ensure the db format is updated
+    db.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
+  }
   dvo_image_update (&db, VERBOSE);
   dvo_image_unlock (&db);