diff --git a/quality/collector.cpp b/quality/collector.cpp index 16bb4907a38d98a7b478f68d16fe78c4fad2a345..21b0e94055a6fba80cb74e0ded619ade94657450 100644 --- a/quality/collector.cpp +++ b/quality/collector.cpp @@ -27,11 +27,9 @@ void Collector::Collect(const std::string& filename, const std::string stationName = ms->GetStationName(); std::vector<BandInfo> bands(bandCount); std::vector<std::vector<double>> frequencies(bandCount); - unsigned totalChannels = 0; for (unsigned b = 0; b < bandCount; ++b) { bands[b] = ms->GetBandInfo(b); frequencies[b].resize(bands[b].channels.size()); - totalChannels += bands[b].channels.size(); for (unsigned c = 0; c < bands[b].channels.size(); ++c) { frequencies[b][c] = bands[b].channels[c].frequencyHz; } diff --git a/scripts/docker/Centos8 b/scripts/docker/Centos8 index 0f90111a98fafdc62c370538b89a4bdea6fae42a..d22e3c0b260dced7622eee1c3ce9f77dcd9db091 100644 --- a/scripts/docker/Centos8 +++ b/scripts/docker/Centos8 @@ -51,6 +51,6 @@ WORKDIR /src RUN mkdir /build && cd /build && cmake ../src -RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all` +RUN cd /build && make -j`nproc --all` && make install RUN cd /build/python && echo "import aoflagger" | python3 diff --git a/scripts/docker/Debian b/scripts/docker/Debian index 7261d663267ad84e381d6c9fc18ed7d5005b50e0..c2c566decaabb1800da0b2d511d18ae777a33518 100644 --- a/scripts/docker/Debian +++ b/scripts/docker/Debian @@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ liblua5.3-dev \ python3 \ libpython3-dev \ - libboost-date-time-dev libboost-system-dev libboost-test-dev \ + libboost-date-time-dev libboost-system-dev \ libgtkmm-3.0-dev \ libcfitsio-dev \ libfftw3-dev \ @@ -23,6 +23,6 @@ WORKDIR /src RUN mkdir /build && cd /build && cmake ../src -RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all` +RUN cd /build && make -j`nproc --all` && make install RUN cd /build/python && echo "import aoflagger" | python3.10 diff --git a/scripts/docker/Ubuntu18-gcc-11 b/scripts/docker/Ubuntu18-gcc-11 index a54f0807f955eaa4c2a76f6a15aa2cb1f18a6288..00a09ec56619e43ff1dbb9009fd1430ca2018434 100644 --- a/scripts/docker/Ubuntu18-gcc-11 +++ b/scripts/docker/Ubuntu18-gcc-11 @@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ liblua5.3-dev \ python3 \ libpython3-dev \ - libboost-date-time-dev libboost-system-dev libboost-test-dev \ + libboost-date-time-dev libboost-system-dev \ libgtkmm-3.0-dev \ libcfitsio-dev \ libfftw3-dev \ @@ -30,5 +30,5 @@ WORKDIR /src RUN \ mkdir /build && cd /build && cmake ../src && \ - cd /build && make -j`nproc` && make install && make check -j`nproc` && \ + cd /build && make -j`nproc` && make install && \ cd /build/python && echo "import aoflagger" | python3 diff --git a/scripts/docker/Ubuntu18-nogui b/scripts/docker/Ubuntu18-nogui index 5688bb21833f55b7c59c74cf93e66eb185d67c7f..26cefb5c441630272da17f22174f947e7affe3d9 100644 --- a/scripts/docker/Ubuntu18-nogui +++ b/scripts/docker/Ubuntu18-nogui @@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ python3 \ python3-distutils \ libpython3-dev \ - libboost-date-time-dev libboost-system-dev libboost-test-dev \ + libboost-date-time-dev libboost-system-dev \ libcfitsio-dev \ libfftw3-dev \ libgsl-dev \ @@ -33,7 +33,6 @@ RUN \ cd /build && \ cmake ../src && \ make -j`nproc` && \ - make install && \ - make check -j`nproc` + make install RUN cd /build/python && echo "import aoflagger" | python3 diff --git a/scripts/docker/Ubuntu20 b/scripts/docker/Ubuntu20 index 190ef1ba4f8292516746de1f01946b008843dd15..0625a05161c910af653f8bd3f64269680f2c72e4 100644 --- a/scripts/docker/Ubuntu20 +++ b/scripts/docker/Ubuntu20 @@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ liblua5.3-dev \ python3 \ libpython3-dev \ - libboost-date-time-dev libboost-system-dev libboost-test-dev \ + libboost-date-time-dev libboost-system-dev \ libgtkmm-3.0-dev \ libcfitsio-dev \ libfftw3-dev \ @@ -23,6 +23,6 @@ WORKDIR /src RUN mkdir /build && cd /build && cmake ../src -RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all` +RUN cd /build && make -j`nproc --all` && make install RUN cd /build/python && echo "import aoflagger" | python3 diff --git a/scripts/docker/Ubuntu21 b/scripts/docker/Ubuntu22 similarity index 74% rename from scripts/docker/Ubuntu21 rename to scripts/docker/Ubuntu22 index 1175ad231f7fb53301b2fe7cbbbafea3d67e7974..36028cc5743463d5885fb47e73657703f8b8886a 100644 --- a/scripts/docker/Ubuntu21 +++ b/scripts/docker/Ubuntu22 @@ -1,4 +1,4 @@ -FROM ubuntu:21.04 +FROM ubuntu:22.04 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ apt-get install -y \ @@ -9,7 +9,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ libblas-dev liblapack-dev \ liblua5.3-dev \ libpython3-dev \ - libboost-date-time-dev libboost-system-dev libboost-test-dev \ + libboost-date-time-dev libboost-system-dev \ libgtkmm-3.0-dev \ libcfitsio-dev \ libfftw3-dev \ @@ -22,6 +22,6 @@ WORKDIR /src RUN mkdir /build && cd /build && cmake ../src -RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all` +RUN cd /build && make -j`nproc --all` && make install RUN cd /build/python && echo "import aoflagger" | python3 diff --git a/scripts/docker/Ubuntu21-clang-libcxx b/scripts/docker/Ubuntu22-clang-libcxx similarity index 94% rename from scripts/docker/Ubuntu21-clang-libcxx rename to scripts/docker/Ubuntu22-clang-libcxx index ffb6555ca584c18cdfd1c74085fa1a7779d21d15..1f0c883e1a90adb2adc0e0d12514d5eb473a5357 100644 --- a/scripts/docker/Ubuntu21-clang-libcxx +++ b/scripts/docker/Ubuntu22-clang-libcxx @@ -1,4 +1,4 @@ -FROM ubuntu:21.04 +FROM ubuntu:22.04 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ apt-get install -y \ @@ -55,6 +55,6 @@ WORKDIR /src RUN mkdir /build && cd /build && cmake ../src -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_CXX_FLAGS="-stdlib=libc++" -RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all` +RUN cd /build && make -j`nproc --all` && make install RUN cd /build/python && echo "import aoflagger" | python3