Changeset 40291 for trunk/Ohana/src/dvomerge

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/build_links.c (modified) (1 diff)
• src/dvomerge/src/merge_catalogs_old.c (modified) (3 diffs)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -701 +701 @@
   off_t *next_galphot;
 
-  if (galphot) return NULL;
+  if (!galphot) return NULL;
   if (SKIP_GALPHOT) return NULL;
 

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -367 +367 @@
       // secfilt tables of input and output are the same
       for (k = 0; k < NsecfiltIn; k++) {
-        if ( isfinite(output[0].secfilt[n*NsecfiltIn+k].M)) continue;
-        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].M)) continue;
+        if ( isfinite(output[0].secfilt[n*NsecfiltIn+k].MpsfChp)) continue;
+        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].MpsfChp)) continue;
         output[0].secfilt[n*NsecfiltIn+k] = input[0].secfilt[N*NsecfiltIn+k];
       }
@@ -378 +378 @@
         int outputIndex = n * NsecfiltOut + secfiltMap[k];
         
-        if ( isfinite(output[0].secfilt[outputIndex].M)) continue;
-        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].M)) continue;
+        if ( isfinite(output[0].secfilt[outputIndex].MpsfChp)) continue;
+        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].MpsfChp)) continue;
         output[0].secfilt[outputIndex] = input[0].secfilt[N*NsecfiltIn+k];
       }
@@ -489 +489 @@
       }
     
-      if (isfinite(input[0].secfilt[N*NsecfiltIn+j].M)) {
+      if (isfinite(input[0].secfilt[N*NsecfiltIn+j].MpsfChp)) {
         output[0].secfilt[outputIndex] = input[0].secfilt[N*NsecfiltIn+j];
       }