Merge branch 'master'

Author: jpbarrett

source/c_src/applications/aedit/src/set_stations.c

@@ -18,12 +18,13 @@
 #include <string.h>
 #include <ctype.h>
 #include "aedit.h"
+#include "sizelimits.h"
 
 int set_stations(char *arg1, char *arg2, char *remarg)
 {
 	extern struct inputs inp;
 	int l, i, j;
-	char c, buf[150], outbuf[10];
+	char c, buf[150], outbuf[150];
 
 	sprintf(buf,"%s%s%s",arg1,arg2,remarg);
 	l = strlen(buf);
@@ -33,7 +34,7 @@ int set_stations(char *arg1, char *arg2, char *remarg)
 	    c = buf[i];
 	    if(isalpha(c)) {
 		if(strchr(outbuf,c) == NULL) {		/* No duplicates */
-		    if(j > 13) {			/* Check for overflow */
+		    if(j > MAXSTEXP) {			/* Check for overflow */
 			msg("Too many stations listed",2);
 			return(-1);
 		    }

source/cpp_src/DiFXInterface/src/MHO_DiFXBaselineProcessor.cc

@@ -325,7 +325,17 @@ void MHO_DiFXBaselineProcessor::Organize()
 
     if(ant1 != ant2) // cross-correlation
     {
-        fScaleFactor = SCALE * fNBitsToFactor[fRefStationBits] * fNBitsToFactor[fRemStationBits];
+        fScaleFactor = SCALE;
+        if(fNBitsToFactor.find(fRefStationBits) != fNBitsToFactor.end() ){fScaleFactor *= fNBitsToFactor[fRefStationBits];}
+        else 
+        {
+            msg_warn("difx_interface", "reference station quantization bits: "<<fRefStationBits<<", not in Van Vleck correction table" << eom);
+        }
+        if(fNBitsToFactor.find(fRemStationBits) != fNBitsToFactor.end()){fScaleFactor *= fNBitsToFactor[fRemStationBits];}
+        else 
+        {
+            msg_warn("difx_interface", "remote station quantization bits: "<<fRemStationBits<<", not in Van Vleck correction table" << eom);
+        }
     }
     else // auto-correlation
     {

tag-rev.last

@@ -1 +1 @@
-a1465b
+4d690f