Renaming Source na DataSource

e4hsource/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(e4hsource SHARED src/EDM4hepSource.cxx)
+add_library(e4hsource SHARED src/EDM4hepDataSource.cxx)
 target_include_directories(e4hsource PUBLIC include)
 target_link_libraries(e4hsource PUBLIC ROOT::RIO
                                        ROOT::ROOTDataFrame
@@ -7,10 +7,10 @@ target_link_libraries(e4hsource PUBLIC ROOT::RIO
                                        EDM4HEP::edm4hepDict
 )
 
-ROOT_GENERATE_DICTIONARY(G__FCCAnalyses_EDM4hepSource
-                         include/EDM4hepSource/EDM4hepSource.hxx
+ROOT_GENERATE_DICTIONARY(G__FCCAnalyses_EDM4hepDataSource
+                         include/EDM4hepDataSource/EDM4hepDataSource.hxx
                          MODULE e4hsource
-                         LINKDEF include/EDM4hepSource/LinkDef.h
+                         LINKDEF include/EDM4hepDataSource/LinkDef.h
 )
 
 install(TARGETS e4hsource
@@ -38,9 +38,9 @@ target_link_libraries(e4hlegacysource PUBLIC ROOT::RIO
 )
 
 ROOT_GENERATE_DICTIONARY(G__FCCAnalyses_EDM4hepLegacySource
-                         include/EDM4hepSource/EDM4hepLegacySource.hxx
+                         include/EDM4hepDataSource/EDM4hepLegacySource.hxx
                          MODULE e4hlegacysource
-                         LINKDEF include/EDM4hepSource/Legacy_LinkDef.h
+                         LINKDEF include/EDM4hepDataSource/Legacy_LinkDef.h
 )
 
 install(TARGETS e4hlegacysource

e4hsource/include/EDM4hepSource/EDM4hepSource.hxx → e4hsource/include/EDM4hepDataSource/EDM4hepDataSource.hxx

@@ -1,5 +1,5 @@
-#ifndef EDM4HEP_SOURCE_H__
-#define EDM4HEP_SOURCE_H__
+#ifndef EDM4HEP_DATASOURCE_H__
+#define EDM4HEP_DATASOURCE_H__
 
 // STL
 #include <memory>
@@ -16,16 +16,16 @@
 #include <podio/ROOTFrameReader.h>
 #include <podio/CollectionBase.h>
 
-bool loadEDM4hepSource();
+bool loadEDM4hepDataSource();
 
 namespace FCCAnalyses {
   using Record_t = std::vector<void*>;
 
-  class EDM4hepSource final : public ROOT::RDF::RDataSource {
+  class EDM4hepDataSource final : public ROOT::RDF::RDataSource {
     public:
-      EDM4hepSource(const std::string& filePath, int nEvents = -1);
-      EDM4hepSource(const std::vector<std::string>& filePathList,
-                    int nEvents = -1);
+      EDM4hepDataSource(const std::string& filePath, int nEvents = -1);
+      EDM4hepDataSource(const std::vector<std::string>& filePathList,
+                        int nEvents = -1);
 
       void SetNSlots(unsigned int nSlots);
 
@@ -85,13 +85,13 @@ namespace FCCAnalyses {
 
 
   /**
-   * \brief Retrieve from EDM4hepSource per-thread readers for the
+   * \brief Retrieve from EDM4hepDataSource per-thread readers for the
    *        desired columns.
    */
   template<typename T>
   std::vector<T**>
-  EDM4hepSource::GetColumnReaders(std::string_view columnName) {
-    std::cout << "EDM4hepSource: Getting column readers for column: "
+  EDM4hepDataSource::GetColumnReaders(std::string_view columnName) {
+    std::cout << "EDM4hepDataSource: Getting column readers for column: "
               << columnName << std::endl;
 
     std::vector<T**> readers;
@@ -102,4 +102,4 @@ namespace FCCAnalyses {
   ROOT::RDataFrame FromEDM4hep(const std::vector<std::string>& filePathList);
 }
 
-#endif /* EDM4HEP_SOURCE_H__ */
+#endif /* EDM4HEP_DATASOURCE_H__ */

e4hsource/include/EDM4hepSource/LinkDef.h → e4hsource/include/EDM4hepDataSource/LinkDef.h

@@ -7,10 +7,10 @@
 #pragma link C++ nestedclasses;
 
 // Load function
-#pragma link C++ function loadEDM4hepSource;
+#pragma link C++ function loadEDM4hepDataSource;
 
 // Source
-#pragma link C++ class FCCAnalyses::EDM4hepSource;
+#pragma link C++ class FCCAnalyses::EDM4hepDataSource;
 #pragma link C++ function FCCAnalyses::FromEDM4hep;
 
 #endif