Skip to content
Snippets Groups Projects

AST-779 set up deconvolution repository

Merged Jakob Maljaars requested to merge ast-779-fill-deconvolution-repo into main

Merge request to migrate the deconvolution related functionality to the radler repository.

When reviewing this MR, please pay attention to:

  • repository structure
  • namespacing
  • CMake configuration

But please don't comment on code style (as far as this MR is concerned it's merely copy-paste work)

Edited by Jakob Maljaars

Merge request reports

Merge request pipeline #28328 passed

Merge request pipeline passed for 72cb8fe9

Approved by

Merged by Jakob MaljaarsJakob Maljaars 2 years ago (Apr 8, 2022 2:58pm UTC)

Merge details

  • Changes merged into main with df8a2004 (commits were squashed).
  • Deleted the source branch.
  • Auto-merge enabled

Pipeline #28329 passed

Pipeline passed for df8a2004 on main

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jakob Maljaars added 5 commits

    added 5 commits

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • fbad8861 - Check whether ci is triggered

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • 8f10d26a - Check whether ci is triggered

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • e5a1d2ff - Check whether ci is triggered

    Compare with previous version

  • Jakob Maljaars added 2 commits

    added 2 commits

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • 03ed93db - Add cmake configuration files

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • d0196f35 - Prepare for using radler as submodule

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • 59741f9b - CMake changes to allow radler compiling as submodule

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • 09675fd8 - Fix cmake for master project

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • e172af61 - Add ffmath compile flag for relevant files

    Compare with previous version

  • Jakob Maljaars marked this merge request as ready

    marked this merge request as ready

  • requested review from @mnijhuis-tos

  • Jakob Maljaars added 3 commits

    added 3 commits

    • 7817270e - Reduce deconvolution interface
    • 88c01352 - Extend componentlist with WriteSources method
    • 338d3d2c - Make transform shapes an enum class, expose multiscaletransorms header

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Jakob Maljaars changed the description

    changed the description

  • Jakob Maljaars added 1 commit

    added 1 commit

    • 7978d495 - Add static member to deconvolution class

    Compare with previous version

  • Mark de Wever
  • Jakob Maljaars added 1 commit

    added 1 commit

    • 839308d9 - Manually account for changes in deconvolution settings

    Compare with previous version

  • Jakob Maljaars added 1 commit

    added 1 commit

    • a1983082 - Add componentlist and simple clean test, adapt clang-format file for cpp 17

    Compare with previous version

  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • 1 // Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
    2 // SPDX-License-Identifier: GPL-3.0-or-later
    3
    4 #ifndef RADLER_ALGORITHMS_IUWT_DECONVOLUTION_H_
    5 #define RADLER_ALGORITHMS_IUWT_DECONVOLUTION_H_
    6
    7 #include <memory>
    8 #include <string>
    9
    10 #include <aocommon/uvector.h>
    11
    12 #include "deconvolutionalgorithm.h"
    13 #include "iuwtdeconvolutionalgorithm.h"
    14 #include "../imageset.h"
    15
    16 // TODO: consider merging IUWTDeconvolutionAlgorithms into this class.
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • 1 // Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
    2 // SPDX-License-Identifier: GPL-3.0-or-later
    3
    4 #ifndef RADLER_ALGORITHMS_SIMPLE_CLEAN_H_
    5 #define RADLER_ALGORITHMS_SIMPLE_CLEAN_H_
    6
    7 #include <cstring>
    8
    9 #ifdef __SSE__
    10 #define USE_INTRINSICS
  • Mark de Wever
  • Mark de Wever
  • Mark de Wever
  • Here my first set of comments. I probably want to look at a checkout of this repository later. The size of the patch makes Gitlabe quite laggy.

    Several comments occur at multiple locations, but I didn't mention all of them.

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading