Merge branch 'master' into multithread-remove-weights

Author: arahlin

.github/workflows/cmake.yml

@@ -72,7 +72,7 @@ jobs:
       run: cmake --build . --config $BUILD_TYPE --parallel 4
 
     - name: Upload
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v7
       if: runner.environment == 'github-hosted'
       with:
         name: cmake-${{matrix.os}}-${{matrix.toolset}}

.github/workflows/wheels.yml

@@ -44,7 +44,7 @@ jobs:
           fetch-tags: true
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.3.0
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_BUILD: ${{ matrix.pyver }}-${{ matrix.build }}
           CIBW_BEFORE_ALL_LINUX: yum install -y zlib-devel bzip2-devel xz-devel netcdf-devel cfitsio-devel
@@ -74,7 +74,7 @@ jobs:
           CIBW_TEST_COMMAND: ctest --test-dir {package}/build --output-on-failure
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: cibw-wheel-${{ matrix.pyver }}-${{ matrix.build }}
           path: ./wheelhouse/spt3g*.whl
@@ -91,7 +91,7 @@ jobs:
       - name: Build sdist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
@@ -105,7 +105,7 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8
         with:
           # unpacks all CIBW artifacts into dist/
           pattern: cibw-*

maps/python/map_modules.py

@@ -921,6 +921,7 @@ def coadd_map_files(
     collate=False,
     weighted=True,
     record_obs_id=False,
+    return_outputs=False,
 ):
     """
     Coadd map files, optionally collating map Id's into separate frames.
@@ -951,12 +952,17 @@ def coadd_map_files(
         If True, include source name and observation ID info in the output coadd
         frame ``InputMapIds`` key, along with the map ID for each input frame.
         If False, only the map frame ID is included.
+    return_outputs : bool
+        If True, return output coadds from this function.  Assumed ``True`` if
+        ``output_file`` is not set.
 
     Returns
     -------
     maps : G3Frame or dict of G3Frames
         If ``collate`` is True, returns a dictionary of map frames
-        keyed by Id.  Otherwise, returns a single map frame.
+        keyed by Id.  Otherwise, returns a single map frame.  Only
+        returned if ``return_outputs`` is True or if ``output_file``
+        is not set.
     """
 
     pipe = core.G3Pipeline()
@@ -971,7 +977,7 @@ def coadd_map_files(
             weighted=weighted,
             drop_input_frames=True,
             record_obs_id=record_obs_id,
-            keep_outputs=True,
+            keep_outputs=return_outputs or not output_file,
         )
     pipe.Add(coadder)
 
@@ -982,9 +988,10 @@ def coadd_map_files(
         pipe.Add(core.G3Writer, filename=output_file)
     pipe.Run()
 
-    if collate:
-        return coadder.coadd_frames
-    return coadder.coadd_frame
+    if return_outputs or not output_file:
+        if collate:
+            return coadder.coadd_frames
+        return coadder.coadd_frame
 
 
 @core.indexmod