diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index bf4a5c2..f945b23 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -11,16 +11,16 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v5.0.0 - name: Configure Git Credentials run: | git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6.0.0 with: python-version: 3.11 - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV - - uses: actions/cache@v3 + - uses: actions/cache@v4.3.0 with: key: mkdocs-material-${{ env.cache_id }} path: .cache diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 0ef00e2..5a2576d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,17 +23,17 @@ jobs: steps: - name: Checkout BrahMap repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 with: submodules: true - name: Install MPI - ${{ matrix.mpi }} - uses: mpi4py/setup-mpi@v1.3.1 + uses: mpi4py/setup-mpi@v1.3.5 with: mpi: ${{ matrix.mpi }} - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5.5.0 + uses: actions/setup-python@v6.0.0 with: python-version: ${{ matrix.python-version }} diff --git a/brahmap/lbsim/lbsim_GLS.py b/brahmap/lbsim/lbsim_GLS.py index 449da80..b2c2559 100644 --- a/brahmap/lbsim/lbsim_GLS.py +++ b/brahmap/lbsim/lbsim_GLS.py @@ -140,14 +140,14 @@ def LBSim_compute_GLS_maps( if len(components) > 1: lbs.mapmaking.destriper._sum_components_into_obs( - obs_list=observations, + obs_list=processed_samples.obs_list, target=components[0], other_components=components[1:], factor=1.0, ) time_ordered_data = np.concatenate( - [getattr(obs, components[0]) for obs in observations], axis=None + [getattr(obs, components[0]) for obs in processed_samples.obs_list], axis=None ) gls_result = compute_GLS_maps_from_PTS( diff --git a/tests/test_LBSim_GLS.py b/tests/test_LBSim_GLS.py index eafd9ac..ca62a98 100644 --- a/tests/test_LBSim_GLS.py +++ b/tests/test_LBSim_GLS.py @@ -95,16 +95,19 @@ def __init__(self, nside, dtype_float): if comm_size == 2: n_block_det = 2 n_block_time = 1 + num_of_obs_per_detector = 1 elif comm_size == 4: n_block_det = 2 n_block_time = 2 + num_of_obs_per_detector = 3 else: n_block_det = 1 n_block_time = self.comm.Get_size() + num_of_obs_per_detector = 2 self.sim.create_observations( detectors=dets, - num_of_obs_per_detector=3, + num_of_obs_per_detector=num_of_obs_per_detector, n_blocks_det=n_block_det, n_blocks_time=n_block_time, split_list_over_processes=False, diff --git a/tests/test_LBSim_noise_ops.py b/tests/test_LBSim_noise_ops.py index c65af88..25dac4c 100644 --- a/tests/test_LBSim_noise_ops.py +++ b/tests/test_LBSim_noise_ops.py @@ -25,6 +25,7 @@ class lbsim_simulation: def __init__(self): self.comm = lbs.MPI_COMM_WORLD tmp_dir = tempfile.TemporaryDirectory() + imo = lbs.Imo(flatfile_location=lbs.PTEP_IMO_LOCATION) self.sim = lbs.Simulation( base_path=tmp_dir.name, @@ -32,6 +33,7 @@ def __init__(self): duration_s=71, # Do not increase this number random_seed=65454, mpi_comm=self.comm, + imo=imo, ) self.detector_list = [