Changeset 34127 for branches/eam_branches/ipp-20120627/Ohana

Timestamp:

Jul 7, 2012, 9:25:02 PM (14 years ago)

Author:

eugene

Message:

temporarily save last-merge for this run in LMRG_*2; ignore * and *1; need to fix this concept...

File:

• branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (4 diffs)

branches/eam_branches/ipp-20120627/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -94 +94 @@
       fclose (fout);
 
-      // update header of output catalog
+      // XXX note that we are hardwired to v 2
+      // check the header of output catalog for an existing merge
       long long last_size;
       char last_moddate[80];
-      gfits_scan (&outheader, "LMRG_SZ", "%lld", 1, &last_size);      
-      gfits_scan (&outheader, "LMRG_DT", "%s", 1, last_moddate);      
+      gfits_scan (&outheader, "LMRG_SZ2", "%lld", 1, &last_size);      
+      gfits_scan (&outheader, "LMRG_DT2", "%s", 1, last_moddate);      
 
       time_t last_mod = ohana_date_to_sec (last_moddate);
@@ -150 +151 @@
       outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
 
-      // update header of output catalog
+# if (0)
+      // get the LMRG data from the previous pass
       long long last_size;
       char last_moddate[80];
@@ -156 +158 @@
       int status_date = gfits_scan (&outcatalog.header, "LMRG_DT", "%s", 1, last_moddate);      
 
-      // save the previous size of merged entry
+      // save the LMRG data from the previous pass
       if (status_size && status_date) {
         gfits_modify (&outcatalog.header, "LMRG_SZ1", "%lld", 1, (long long) last_size);      
@@ -165 +167 @@
       gfits_modify (&outcatalog.header, "LMRG_SZ", "%lld", 1, (long long) instats.st_size);      
       gfits_modify (&outcatalog.header, "LMRG_DT", "%s", 1, moddate);      
+# endif
+
+      // update header of output catalog
+      // XXX note that we are hardwired to v 2
+      gfits_modify (&outcatalog.header, "LMRG_SZ2", "%lld", 1, (long long) instats.st_size);      
+      gfits_modify (&outcatalog.header, "LMRG_DT2", "%s", 1, moddate);      
 
       if (!dvo_catalog_backup (&outcatalog, TRUE)) {