allow None weights when angular upweighting

Corrfunc/mocks/DDrppi_mocks.py

@@ -376,10 +376,10 @@ def DDrppi_mocks(autocorr, cosmology, nthreads, pimax, binfile,
     if autocorr == 0:
         fix_ra_dec(RA2, DEC2)
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/mocks/DDsmu_mocks.py

@@ -311,10 +311,10 @@ def DDsmu_mocks(autocorr, cosmology, nthreads, mu_max, nmu_bins, binfile,
     if autocorr == 0:
         fix_ra_dec(RA2, DEC2)
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/mocks/DDtheta_mocks.py

@@ -327,10 +327,10 @@ def DDtheta_mocks(autocorr, nthreads, binfile,
     if autocorr == 0:
         fix_ra_dec(RA2, DEC2)
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/theory/DD.py

@@ -249,10 +249,10 @@ def DD(autocorr, nthreads, binfile, X1, Y1, Z1, weights1=None, periodic=True,
             convert_to_native_endian(arr, warn=True) for arr in
             [X1, Y1, Z1, X2, Y2, Z2]]
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/theory/DDrppi.py

@@ -301,10 +301,10 @@ def DDrppi(autocorr, nthreads, pimax, binfile, X1, Y1, Z1, weights1=None,
             convert_to_native_endian(arr, warn=True) for arr in
             [X1, Y1, Z1, X2, Y2, Z2]]
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/theory/DDsmu.py

@@ -316,10 +316,10 @@ def DDsmu(autocorr, nthreads, binfile, mu_max, nmu_bins,
             convert_to_native_endian(arr, warn=True) for arr in
             [X1, Y1, Z1, X2, Y2, Z2]]
 
-    if weight_type is not None:
+    if weights1 is not None:
         weights1 = [convert_to_native_endian(arr, warn=True) for arr in weights1]
-        if not autocorr:
-            weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
+    if weights2 is not None:
+        weights2 = [convert_to_native_endian(arr, warn=True) for arr in weights2]
 
     if pair_weights is not None:
         pair_weights = convert_to_native_endian(pair_weights, warn=True)

Corrfunc/theory/wp.py

@@ -514,7 +514,7 @@ def wp(boxsize, pimax, nthreads, binfile, X, Y, Z,
     X, Y, Z = [convert_to_native_endian(arr, warn=True)
                         for arr in [X, Y, Z]]
 
-    if weight_type is not None:
+    if weights is not None:
         weights = [convert_to_native_endian(arr, warn=True) for arr in weights]
 
     if pair_weights is not None:

Corrfunc/theory/xi.py

@@ -224,7 +224,7 @@ def xi(boxsize, nthreads, binfile, X, Y, Z,
     X, Y, Z = [convert_to_native_endian(arr, warn=True)
                         for arr in [X, Y, Z]]
 
-    if weight_type is not None:
+    if weight is not None:
         weights = [convert_to_native_endian(arr, warn=True) for arr in weights]
 
     if pair_weights is not None:

utils/defs.h

@@ -395,7 +395,7 @@ static inline int set_weight_struct(weight_struct* weight_st, const weight_metho
                 weight_st->num_weights = 1;
                 break;
             case INVERSE_BITWISE:
-                weight_st->num_weights = 1;
+                weight_st->num_weights = 0; // we can e.g. have only angular upweighting
                 break;
             default:
                 weight_st->num_weights = 0;