Request 198 (accepted)

domecam.changes Changed

_service Changed

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

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

domecam-0.1.17.obscpio/doc/example/bias.config Added

domecam-0.1.16.obscpio/include/camera.h -> domecam-0.1.17.obscpio/include/camera.h Changed

domecam-0.1.16.obscpio/include/exe/domecam-proc/executor.h -> domecam-0.1.17.obscpio/include/exe/domecam-proc/executor.h Changed

domecam-0.1.16.obscpio/include/executor.h -> domecam-0.1.17.obscpio/include/executor.h Changed

domecam-0.1.16.obscpio/include/executor/acf.h -> domecam-0.1.17.obscpio/include/executor/acf.h Changed

domecam-0.1.17.obscpio/include/executor/bias.h Added

@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Copyright (C) 2017-2023  Matwey V. Kornilov <matwey.kornilov@gmail.com>
+ */
+
+#ifndef _EXECUTOR_BIAS_H
+#define _EXECUTOR_BIAS_H
+
+#include <executorfwd.h>
+#include <executor/raw.h>
+
+
+class bias_executor_base:
+	public raw_executor_base {
+protected:
+	template<class SourceMixin> class runner;
+public:
+	explicit bias_executor_base(const std::string& target_uri);
+
+	const char* executor_name() const override;
+
+	static camera& prepare_camera(camera& c);
+};
+
+template<class SourceMixin>
+class bias_executor_base::runner:
+	public raw_executor_base::runner<SourceMixin> {
+public:
+	template<class Executor, class... Args>
+	runner(const Executor& e, camera& c, Args&&... args):
+		raw_executor_base::runner<SourceMixin>(e,
+			bias_executor_base::prepare_camera(c),
+			std::forward<Args>(args)...) {}
+};
+
+class bias_executor:
+	public camera_executor,
+	public bias_executor_base {
+public:
+	bias_executor(const std::string& target_uri, std::size_t frames_number);
+
+	virtual executor_result run(camera& c) const override;
+};
+
+#endif // _EXECUTOR_BIAS_H

domecam-0.1.16.obscpio/include/executor/binary.h -> domecam-0.1.17.obscpio/include/executor/binary.h Changed

domecam-0.1.16.obscpio/include/executor/clean.h -> domecam-0.1.17.obscpio/include/executor/clean.h Changed

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

domecam-0.1.16.obscpio/include/executor/gain.h -> domecam-0.1.17.obscpio/include/executor/gain.h Changed

domecam-0.1.16.obscpio/include/executor/grad.h -> domecam-0.1.17.obscpio/include/executor/grad.h Changed

domecam-0.1.17.obscpio/include/executor/mean_bias.h Added

@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Copyright (C) 2017-2023  Matwey V. Kornilov <matwey.kornilov@gmail.com>
+ */
+
+#ifndef _EXECUTOR_MEAN_BIAS_H
+#define _EXECUTOR_MEAN_BIAS_H
+
+#include <executorfwd.h>
+#include <executor/bias.h>
+#include <executor/mean_raw.h>
+
+
+class mean_bias_executor_base:
+	public mean_raw_executor_base {
+protected:
+	template<class SourceMixin> class runner;
+public:
+	explicit mean_bias_executor_base(const std::string& target_uri);
+
+	const char* executor_name() const override;
+};
+
+template<class SourceMixin>
+class mean_bias_executor_base::runner:
+	public mean_raw_executor_base::runner<SourceMixin> {
+public:
+	template<class Executor, class... Args>
+	runner(const Executor& e, camera& c, Args&&... args):
+		mean_raw_executor_base::runner<SourceMixin>(e,
+			bias_executor_base::prepare_camera(c),
+			std::forward<Args>(args)...) {}
+};
+
+class mean_bias_executor:
+	public camera_executor,
+	public mean_bias_executor_base {
+public:
+	mean_bias_executor(const std::string& target_uri, std::size_t frames_number);
+
+	virtual executor_result run(camera& c) const override;
+};
+
+
+#endif // _EXECUTOR_MEAN_BIAS_H

domecam-0.1.16.obscpio/include/executor/mean_pupil_mask.h -> domecam-0.1.17.obscpio/include/executor/mean_pupil_mask.h Changed

domecam-0.1.16.obscpio/include/executor/mean_raw.h -> domecam-0.1.17.obscpio/include/executor/mean_raw.h Changed

domecam-0.1.16.obscpio/include/executor/normalized_clean.h -> domecam-0.1.17.obscpio/include/executor/normalized_clean.h Changed

domecam-0.1.16.obscpio/include/executor/pupil_mask.h -> domecam-0.1.17.obscpio/include/executor/pupil_mask.h Changed

domecam-0.1.16.obscpio/include/executor/raw.h -> domecam-0.1.17.obscpio/include/executor/raw.h Changed

domecam-0.1.16.obscpio/include/executor/relative_clean.h -> domecam-0.1.17.obscpio/include/executor/relative_clean.h Changed

domecam-0.1.16.obscpio/include/fits.h -> domecam-0.1.17.obscpio/include/fits.h Changed

@@ -50,6 +50,9 @@
 template<> struct type_to_cfitsio_code<double> {
 	static constexpr int value = TDOUBLE;
 };
+template<> struct type_to_cfitsio_code<const char*> {
+	static constexpr int value = TSTRING;
+};
 
 template<> struct type_to_cfitsio_img_code<uint8_t> {
 	static constexpr int value = BYTE_IMG;
@@ -346,13 +349,21 @@
 		return *value;
 	}
 
-	template<class T, int code = detail::type_to_cfitsio_code<T>::value>
+	template<class T, int code = detail::type_to_cfitsio_code<std::decay_t<T>>::value>
 	void update_key(const std::string& key, const T& value, const std::string& comment = std::string()) {
+		using value_type = std::decay_t<T>;
+
 		int status = 0;
 
-		fits_update_key(file_.get(), code, key.c_str(),
-			const_cast<void*>(static_cast<const void*>(&value)),
-			comment.c_str(), &status);
+		const void* ptr;
+
+		if constexpr(std::is_pointer_v<value_type>) {
+			ptr = static_cast<const void*>(value);
+		} else {
+			ptr = static_cast<const void*>(&value);
+		}
+
+		fits_update_key(file_.get(), code, key.c_str(), const_cast<void*>(ptr), comment.c_str(), &status);
 
 		cfitsio_error::throw_on_error(status);
 	}

domecam-0.1.16.obscpio/src/camera.cpp -> domecam-0.1.17.obscpio/src/camera.cpp Changed

domecam-0.1.16.obscpio/src/executor/acf.cpp -> domecam-0.1.17.obscpio/src/executor/acf.cpp Changed

domecam-0.1.17.obscpio/src/executor/bias.cpp Added

domecam-0.1.16.obscpio/src/executor/binary.cpp -> domecam-0.1.17.obscpio/src/executor/binary.cpp Changed

domecam-0.1.16.obscpio/src/executor/clean.cpp -> domecam-0.1.17.obscpio/src/executor/clean.cpp Changed

domecam-0.1.16.obscpio/src/executor/fits_sink_mixin.cpp -> domecam-0.1.17.obscpio/src/executor/fits_sink_mixin.cpp Changed

domecam-0.1.16.obscpio/src/executor/gain.cpp -> domecam-0.1.17.obscpio/src/executor/gain.cpp Changed

domecam-0.1.16.obscpio/src/executor/grad.cpp -> domecam-0.1.17.obscpio/src/executor/grad.cpp Changed

domecam-0.1.17.obscpio/src/executor/mean_bias.cpp Added

domecam-0.1.16.obscpio/src/executor/mean_pupil_mask.cpp -> domecam-0.1.17.obscpio/src/executor/mean_pupil_mask.cpp Changed

domecam-0.1.16.obscpio/src/executor/mean_raw.cpp -> domecam-0.1.17.obscpio/src/executor/mean_raw.cpp Changed

domecam-0.1.16.obscpio/src/executor/normalized_clean.cpp -> domecam-0.1.17.obscpio/src/executor/normalized_clean.cpp Changed

domecam-0.1.16.obscpio/src/executor/pupil_mask.cpp -> domecam-0.1.17.obscpio/src/executor/pupil_mask.cpp Changed

domecam-0.1.16.obscpio/src/executor/raw.cpp -> domecam-0.1.17.obscpio/src/executor/raw.cpp Changed

domecam-0.1.16.obscpio/src/executor/relative_clean.cpp -> domecam-0.1.17.obscpio/src/executor/relative_clean.cpp Changed

domecam-0.1.16.obscpio/src/io.cpp -> domecam-0.1.17.obscpio/src/io.cpp Changed

@@ -36,6 +36,10 @@
 		return std::unique_ptr<executor>{new raw_scan_executor{
 			value_to<std::string>(obj.at("filename")),
 			value_to<std::size_t>(obj.at("frames_number")), axis}};
+	} else if (type == "bias") {
+		return std::unique_ptr<executor>{new bias_executor{
+			value_to<std::string>(obj.at("filename")),
+			value_to<std::size_t>(obj.at("frames_number"))}};
 	} else if (type == "grad") {
 		return std::unique_ptr<executor>{new grad_executor{
 			value_to<std::string>(obj.at("filename")),
@@ -74,6 +78,10 @@
 		return std::unique_ptr<executor>{new mean_raw_executor{
 			value_to<std::string>(obj.at("filename")),
 			value_to<std::size_t>(obj.at("frames_number"))}};
+	} else if (type == "mean_bias") {
+		return std::unique_ptr<executor>{new mean_bias_executor{
+			value_to<std::string>(obj.at("filename")),
+			value_to<std::size_t>(obj.at("frames_number"))}};
 	} else if (type == "gain") {
 		return std::unique_ptr<executor>{new gain_executor{
 			value_to<std::string>(obj.at("filename")),

domecam.obsinfo Changed

Overview

Request 198 (accepted)

Request History