Recombine all ACADA data sources into one SWIG interface

sfegan · Sep 12, 2024 · fb99a86 · fb99a86
1 parent 35962b6
commit fb99a86
Show file tree

Hide file tree

Showing 8 changed files with 560 additions and 452 deletions.
diff --git a/include/iact_data/acada_data_source.hpp b/include/iact_data/acada_data_source.hpp
@@ -154,6 +154,7 @@ CALIN_TYPEALIAS(ACADA_HeaderMessage_R1v0, ProtoR1::CameraConfiguration);
 
 CALIN_TYPEALIAS(ACADA_EventMessage_R1v1, R1v1::Event);
 CALIN_TYPEALIAS(ACADA_HeaderMessage_R1v1, R1v1::CameraConfiguration);
+CALIN_TYPEALIAS(ACADA_DataStreamMessage_R1v1, R1v1::TelescopeDataStream);
 
 } } } // namespace calin::iact_data::zfits_actl_data_source
 
diff --git a/include/iact_data/zfits_acada_data_source.hpp b/include/iact_data/zfits_acada_data_source.hpp
@@ -36,6 +36,29 @@ std::vector<std::string> get_zfits_table_column_names(std::string filename, std:
 std::vector<std::string> get_zfits_table_keys(std::string filename, std::string tablename);
 std::map<std::string,std::string> get_zfits_table_key_values(std::string filename, std::string tablename);
 
+template<typename Message>
+class ZFITSSingleFileSingleMessageDataSource:
+  public virtual calin::io::data_source::RandomAccessDataSource<Message>
+{
+public:
+  CALIN_TYPEALIAS(message_type, Message);
+
+  ZFITSSingleFileSingleMessageDataSource(const std::string& filename, const std::string& tablename = {});
+  virtual ~ZFITSSingleFileSingleMessageDataSource();
+
+  message_type* get_next(uint64_t& seq_index_out,
+    google::protobuf::Arena** arena = nullptr) override;
+  uint64_t size() override;
+  void set_next_index(uint64_t next_index) override;
+
+private:
+  std::string filename_;
+  std::string tablename_;
+  ADH::IO::ProtobufIFits* zfits_ = nullptr;
+  calin::ix::provenance::chronicle::FileIORecord* file_record_ = nullptr;
+  uint64_t next_message_index_ = 0;
+};
+
 template<typename EventMessage, typename HeaderMessage>
 class ZFITSSingleFileACADACameraEventDataSource:
   public calin::iact_data::acada_data_source::

diff --git a/src/iact_data/zfits_acada_data_source.cpp b/src/iact_data/zfits_acada_data_source.cpp
@@ -59,6 +59,7 @@ namespace {
   template<> std::string default_message_table_name<ACADA_EventMessage_R1v0>() { return "Events"; }
   template<> std::string default_message_table_name<ACADA_HeaderMessage_R1v1>() { return "CameraConfiguration"; }
   template<> std::string default_message_table_name<ACADA_EventMessage_R1v1>() { return "Events"; }
+  template<> std::string default_message_table_name<ACADA_DataStreamMessage_R1v1>() { return "DataStream"; }
 } // anonymous namespace
 
 std::vector<std::string> calin::iact_data::zfits_acada_data_source::
@@ -135,6 +136,84 @@ get_zfits_table_key_values(std::string filename, std::string tablename)
   return key_values;
 }
 
+// =============================================================================
+// =============================================================================
+// =============================================================================
+//
+// ZFITSSingleFileSingleMessageDataSource - single ZFits file source of 
+// single message type (for debugging purposes)
+// 
+// =============================================================================
+// =============================================================================
+// =============================================================================
+
+template<typename Message> ZFITSSingleFileSingleMessageDataSource<Message>::
+ZFITSSingleFileSingleMessageDataSource(
+    const std::string& filename, const std::string& tablename):
+  calin::io::data_source::RandomAccessDataSource<Message>(),
+  filename_(expand_filename(filename)), 
+  tablename_(tablename.empty() ? default_message_table_name<Message>() : tablename)
+{
+  if(!is_file(filename_))
+    throw std::runtime_error(std::string("No such file: ")+filename_);
+  if(!is_readable(filename_))
+    throw std::runtime_error(std::string("File not readable: ")+filename_);
+
+  zfits_ = new ADH::IO::ProtobufIFits(filename_, tablename_, Message::descriptor());
+  if(zfits_->eof() && !zfits_->bad())
+    throw std::runtime_error("ZFits file " + filename_ + " has no table: " + tablename_);
+
+  file_record_ = calin::provenance::chronicle::register_file_open(filename_,
+    calin::ix::provenance::chronicle::AT_READ, __PRETTY_FUNCTION__);
+}
+
+template<typename Message> ZFITSSingleFileSingleMessageDataSource<Message>::
+~ZFITSSingleFileSingleMessageDataSource()
+{
+  delete zfits_;
+  calin::provenance::chronicle::register_file_close(file_record_);
+}
+
+template<typename Message> Message* 
+ZFITSSingleFileSingleMessageDataSource<Message>::get_next(uint64_t& seq_index_out,
+  google::protobuf::Arena** arena)
+{
+  if(arena)*arena = nullptr;
+
+  uint64_t max_seq_index = zfits_->getNumMessagesInTable();
+  if(next_message_index_ >= max_seq_index)return nullptr;
+
+  seq_index_out = next_message_index_;
+  const Message* message {
+    zfits_->borrowTypedMessage<Message>(++next_message_index_) };
+  if(message == nullptr)throw std::runtime_error("ZFits reader returned NULL");
+
+  Message* message_copy = nullptr;
+  if(arena && *arena)
+    throw std::runtime_error("ZFITSSingleFileSingleMessageDataSource::get_next: "
+      " pre-allocated arena not supported."); // ADH library does not support arenas
+
+  message_copy = new Message;
+  message_copy->CopyFrom(*message);
+
+  zfits_->returnBorrowedMessage(message);
+
+  return message_copy;
+}
+
+template<typename Message> uint64_t
+ZFITSSingleFileSingleMessageDataSource<Message>::size()
+{
+  return zfits_->getNumMessagesInTable();
+}
+
+template<typename Message> void
+ZFITSSingleFileSingleMessageDataSource<Message>::
+set_next_index(uint64_t next_index)
+{
+  uint64_t max_seq_index = zfits_->getNumMessagesInTable();
+  next_message_index_ = std::min(next_index, max_seq_index);
+}
 
 // =============================================================================
 // =============================================================================
@@ -574,14 +653,21 @@ ZFITSACADACameraEventDataSourceOpener<EventMessage,HeaderMessage>::default_confi
 
 namespace calin { namespace iact_data { namespace zfits_acada_data_source {
 
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_EventMessage_L0>;
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_HeaderMessage_L0>;
 template class ZFITSSingleFileACADACameraEventDataSource<ACADA_EventMessage_L0, ACADA_HeaderMessage_L0>;
 template class ZFITSACADACameraEventDataSource<ACADA_EventMessage_L0, ACADA_HeaderMessage_L0>;
 template class ZFITSACADACameraEventDataSourceOpener<ACADA_EventMessage_L0, ACADA_HeaderMessage_L0>;
 
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_EventMessage_R1v0>;
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_HeaderMessage_R1v0>;
 template class ZFITSSingleFileACADACameraEventDataSource<ACADA_EventMessage_R1v0, ACADA_HeaderMessage_R1v0>;
 template class ZFITSACADACameraEventDataSource<ACADA_EventMessage_R1v0, ACADA_HeaderMessage_R1v0>;
 template class ZFITSACADACameraEventDataSourceOpener<ACADA_EventMessage_R1v0, ACADA_HeaderMessage_R1v0>;
 
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_EventMessage_R1v1>;
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_HeaderMessage_R1v1>;
+template class ZFITSSingleFileSingleMessageDataSource<ACADA_DataStreamMessage_R1v1>;
 template class ZFITSSingleFileACADACameraEventDataSource<ACADA_EventMessage_R1v1, ACADA_HeaderMessage_R1v1>;
 template class ZFITSACADACameraEventDataSource<ACADA_EventMessage_R1v1, ACADA_HeaderMessage_R1v1>;
 template class ZFITSACADACameraEventDataSourceOpener<ACADA_EventMessage_R1v1, ACADA_HeaderMessage_R1v1>;

diff --git a/swig/iact_data/CMakeLists.txt b/swig/iact_data/CMakeLists.txt
@@ -17,8 +17,7 @@ set(CALIN_SWIG_FILES algorithms.i # telescope_data_source.i
 	event_visitor.i event_dispatcher.i
 	instrument_layout.i nectarcam_layout.i lstcam_layout.i
 	waveform_treatment_event_visitor.i nectarcam_ancillary_data.i
-	raw_acada_event_data_source_l0.i raw_acada_event_data_source_r1v0.i
-	raw_acada_event_data_source_r1v1.i)
+	raw_acada_event_data_source.i)
 set(CALIN_SWIG_TARGET iact_data)
 
 include_directories(${CTA_ADH_APIS_INCLUDE_DIRS})