Request 197 (accepted)

Overview

Request 197 (accepted)

- Version 0.1.16

Created by matwey 7 months ago
In state accepted

Submit domecam

Submit package home:matwey:bra...s:domecam:swift / domecam to package domecam:swift / domecam

domecam.changes Changed

_service Changed

domecam-0.1.15.obscpio/.hgtags -> domecam-0.1.16.obscpio/.hgtags Changed

domecam-0.1.15.obscpio/CMakeLists.txt -> domecam-0.1.16.obscpio/CMakeLists.txt Changed

domecam-0.1.15.obscpio/include/executor/fits_sink_mixin.h -> domecam-0.1.16.obscpio/include/executor/fits_sink_mixin.h Changed

@@ -12,9 +12,9 @@
 
 #include <curl.h>
 #include <fits.h>
+#include <mjd_clock.h>
 #include <source.h>
 
-
 class fits_sink_mixin {
 private:
 	const std::string target_uri_;
@@ -123,6 +123,11 @@
 	f.update_key("FRATE",    s.frame_rate());
 	f.update_key("XBINNING", std::get<0>(s.binning()));
 	f.update_key("YBINNING", std::get<1>(s.binning()));
+
+	const double now_mjd{mjd_clock::now().time_since_epoch().count()};
+	for (const auto mjd_key: {"MJD-OBS", "MJD-BEG"}) {
+		f.update_key(mjd_key, now_mjd);
+	}
 }
 
 template<class T, std::size_t Align>
@@ -139,6 +144,15 @@
 template<class T, std::size_t Align>
 fits_sink_mixin::runner_mixin<T, Align>::runner_mixin(const fits_sink_mixin& e, std::size_t width, std::size_t height, std::size_t depth, const fits_source_base& source):
 	runner_mixin(e, width, height, depth, source.xoffset(), source.yoffset()) {
+
+	/* Key updating after image creation */
+	auto& f = get_fits();
+	const auto& src_fits = source.get_fits();
+	for (const auto mjd_key: {"MJD-OBS", "MJD-BEG"}) {
+		if (const auto mjd = src_fits.template read_key_optional<double>(mjd_key); mjd) {
+			f.update_key(mjd_key, *mjd);
+		}
+	}
 }
 
 template<class T, std::size_t Align>

domecam-0.1.16.obscpio/include/mjd_clock.h Added

@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Copyright (C) 2017-2023  Matwey V. Kornilov <matwey.kornilov@gmail.com>
+ */
+
+#ifndef _MJD_CLOCK_H
+#define _MJD_CLOCK_H
+
+#include <chrono>
+#include <ratio>
+#include <type_traits>
+
+
+struct mjd_clock {
+	using rep        = double;
+	using period     = std::ratio<86400>;
+	using duration   = std::chrono::duration<rep, period>;
+	using time_point = std::chrono::time_point<mjd_clock>;
+
+	static constexpr bool is_steady = std::chrono::system_clock::is_steady;
+	static constexpr std::chrono::duration<unsigned int, period> offset{40587u};
+
+	template<class Duration>
+	static constexpr auto
+	from_sys(const std::chrono::time_point<std::chrono::system_clock, Duration>& t) noexcept;
+
+	template<class Duration>
+	static constexpr auto
+	to_sys(const std::chrono::time_point<mjd_clock, Duration>& t) noexcept;
+
+	static time_point now() noexcept(noexcept(std::chrono::system_clock::now()));
+};
+
+template<class Duration>
+constexpr auto
+mjd_clock::from_sys(const std::chrono::time_point<std::chrono::system_clock, Duration>& t) noexcept {
+	const auto time_since_epoch = t.time_since_epoch() + offset;
+
+	return std::chrono::time_point<
+		mjd_clock,
+		std::decay_t<decltype(time_since_epoch)>
+	>{time_since_epoch};
+}
+
+template<class Duration>
+constexpr auto
+mjd_clock::to_sys(const std::chrono::time_point<mjd_clock, Duration>& t) noexcept {
+	const auto time_since_epoch = t.time_since_epoch() - offset;
+
+	return std::chrono::time_point<
+		std::chrono::system_clock,
+		std::decay_t<decltype(time_since_epoch)>
+	>{time_since_epoch};
+}
+
+#endif // _MJD_CLOCK_H

domecam-0.1.15.obscpio/include/source.h -> domecam-0.1.16.obscpio/include/source.h Changed

domecam-0.1.16.obscpio/src/mjd_clock.cpp Added

domecam.obsinfo Changed

Build Results
RPM Lint

Refresh

Comments for request 197 0

Request History

matwey created request 7 months ago

- Version 0.1.16

matwey accepted request 7 months ago