Changeset f6f761

Timestamp:

Oct 2, 2016, 11:51:00 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_FitPotential_needs_atomicnumbers

Children:

8d5db8

Parents:

5cdfac

git-author:

Frederik Heber <heber@…> (10/02/16 11:50:53)

git-committer:

Frederik Heber <heber@…> (10/02/16 11:51:00)

Message:

REFACTOR: Extracted registerPotentialIfNotPresent out of PotentialFitPotentialAction::performCall().

File:

• src/Actions/PotentialAction/FitPotentialAction.cpp (modified) (2 diffs)

src/Actions/PotentialAction/FitPotentialAction.cpp

@@ -69 +69 @@
 /** =========== define the function ====================== */
 
+static void registerPotentialIfNotPresent(
+    const std::string &_potentialtype,
+    const SerializablePotential::ParticleTypes_t &_types)
+{
+  EmpiricalPotential *potential =
+      PotentialFactory::getInstance().createInstance(_potentialtype,_types);
+  // check whether such a potential already exists
+  const std::string potential_name = potential->getName();
+  if (PotentialRegistry::getInstance().isPresentByName(potential_name)) {
+    delete potential;
+    potential = PotentialRegistry::getInstance().getByName(potential_name);
+  } else
+    PotentialRegistry::getInstance().registerInstance(potential);
+}
+
+
 ActionState::ptr PotentialFitPotentialAction::performCall() {
   // fragment specifies the homology fragment to use
@@ -87 +103 @@
 
     // register desired potential and an additional constant one
-    {
-      EmpiricalPotential *potential =
-          PotentialFactory::getInstance().createInstance(
-              params.potentialtype.get(),
-              chargenumbers);
-      // check whether such a potential already exists
-      const std::string potential_name = potential->getName();
-      if (PotentialRegistry::getInstance().isPresentByName(potential_name)) {
-        delete potential;
-        potential = PotentialRegistry::getInstance().getByName(potential_name);
-      } else
-        PotentialRegistry::getInstance().registerInstance(potential);
-    }
-    {
-      EmpiricalPotential *constant =
-          PotentialFactory::getInstance().createInstance(
-              std::string("constant"),
-              SerializablePotential::ParticleTypes_t());
-      // check whether such a potential already exists
-      const std::string constant_name = constant->getName();
-      if (PotentialRegistry::getInstance().isPresentByName(constant_name)) {
-        delete constant;
-        constant = PotentialRegistry::getInstance().getByName(constant_name);
-      } else
-        PotentialRegistry::getInstance().registerInstance(constant);
-    }
+    registerPotentialIfNotPresent(params.potentialtype.get(),chargenumbers);
+    registerPotentialIfNotPresent(
+        std::string("constant"),
+        SerializablePotential::ParticleTypes_t());
   }