diff --git a/.miv_gitlab-ci.yml b/.miv_gitlab-ci.yml index 99946457..efd85224 100644 --- a/.miv_gitlab-ci.yml +++ b/.miv_gitlab-ci.yml @@ -1,5 +1,9 @@ stages: - mirror + - build + - publish + + mirror-psi: stage: mirror @@ -25,3 +29,12 @@ mirror-psi: - if: '$MODE != "sync"' when: never - when: always + + +include: + - project: 'kits-maxiv/cfg-maxiv-gitlabci' + file: '/Docker.gitlab-ci.yml' + +variables: + DOCKER_REGISTRY: "harbor.maxiv.lu.se/daq" + GIT_SUBMODULE_STRATEGY: recursive diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..717e31ee --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM harbor.maxiv.lu.se/dockerhub/library/ubuntu:22.04 + +RUN set -ex; \ + apt-get update; \ + apt-get install -y pkg-config git cmake make g++ libhdf5-dev libczmq-dev;\ + rm -rf /var/lib/apt/lists/* + + +COPY . /usr/src/nextgendcu + +RUN set -ex; \ + cd /usr/src/nextgendcu; \ + mkdir build; \ + cd build; \ + cmake -DJFJOCH_WRITER_ONLY=ON .. ;\ + make -j8 install; + +ENTRYPOINT ["/opt/jfjoch/bin/jfjoch_writer"] diff --git a/receiver/JFJochReceiver.cpp b/receiver/JFJochReceiver.cpp index a566f49f..6766fd71 100644 --- a/receiver/JFJochReceiver.cpp +++ b/receiver/JFJochReceiver.cpp @@ -353,7 +353,7 @@ void JFJochReceiver::FrameTransformationThread() { message.receiver_aq_dev_delay = delay; } - metadata.Export(message, 128 * experiment.GetModulesNum() * experiment.GetSummation()); + metadata.Export(message, 256 * experiment.GetModulesNum() * experiment.GetSummation()); if (message.image_collection_efficiency == 0.0f) { plots.AddEmptyImage(message); continue; diff --git a/tests/NeuralNetResPredictorTest.cpp b/tests/NeuralNetResPredictorTest.cpp index f6ad6620..a7ced2a4 100644 --- a/tests/NeuralNetResPredictorTest.cpp +++ b/tests/NeuralNetResPredictorTest.cpp @@ -45,7 +45,6 @@ TEST_CASE("NeuralNetResPredictor_Inference", "[LinearAlgebra][Coord]") { dataset.ReadVector(image_conv, start, file_size); auto res = predictor.Inference(experiment, image_conv.data()); - std::cout << res << std::endl; REQUIRE(res < 1.5); REQUIRE(res > 1.4); }