Changeset 41170 for branches/eam_branches/ipp-20191011/Ohana/src/relphot/src/relphot_objects.c

Timestamp:

Nov 27, 2019, 11:39:38 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:

branches/eam_branches/ipp-20191011

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relphot/src/relphot_objects.c (modified) (2 diffs)

branches/eam_branches/ipp-20191011/Ohana/src/relphot/src/relphot_objects.c

@@ -73 +73 @@
 
     catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    // if we are going to update the format, we should update all tables
+    if (UPDATE_CATFORMAT) {
+      catalog.catflags |= DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
+    }
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
@@ -162 +166 @@
     // we can optionally convert output format here
     // but it would be better to define a dvo crawler program to do this
-    // catalog.catformat = DVO_FORMAT_PS1_V1;  
+    // catalog.catformat = DVO_FORMAT_PS1_V1;
+
+    // modify the output format as desired (ignore current format on disk)
+    if (UPDATE_CATFORMAT) {
+      catalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
+    }
+    
     SetProtect (TRUE);
     if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }