Changeset 38658

Timestamp:

Aug 1, 2015, 4:04:39 PM (11 years ago)

Author:

eugene

Message:

do not try to write out empty lensing, lensobj, etc tables

File:

• branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dvo_catalog_split.c (modified) (5 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -92 +92 @@
   if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
   
+  if (!catalog->f) return TRUE;
+
   /* rewind file pointers and truncate (file is still open) */
   if (fseeko (catalog->f, 0LL, SEEK_SET)) {
@@ -1003 +1005 @@
 
   /*** Lensing Table ***/
-  if ((catalog[0].catflags & DVO_LOAD_LENSING) && (catalog[0].lensing != NULL)) {
+  if ((catalog[0].catflags & DVO_LOAD_LENSING) && catalog[0].lensing && Nlensing_disk_new) {
 
     off_t first  = 0;                    // first row in memory to write
@@ -1034 +1036 @@
 
   /*** Lensobj Table ***/
-  if ((catalog[0].catflags & DVO_LOAD_LENSOBJ) && (catalog[0].lensobj != NULL)) {
+  if ((catalog[0].catflags & DVO_LOAD_LENSOBJ) && catalog[0].lensobj && Nlensobj_disk_new) {
 
     off_t first  = 0;                    // first row in memory to write
@@ -1065 +1067 @@
 
   /*** StarPar Table ***/
-  if ((catalog[0].catflags & DVO_LOAD_STARPAR) && (catalog[0].starpar != NULL)) {
+  if ((catalog[0].catflags & DVO_LOAD_STARPAR) && catalog[0].starpar && Nstarpar_disk_new) {
 
     off_t first  = 0;                    // first row in memory to write
@@ -1096 +1098 @@
 
   /*** GalPhot Table ***/
-  if ((catalog[0].catflags & DVO_LOAD_GALPHOT) && (catalog[0].galphot != NULL)) {
+  if ((catalog[0].catflags & DVO_LOAD_GALPHOT) && catalog[0].galphot && Ngalphot_disk_new) {
 
     off_t first  = 0;                    // first row in memory to write