Rename JComponent::Parameter::Configure() to Init()

JeffersonLab · Jan 28, 2025 · 3375883 · 3375883
1 parent 87ad1bc
commit 3375883
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/libraries/JANA/Components/JComponent.h b/src/libraries/JANA/Components/JComponent.h
@@ -31,7 +31,7 @@ class JComponent::ParameterRef : public JComponent::ParameterBase {
 
 protected:
 
-    void Configure(JParameterManager& parman, const std::string& prefix) override {
+    void Init(JParameterManager& parman, const std::string& prefix) override {
         if (m_is_shared || prefix.empty()) {
             parman.SetDefaultParameter(this->m_name, *m_data, this->m_description);
         }
@@ -76,7 +76,7 @@ class JComponent::Parameter : public JComponent::ParameterBase {
 
 protected:
 
-    void Configure(JParameterManager& parman, const std::string& prefix) override {
+    void Init(JParameterManager& parman, const std::string& prefix) override {
         if (m_is_shared || prefix.empty()) {
             parman.SetDefaultParameter(this->m_name, m_data, this->m_description);
         }

diff --git a/src/libraries/JANA/Components/JComponentFwd.h b/src/libraries/JANA/Components/JComponentFwd.h
@@ -126,7 +126,7 @@ struct JComponent {
         const std::string& GetDescription() { return m_description; }
         bool IsShared() { return m_is_shared; }
 
-        virtual void Configure(JParameterManager& parman, const std::string& prefix) = 0;
+        virtual void Init(JParameterManager& parman, const std::string& prefix) = 0;
         virtual void Wire(const std::map<std::string, std::string>& isolated, const std::map<std::string, std::string>& shared) = 0;
     };
 

diff --git a/src/libraries/JANA/Components/JOmniFactory.h b/src/libraries/JANA/Components/JOmniFactory.h
@@ -279,7 +279,7 @@ class JOmniFactory : public JMultifactory, public jana::components::JHasInputs {
 
     void Init() override {
         for (auto* parameter : m_parameters) {
-            parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+            parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
         }
         for (auto* service : m_services) {
             service->Fetch(m_app);

diff --git a/src/libraries/JANA/JEventFolder.h b/src/libraries/JANA/JEventFolder.h
@@ -58,7 +58,7 @@ class JEventFolder : public jana::components::JComponent,
         }
         // TODO: Obtain overrides of collection names from param manager
         for (auto* parameter : m_parameters) {
-            parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+            parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
         }
         for (auto* service : m_services) {
             service->Fetch(m_app);

diff --git a/src/libraries/JANA/JEventProcessor.h b/src/libraries/JANA/JEventProcessor.h
@@ -35,7 +35,7 @@ class JEventProcessor : public jana::components::JComponent,
     virtual void DoInitialize() {
         std::lock_guard<std::mutex> lock(m_mutex);
         for (auto* parameter : m_parameters) {
-            parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+            parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
         }
         for (auto* service : m_services) {
             service->Fetch(m_app);

diff --git a/src/libraries/JANA/JEventSource.cc b/src/libraries/JANA/JEventSource.cc
@@ -6,7 +6,7 @@ void JEventSource::DoInit() {
         throw JException("Attempted to initialize a JEventSource that is already initialized!");
     }
     for (auto* parameter : m_parameters) {
-        parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+        parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
     }
     for (auto* service : m_services) {
         service->Fetch(m_app);

diff --git a/src/libraries/JANA/JEventUnfolder.h b/src/libraries/JANA/JEventUnfolder.h
@@ -66,7 +66,7 @@ class JEventUnfolder : public jana::components::JComponent,
         }
         // TODO: Obtain overrides of collection names from param manager
         for (auto* parameter : m_parameters) {
-            parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+            parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
         }
         for (auto* service : m_services) {
             service->Fetch(m_app);

diff --git a/src/libraries/JANA/JFactory.cc b/src/libraries/JANA/JFactory.cc
@@ -98,7 +98,7 @@ void JFactory::DoInit() {
         return;
     }
     for (auto* parameter : m_parameters) {
-        parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+        parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
     }
     for (auto* service : m_services) {
         service->Fetch(m_app);

diff --git a/src/libraries/JANA/JMultifactory.cc b/src/libraries/JANA/JMultifactory.cc
@@ -69,13 +69,13 @@ void JMultifactory::DoInit() {
     if (m_status != Status::Uninitialized) {
         throw JException("Attempted to initialzie a JMultifactory that has already been initialized!");
     }
-    CallWithJExceptionWrapper("JMultifactory::Init", [&](){ Init(); });
     for (auto* parameter : m_parameters) {
-        parameter->Configure(*(m_app->GetJParameterManager()), m_prefix);
+        parameter->Init(*(m_app->GetJParameterManager()), m_prefix);
     }
     for (auto* service : m_services) {
         service->Fetch(m_app);
     }
+    CallWithJExceptionWrapper("JMultifactory::Init", [&](){ Init(); });
     m_status = Status::Initialized;
 }
 

diff --git a/src/libraries/JANA/JService.cc b/src/libraries/JANA/JService.cc
@@ -15,7 +15,7 @@ void JService::DoInit(JServiceLocator* sl) {
         m_logger = params->GetLogger(GetLoggerName());
 
         for (auto* parameter : m_parameters) {
-            parameter->Configure(*params, m_prefix);
+            parameter->Init(*params, m_prefix);
         }
 
         for (auto* service : m_services) {