rmjarvis · rmjarvis · Mar 7, 2024 · Mar 2, 2024 · Mar 2, 2024 · Mar 3, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,33 +24,33 @@ jobs:
             matrix:
                 # First all python versions in basic linux
                 os: [ ubuntu-latest ]
-                py: [ 3.7, 3.8, 3.9, "3.10", "pypy-3.9" ]
+                py: [ 3.7, 3.8, 3.9, '3.10', 3.11, 3.12, 'pypy-3.10' ]
                 CC: [ gcc ]
                 CXX: [ g++ ]
 
                 # Add some other particular combinations to test
                 include:
                     # One in MacOS
                     - os: macos-latest
-                      py: 3.9
+                      py: 3.11
                       CC: cc
                       CXX: c++
 
                     # Check one with clang compiler
                     - os: ubuntu-latest
-                      py: 3.8
+                      py: 3.11
                       CC: clang
                       CXX: clang++
 
                     # Check one with gcc-11
                     - os: ubuntu-latest
-                      py: 3.9
+                      py: 3.11
                       CC: gcc-11
                       CXX: g++-11
 
                     # Check one on Windows
                     - os: windows-latest
-                      py: 3.9
+                      py: 3.11
                       CC: gcc
                       CXX: g++
 
@@ -109,7 +109,7 @@ jobs:
                 pip install -U -r requirements.txt
 
                 # Extra packages needed for testing
-                pip install -U nose mpi4py coverage mockmpi pytest
+                pip install -U coverage mockmpi pytest
 
                 # Note: I'd rather include h5py here, but I can't get it to install properly
                 # on GHA for pypy3.  So only do that for regular py3.
@@ -118,7 +118,14 @@ jobs:
               # They are slow to install on pypy, where some are installed from scratch.
               if: matrix.py > 3.0
               run: |
-                pip install -U matplotlib nbval ipykernel scipy pandas guppy3 h5py pyarrow
+                pip install -U matplotlib nbval ipykernel scipy pandas guppy3 h5py pyarrow mpi4py
+
+            - name: Install halotools
+              # halotools is currently (3/2024) broken on 3.7, 3.8, 3.12
+              # Just run on the ones we know it works.
+              if: ((matrix.py == '3.9') || (matrix.py == '3.10') || (matrix.py == '3.11')) && (matrix.os != 'windows-latest')
+              run: |
+                pip install -U halotools
 
             - name: Install fitsio everywhere but Windows
               if: matrix.os != 'windows-latest'
@@ -152,7 +159,8 @@ jobs:
             - name: Test MPI
               # The code is already mostly checked in the main tests with mock_mpi.
               # These just check that the code works when run in a real mpi session.
-              if: matrix.os != 'windows-latest'
+              # Skip windows and pypy for this.
+              if: (matrix.os != 'windows-latest') && (matrix.py > 3.0)
               run: |
                 cd tests
                 which -a mpiexec
@@ -162,7 +170,7 @@ jobs:
                 cd ..
 
             - name: Test Tutorial notebook
-              if: matrix.py == 3.7
+              if: matrix.py == '3.10'
               run: |
                 cd tests
                 pytest --nbval Tutorial.ipynb --sanitize-with sanitize.cfg --current-env

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -38,7 +38,7 @@ API Changes
 - Changed estimate_cov with method='shot' to only return the diagonal, rather than gratuitously
   making a full, mostly empty diagonal matrix. (#166)
 - Changed name of Catalog.write kwarg from cat_precision to just precision. (#169)
-- Added additionaly information in the header of output files to enable ``from_file``. (#172)
+- Added additionaly information in the header of output files to enable `Corr2.from_file`. (#172)
 
 
 Performance improvements
@@ -85,10 +85,12 @@ New features
   multipole algorithm or the old triangle algorithm. (#171)
 - Added serialization of rr, dr, etc. when writing with write_patch_results=True option,
   so you no longer have to separately write files for them to recover the covariance. (#172)
-- Added :ref:`from_file <GGCorrlation.from_file>` class methods to construct a Correlation
-  object from a file without needing to know the correct configuration parameters. (#172)
+- Added `Corr2.from_file` class methods to construct a Correlation object from a file without
+  needing to know the correct configuration parameters. (#172)
 - Added ``write_cov`` option to write functions to include the covariance in the output file.
   (#172)
+- Added complex, spin-0 correlations using the letter Z, including `NZCorrelation`,
+  `KZCorrelation`, and `ZZCorrelation`. (#174)
 
 
 Bug fixes

diff --git a/TreeCorr_LICENSE b/TreeCorr_LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2019, Mike Jarvis
+Copyright (c) 2003-2024, Mike Jarvis
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/devel/mock_comm_with_fork.py b/devel/mock_comm_with_fork.py
diff --git a/devel/mpi_example.py b/devel/mpi_example.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2019 by Mike Jarvis
+# Copyright (c) 2003-2024 by Mike Jarvis
 #
 # TreeCorr is free software: redistribution and use in source and binary forms,
 # with or without modification, are permitted provided that the following

diff --git a/docs/catalog.rst b/docs/catalog.rst
@@ -15,12 +15,18 @@ Other utilities related to catalogs
 .. autofunction::
     treecorr.calculateVarK
 .. autofunction::
-    treecorr.calculateVarG
+    treecorr.calculateVarZ
 .. autofunction::
     treecorr.calculateVarV
+.. autofunction::
+    treecorr.calculateVarG
+.. autofunction::
+    treecorr.calculateVarT
+.. autofunction::
+    treecorr.calculateVarQ
 .. automodule:: treecorr.catalog
     :members:
-    :exclude-members: Catalog, read_catalogs, calculateVarG, calculateVarK, calculateVarV
+    :exclude-members: Catalog, read_catalogs, calculateVarK, calculateVarZ, calculateVarV, calculateVarG, calculateVarT, calculateVatQ
 
 File Readers
 ------------

diff --git a/docs/correlation2.rst b/docs/correlation2.rst
@@ -10,6 +10,9 @@ correlation functions:
     nn
     nk
     kk
+    nz
+    kz
+    zz
     nv
     kv
     vv
@@ -18,10 +21,10 @@ correlation functions:
     gg
     nt
     kt
-    gt
+    tt
     nq
     kq
-    gq
+    qq
 
 Each of the above classes is a sub-class of the base class Corr2, so they have a number of
 features in common about how they are constructed.  The common features are documented here.

diff --git a/docs/correlation3.rst b/docs/correlation3.rst
@@ -11,17 +11,6 @@ auto-correlation functions:
     ggg
     kkk
 
-.. note::
-
-    There are classes that can handle cross-correlations of the same type:
-
-    * `treecorr.NNNCrossCorrelation`
-    * `treecorr.GGGCrossCorrelation`
-    * `treecorr.KKKCrossCorrelation`
-
-    However, we do not yet have the ability to compute 3-point cross-correlations across
-    different types (such as NNG or KGG, etc.)
-
 Each of the above classes is a sub-class of the base class Corr3, so they have a number of
 features in common about how they are constructed.  The common features are documented here.
 

diff --git a/docs/field.rst b/docs/field.rst
@@ -15,10 +15,19 @@ There are several kinds of `Field` classes.
     - `KField` holds both counts of objects and the mean "kappa" of those objects.
       It is used for correlations with a K in the name, including
       `KKCorrelation`, `NKCorrelation`, `KGCorrelation`, and `KKKCorrelation`.
+    - `ZField` holds both counts of objects and the mean complex spin-0 field of those objects.
+      It is used for correlations with a V in the name, including
+      `VVCorrelation`, `NVCorrelation`, and `KVCorrelation`.
+    - `VField` holds both counts of objects and the mean vector field of those objects.
+      It is used for correlations with a V in the name, including
+      `VVCorrelation`, `NVCorrelation`, and `KVCorrelation`.
     - `GField` holds both counts of objects and the mean shear of those objects.
       It is used for correlations with a G in the name, including
       `GGCorrelation`, `NGCorrelation`, `KGCorrelation`, and `GGGCorrelation`.
-    - `VField` holds both counts of objects and the mean velocity of those objects.
+    - `TField` holds both counts of objects and the mean spin-3 field of those objects.
+      It is used for correlations with a V in the name, including
+      `VVCorrelation`, `NVCorrelation`, and `KVCorrelation`.
+    - `QField` holds both counts of objects and the mean spin-4 field of those objects.
       It is used for correlations with a V in the name, including
       `VVCorrelation`, `NVCorrelation`, and `KVCorrelation`.
 
@@ -36,8 +45,17 @@ command do so for you.
 .. autoclass:: treecorr.KField
     :members:
 
-.. autoclass:: treecorr.GField
+.. autoclass:: treecorr.ZField
     :members:
 
 .. autoclass:: treecorr.VField
     :members:
+
+.. autoclass:: treecorr.GField
+    :members:
+
+.. autoclass:: treecorr.TField
+    :members:
+
+.. autoclass:: treecorr.QField
+    :members:
diff --git a/docs/ggg.rst b/docs/ggg.rst
@@ -6,9 +6,3 @@ GGGCorrelation: Shear-shear-shear correlations
     :members:
     :special-members:
     :show-inheritance:
-
-.. autoclass:: treecorr.GGGCrossCorrelation
-    :members:
-    :special-members:
-    :show-inheritance:
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,9 @@ correlation functions: @@
         nn
         nk
         kk
+        nz
+        kz
+        zz
         nv
         kv
         vv
@@ Expand All / @@ -18,10 +21,10 @@ correlation functions: @@
         gg
         nt
         kt
-        gt
+        tt
         nq
         kq
-        gq
+        qq
     Each of the above classes is a sub-class of the base class Corr2, so they have a number of
     features in common about how they are constructed.  The common features are documented here.
@@ Expand Down @@