Changes in src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp [6e5084:bf3817]

File:

• src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp (modified) (2 diffs)

src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp

@@ -5 +5 @@
  *      Author: heber
  */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "Helpers/MemDebug.hpp"
@@ -62 +67 @@
     // sum up inertia tensor
     for (molecule::const_iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      Vector x = (*iter)->x;
+      Vector x = (*iter)->getPosition();
       x -= *CenterOfGravity;
-      InertiaTensor.at(0,0) += (*iter)->type->mass*(x[1]*x[1] + x[2]*x[2]);
-      InertiaTensor.at(0,1) += (*iter)->type->mass*(-x[0]*x[1]);
-      InertiaTensor.at(0,2) += (*iter)->type->mass*(-x[0]*x[2]);
-      InertiaTensor.at(1,0) += (*iter)->type->mass*(-x[1]*x[0]);
-      InertiaTensor.at(1,1) += (*iter)->type->mass*(x[0]*x[0] + x[2]*x[2]);
-      InertiaTensor.at(1,2) += (*iter)->type->mass*(-x[1]*x[2]);
-      InertiaTensor.at(2,0) += (*iter)->type->mass*(-x[2]*x[0]);
-      InertiaTensor.at(2,1) += (*iter)->type->mass*(-x[2]*x[1]);
-      InertiaTensor.at(2,2) += (*iter)->type->mass*(x[0]*x[0] + x[1]*x[1]);
+      const double mass = (*iter)->getType()->mass;
+      InertiaTensor.at(0,0) += mass*(x[1]*x[1] + x[2]*x[2]);
+      InertiaTensor.at(0,1) += mass*(-x[0]*x[1]);
+      InertiaTensor.at(0,2) += mass*(-x[0]*x[2]);
+      InertiaTensor.at(1,0) += mass*(-x[1]*x[0]);
+      InertiaTensor.at(1,1) += mass*(x[0]*x[0] + x[2]*x[2]);
+      InertiaTensor.at(1,2) += mass*(-x[1]*x[2]);
+      InertiaTensor.at(2,0) += mass*(-x[2]*x[0]);
+      InertiaTensor.at(2,1) += mass*(-x[2]*x[1]);
+      InertiaTensor.at(2,2) += mass*(x[0]*x[0] + x[1]*x[1]);
     }
     // print InertiaTensor for debugging