Changeset 37116 for trunk/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c

Timestamp:

Jul 24, 2014, 5:10:56 PM (12 years ago)

Author:

eugene

Message:

merge relphot changes from eam_branches/ipp-20140717

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/dvomergeContinue_threaded.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c

@@ -74 +74 @@
       merge_catalogs_old (&threadData->outsky->regions[j], &outcatalog, &incatalog, RADIUS, threadData->secfiltMap);
 
-      outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-
       // if we receive a signal which would cause us to exit, wait until the full catalog is written
       SetProtect (TRUE);