Changeset 47d041 for src/Tesselation

Timestamp:

Nov 3, 2011, 7:44:01 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

41a467

Parents:

50e4e5

git-author:

Frederik Heber <heber@…> (10/27/11 11:53:58)

git-committer:

Frederik Heber <heber@…> (11/03/11 19:44:01)

Message:

HUGE: Removed all calls to Log(), eLog(), replaced by LOG() and ELOG().

• Replaced DoLog(.) && (Log() << Verbose(.) << ... << std::endl) by Log(., ...).
• Replaced Log() << Verbose(.) << .. << by Log(., ...)
• on multiline used stringstream to generate and message which was finally used in LOG(., output.str())
• there should be no more occurence of Log(). LOG() and ELOG() must be used instead.
• Eventually, this will allow for storing all errors and re-printing them on program exit which would be very helpful to ascertain error-free runs for the user.

Location:

src/Tesselation

Files:

• BoundaryLineSet.cpp (modified) (10 diffs)
• BoundaryPointSet.cpp (modified) (4 diffs)
• BoundaryPolygonSet.cpp (modified) (10 diffs)
• BoundaryTriangleSet.cpp (modified) (12 diffs)
• CandidateForTesselation.cpp (modified) (4 diffs)
• boundary.cpp (modified) (51 diffs)
• ellipsoid.cpp (modified) (26 diffs)
• tesselation.cpp (modified) (185 diffs)
• tesselationhelpers.cpp (modified) (32 diffs)
• triangleintersectionlist.cpp (modified) (3 diffs)
• unittests/Tesselation_InsideOutsideUnitTest.cpp (modified) (4 diffs)

src/Tesselation/BoundaryLineSet.cpp

@@ -66 +66 @@
   skipped = false;
   // clear triangles list
-  DoLog(0) && (Log() << Verbose(0) << "New Line with endpoints " << *this << "." << endl);
+  LOG(0, "New Line with endpoints " << *this << ".");
 }
 ;
@@ -87 +87 @@
   Point2->AddLine(this); //
   // clear triangles list
-  DoLog(0) && (Log() << Verbose(0) << "New Line with endpoints " << *this << "." << endl);
+  LOG(0, "New Line with endpoints " << *this << ".");
 }
 ;
@@ -116 +116 @@
         for (LineMap::iterator Runner = erasor.first; Runner != erasor.second; Runner++)
           if ((*Runner).second == this) {
-            //Log() << Verbose(0) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
+            //LOG(0, "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << ".");
             endpoints[i]->lines.erase(Runner);
             break;
@@ -122 +122 @@
       } else { // there's just a single line left
         if (endpoints[i]->lines.erase(Nr)) {
-          //Log() << Verbose(0) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
+          //LOG(0, "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << ".");
         }
       }
       if (endpoints[i]->lines.empty()) {
-        //Log() << Verbose(0) << *endpoints[i] << " has no more lines it's attached to, erasing." << endl;
+        //LOG(0, *endpoints[i] << " has no more lines it's attached to, erasing.");
         if (endpoints[i] != NULL) {
           delete (endpoints[i]);
@@ -135 +135 @@
   }
   if (!triangles.empty())
-    DoeLog(2) && (eLog() << Verbose(2) << "Memory Leak! I " << *this << " am still connected to some triangles." << endl);
+    ELOG(2, "Memory Leak! I " << *this << " am still connected to some triangles.");
 }
 ;
@@ -145 +145 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(0) && (Log() << Verbose(0) << "Add " << triangle->Nr << " to line " << *this << "." << endl);
+  LOG(0, "Add " << triangle->Nr << " to line " << *this << ".");
   triangles.insert(TrianglePair(triangle->Nr, triangle));
 }
@@ -175 +175 @@
   double angle = CalculateConvexity();
   if (angle > -MYEPSILON) {
-    DoLog(0) && (Log() << Verbose(0) << "ACCEPT: Angle is greater than pi: convex." << endl);
+    LOG(0, "ACCEPT: Angle is greater than pi: convex.");
     return true;
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "REJECT: Angle is less than pi: concave." << endl);
+    LOG(0, "REJECT: Angle is less than pi: concave.");
     return false;
   }
@@ -194 +194 @@
   // get the two triangles
   if (triangles.size() != 2) {
-    DoeLog(0) && (eLog() << Verbose(0) << "Baseline " << *this << " is connected to less than two triangles, Tesselation incomplete!" << endl);
+    ELOG(0, "Baseline " << *this << " is connected to less than two triangles, Tesselation incomplete!");
     return true;
   }
   // check normal vectors
   // have a normal vector on the base line pointing outwards
-  //Log() << Verbose(0) << "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << "." << endl;
+  //LOG(0, "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << ".");
   BaseLineCenter = (1./2.)*((endpoints[0]->node->getPosition()) + (endpoints[1]->node->getPosition()));
   BaseLine = (endpoints[0]->node->getPosition()) - (endpoints[1]->node->getPosition());
 
-  //Log() << Verbose(0) << "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << "." << endl;
+  //LOG(0, "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << ".");
 
   BaseLineNormal.Zero();
@@ -211 +211 @@
   class BoundaryPointSet *node = NULL;
   for (TriangleMap::const_iterator runner = triangles.begin(); runner != triangles.end(); runner++) {
-    //Log() << Verbose(0) << "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << "." << endl;
+    //LOG(0, "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << ".");
     NormalCheck += runner->second->NormalVector;
     NormalCheck *= sign;
@@ -218 +218 @@
       BaseLineNormal = runner->second->NormalVector;   // yes, copy second on top of first
     else {
-      DoeLog(0) && (eLog() << Verbose(0) << "Triangle " << *runner->second << " has zero normal vector!" << endl);
+      ELOG(0, "Triangle " << *runner->second << " has zero normal vector!");
     }
     node = runner->second->GetThirdEndpoint(this);
     if (node != NULL) {
-      //Log() << Verbose(0) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
+      //LOG(0, "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << ".");
       helper[i] = (node->node->getPosition()) - BaseLineCenter;
       helper[i].MakeNormalTo(BaseLine);  // we want to compare the triangle's heights' angles!
-      //Log() << Verbose(0) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
+      //LOG(0, "INFO: Height vector with respect to baseline is " << helper[i] << ".");
       i++;
     } else {
-      DoeLog(1) && (eLog() << Verbose(1) << "I cannot find third node in triangle, something's wrong." << endl);
+      ELOG(1, "I cannot find third node in triangle, something's wrong.");
       return true;
     }
   }
-  //Log() << Verbose(0) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
+  //LOG(0, "INFO: BaselineNormal is " << BaseLineNormal << ".");
   if (NormalCheck.NormSquared() < MYEPSILON) {
-    DoLog(0) && (Log() << Verbose(0) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl);
+    LOG(0, "ACCEPT: Normalvectors of both triangles are the same: convex.");
     return true;
   }

src/Tesselation/BoundaryPointSet.cpp

@@ -46 +46 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(1) && (Log() << Verbose(1) << "Adding noname." << endl);
+  LOG(1, "Adding noname.");
 }
 ;
@@ -60 +60 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(1) && (Log() << Verbose(1) << "Adding Node " << *Walker << endl);
+  LOG(1, "Adding Node " << *Walker);
 }
 ;
@@ -71 +71 @@
 {
   Info FunctionInfo(__func__);
-  //Log() << Verbose(0) << "Erasing point Nr. " << Nr << "." << endl;
+  //LOG(0, "Erasing point Nr. " << Nr << ".");
   if (!lines.empty())
-    DoeLog(2) && (eLog() << Verbose(2) << "Memory Leak! I " << *this << " am still connected to some lines." << endl);
+    ELOG(2, "Memory Leak! I " << *this << " am still connected to some lines.");
   node = NULL;
 }
@@ -84 +84 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(1) && (Log() << Verbose(1) << "Adding " << *this << " to line " << *line << "." << endl);
+  LOG(1, "Adding " << *this << " to line " << *line << ".");
   if (line->endpoints[0] == this) {
     lines.insert(LinePair(line->endpoints[1]->Nr, line));

src/Tesselation/BoundaryPolygonSet.cpp

@@ -56 +56 @@
   Info FunctionInfo(__func__);
   endpoints.clear();
-  DoLog(1) && (Log() << Verbose(1) << "Erasing polygon Nr." << Nr << " itself." << endl);
+  LOG(1, "Erasing polygon Nr." << Nr << " itself.");
 }
 ;
@@ -77 +77 @@
       Runner[i]++;
       if (Runner[i] == endpoints.end()) {
-        DoeLog(0) && (eLog() << Verbose(0) << "There are less than three endpoints in the polygon!" << endl);
+        ELOG(0, "There are less than three endpoints in the polygon!");
         performCriticalExit();
       }
@@ -97 +97 @@
   if (TotalNormal->ScalarProduct(OtherVector) > 0.)
     TotalNormal->Scale(-1.);
-  DoLog(1) && (Log() << Verbose(1) << "Normal Vector is " << *TotalNormal << "." << endl);
+  LOG(1, "Normal Vector is " << *TotalNormal << ".");
 
   return TotalNormal;
@@ -117 +117 @@
   }
   center->Scale(1. / (double) counter);
-  DoLog(1) && (Log() << Verbose(1) << "Center is at " << *center << "." << endl);
+  LOG(1, "Center is at " << *center << ".");
 }
 
@@ -150 +150 @@
   Info FunctionInfo(__func__);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    DoLog(0) && (Log() << Verbose(0) << "Checking against " << **Runner << endl);
+    LOG(0, "Checking against " << **Runner);
     if (point == (*Runner)) {
-      DoLog(0) && (Log() << Verbose(0) << " Contained." << endl);
+      LOG(0, " Contained.");
       return true;
     }
   }
-  DoLog(0) && (Log() << Verbose(0) << " Not contained." << endl);
+  LOG(0, " Not contained.");
   return false;
 }
@@ -170 +170 @@
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++)
     if (point == (*Runner)->node) {
-      DoLog(0) && (Log() << Verbose(0) << " Contained." << endl);
+      LOG(0, " Contained.");
       return true;
     }
-  DoLog(0) && (Log() << Verbose(0) << " Not contained." << endl);
+  LOG(0, " Not contained.");
   return false;
 }
@@ -187 +187 @@
   Info FunctionInfo(__func__);
   int counter = 0;
-  DoLog(1) && (Log() << Verbose(1) << "Polygon is " << *this << endl);
+  LOG(1, "Polygon is " << *this);
   for (int i = 0; i < dim; i++) {
-    DoLog(1) && (Log() << Verbose(1) << " Testing endpoint " << *Points[i] << endl);
+    LOG(1, " Testing endpoint " << *Points[i]);
     if (ContainsBoundaryPoint(Points[i])) {
       counter++;
@@ -210 +210 @@
   Info FunctionInfo(__func__);
   size_t counter = 0;
-  DoLog(1) && (Log() << Verbose(1) << "Polygon is " << *this << endl);
+  LOG(1, "Polygon is " << *this);
   for (PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    DoLog(1) && (Log() << Verbose(1) << " Testing endpoint " << **Runner << endl);
+    LOG(1, " Testing endpoint " << **Runner);
     if (ContainsBoundaryPoint(*Runner))
       counter++;
@@ -246 +246 @@
     for (LineMap::const_iterator Walker = (*Runner)->lines.begin(); Walker != (*Runner)->lines.end(); Walker++)
       for (TriangleMap::const_iterator Sprinter = (Walker->second)->triangles.begin(); Sprinter != (Walker->second)->triangles.end(); Sprinter++) {
-        //Log() << Verbose(0) << " Testing triangle " << *(Sprinter->second) << endl;
+        //LOG(0, " Testing triangle " << *(Sprinter->second));
         if (ContainsBoundaryTriangle(Sprinter->second)) {
           Tester = triangles->insert(Sprinter->second);
           if (Tester.second)
-            DoLog(0) && (Log() << Verbose(0) << "Adding triangle " << *(Sprinter->second) << endl);
+            LOG(0, "Adding triangle " << *(Sprinter->second));
         }
       }
 
-  DoLog(1) && (Log() << Verbose(1) << "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total." << endl);
+  LOG(1, "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total.");
   return triangles;
 }
@@ -269 +269 @@
   if (line == NULL)
     return false;
-  DoLog(1) && (Log() << Verbose(1) << "Filling polygon from line " << *line << endl);
+  LOG(1, "Filling polygon from line " << *line);
   for (TriangleMap::const_iterator Runner = line->triangles.begin(); Runner != line->triangles.end(); Runner++) {
     for (int i = 0; i < 3; i++) {
       Tester = endpoints.insert((Runner->second)->endpoints[i]);
       if (Tester.second)
-        DoLog(1) && (Log() << Verbose(1) << "  Inserting endpoint " << *((Runner->second)->endpoints[i]) << endl);
+        LOG(1, "  Inserting endpoint " << *((Runner->second)->endpoints[i]));
     }
   }

src/Tesselation/BoundaryTriangleSet.cpp

@@ -79 +79 @@
   // set endpoints
   int Counter = 0;
-  DoLog(0) && (Log() << Verbose(0) << "New triangle " << Nr << " with end points: " << endl);
+  LOG(0, "New triangle " << Nr << " with end points: ");
   for (PointMap::iterator runner = OrderMap.begin(); runner != OrderMap.end(); runner++) {
     endpoints[Counter] = runner->second;
-    DoLog(0) && (Log() << Verbose(0) << " " << *endpoints[Counter] << endl);
+    LOG(0, " " << *endpoints[Counter]);
     Counter++;
   }
@@ -99 +99 @@
     if (lines[i] != NULL) {
       if (lines[i]->triangles.erase(Nr)) {
-        //Log() << Verbose(0) << "Triangle Nr." << Nr << " erased in line " << *lines[i] << "." << endl;
+        //LOG(0, "Triangle Nr." << Nr << " erased in line " << *lines[i] << ".");
       }
       if (lines[i]->triangles.empty()) {
-        //Log() << Verbose(0) << *lines[i] << " is no more attached to any triangle, erasing." << endl;
+        //LOG(0, *lines[i] << " is no more attached to any triangle, erasing.");
         delete (lines[i]);
         lines[i] = NULL;
@@ -108 +108 @@
     }
   }
-  //Log() << Verbose(0) << "Erasing triangle Nr." << Nr << " itself." << endl;
+  //LOG(0, "Erasing triangle Nr." << Nr << " itself.");
 }
 ;
@@ -127 +127 @@
   if (NormalVector.ScalarProduct(OtherVector) > 0.)
     NormalVector.Scale(-1.);
-  DoLog(1) && (Log() << Verbose(1) << "Normal Vector is " << NormalVector << "." << endl);
+  LOG(1, "Normal Vector is " << NormalVector << ".");
 }
 ;
@@ -154 +154 @@
     Intersection = Plane(NormalVector, (endpoints[0]->node->getPosition())).GetIntersection(centerLine);
 
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Triangle is " << *this << "." << endl);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Line is from " << MolCenter << " to " << x << "." << endl);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Intersection is " << Intersection << "." << endl);
+    LOG(1, "INFO: Triangle is " << *this << ".");
+    LOG(1, "INFO: Line is from " << MolCenter << " to " << x << ".");
+    LOG(1, "INFO: Intersection is " << Intersection << ".");
 
     if (Intersection.DistanceSquared(endpoints[0]->node->getPosition()) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with first endpoint." << endl);
+      LOG(1, "Intersection coindices with first endpoint.");
       return true;
     }   else if (Intersection.DistanceSquared(endpoints[1]->node->getPosition()) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with second endpoint." << endl);
+      LOG(1, "Intersection coindices with second endpoint.");
       return true;
     }   else if (Intersection.DistanceSquared(endpoints[2]->node->getPosition()) < MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "Intersection coindices with third endpoint." << endl);
+      LOG(1, "Intersection coindices with third endpoint.");
       return true;
     }
@@ -177 +177 @@
       CrossPoint -= (endpoints[i%3]->node->getPosition());  // cross point was returned as absolute vector
       const double s = CrossPoint.ScalarProduct(helper)/helper.NormSquared();
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Factor s is " << s << "." << endl);
+      LOG(1, "INFO: Factor s is " << s << ".");
       if ((s < -MYEPSILON) || ((s-1.) > MYEPSILON)) {
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << "outside of triangle." << endl);
+        LOG(1, "INFO: Crosspoint " << CrossPoint << "outside of triangle.");
         return false;
       }
       i++;
     } while (i < 3);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Crosspoint " << CrossPoint << " inside of triangle." << endl);
+    LOG(1, "INFO: Crosspoint " << CrossPoint << " inside of triangle.");
     return true;
   }
   catch (LinearAlgebraException &excp) {
-    Log() << Verbose(1) << boost::diagnostic_information(excp);
-    DoeLog(1) && (eLog() << Verbose(1) << "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!" << endl);
+    LOG(1, boost::diagnostic_information(excp));
+    ELOG(1, "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!");
     return false;
   }
@@ -213 +213 @@
 
   // 1. get intersection with plane
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Looking for closest point of triangle " << *this << " to " << x << "." << endl);
+  LOG(1, "INFO: Looking for closest point of triangle " << *this << " to " << x << ".");
   GetCenter(Direction);
   try {
@@ -228 +228 @@
   InPlane += ClosestPoint;
 
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Triangle is " << *this << "." << endl);
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Line is from " << Direction << " to " << x << "." << endl);
-  DoLog(2) && (Log() << Verbose(2) << "INFO: In-plane part is " << InPlane << "." << endl);
+  LOG(2, "INFO: Triangle is " << *this << ".");
+  LOG(2, "INFO: Line is from " << Direction << " to " << x << ".");
+  LOG(2, "INFO: In-plane part is " << InPlane << ".");
 
   // Calculate cross point between one baseline and the desired point such that distance is shortest
@@ -247 +247 @@
     CrossPoint[i] -= (endpoints[i%3]->node->getPosition());  // cross point was returned as absolute vector
     const double s = CrossPoint[i].ScalarProduct(Direction)/Direction.NormSquared();
-    DoLog(2) && (Log() << Verbose(2) << "INFO: Factor s is " << s << "." << endl);
+    LOG(2, "INFO: Factor s is " << s << ".");
     if ((s >= -MYEPSILON) && ((s-1.) <= MYEPSILON)) {
           CrossPoint[i] += (endpoints[i%3]->node->getPosition());  // make cross point absolute again
-      DoLog(2) && (Log() << Verbose(2) << "INFO: Crosspoint is " << CrossPoint[i] << ", intersecting BoundaryLine between " << endpoints[i % 3]->node->getPosition() << " and " << endpoints[(i + 1) % 3]->node->getPosition() << "." << endl);
+      LOG(2, "INFO: Crosspoint is " << CrossPoint[i] << ", intersecting BoundaryLine between " << endpoints[i % 3]->node->getPosition() << " and " << endpoints[(i + 1) % 3]->node->getPosition() << ".");
       const double distance = CrossPoint[i].DistanceSquared(x);
       if ((ShortestDistance < 0.) || (ShortestDistance > distance)) {
@@ -279 +279 @@
     }
   }
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Closest Point is " << ClosestPoint << " with shortest squared distance is " << ShortestDistance << "." << endl);
+  LOG(1, "INFO: Closest Point is " << ClosestPoint << " with shortest squared distance is " << ShortestDistance << ".");
   return ShortestDistance;
 }
@@ -333 +333 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Checking " << Points[0] << "," << Points[1] << "," << Points[2] << " against " << endpoints[0] << "," << endpoints[1] << "," << endpoints[2] << "." << endl);
+  LOG(1, "INFO: Checking " << Points[0] << "," << Points[1] << "," << Points[2] << " against " << endpoints[0] << "," << endpoints[1] << "," << endpoints[2] << ".");
   return (((endpoints[0] == Points[0]) || (endpoints[0] == Points[1]) || (endpoints[0] == Points[2])) && ((endpoints[1] == Points[0]) || (endpoints[1] == Points[1]) || (endpoints[1] == Points[2])) && ((endpoints[2] == Points[0]) || (endpoints[2] == Points[1]) || (endpoints[2] == Points[2])
 
@@ -400 +400 @@
     (center) += (endpoints[i]->node->getPosition());
   center.Scale(1. / 3.);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center is at " << center << "." << endl);
+  LOG(1, "INFO: Center is at " << center << ".");
 }
 

src/Tesselation/CandidateForTesselation.cpp

@@ -95 +95 @@
 
   if (!pointlist.empty())
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Checking whether sphere contains candidate list and baseline " << *BaseLine->endpoints[0] << "<->" << *BaseLine->endpoints[1] << " only ..." << endl);
+    LOG(1, "INFO: Checking whether sphere contains candidate list and baseline " << *BaseLine->endpoints[0] << "<->" << *BaseLine->endpoints[1] << " only ...");
   else
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Checking whether sphere with no candidates contains baseline " << *BaseLine->endpoints[0] << "<->" << *BaseLine->endpoints[1] << " only ..." << endl);
+    LOG(1, "INFO: Checking whether sphere with no candidates contains baseline " << *BaseLine->endpoints[0] << "<->" << *BaseLine->endpoints[1] << " only ...");
   // check baseline for OptCenter and OtherOptCenter being on sphere's surface
   for (list<const Vector *>::const_iterator VRunner = VectorList.begin(); VRunner != VectorList.end(); ++VRunner) {
@@ -103 +103 @@
       const double distance = fabs((*VRunner)->DistanceSquared(BaseLine->endpoints[i]->node->getPosition()) - radiusSquared);
       if (distance > HULLEPSILON) {
-        DoeLog(1) && (eLog() << Verbose(1) << "Endpoint " << *BaseLine->endpoints[i] << " is out of sphere at " << *(*VRunner) << " by " << distance << "." << endl);
+        ELOG(1, "Endpoint " << *BaseLine->endpoints[i] << " is out of sphere at " << *(*VRunner) << " by " << distance << ".");
         return false;
       }
@@ -115 +115 @@
       const double distance = fabs((*VRunner)->DistanceSquared(Walker->getPosition()) - radiusSquared);
       if (distance > HULLEPSILON) {
-        DoeLog(1) && (eLog() << Verbose(1) << "Candidate " << *Walker << " is out of sphere at " << *(*VRunner) << " by " << distance << "." << endl);
+        ELOG(1, "Candidate " << *Walker << " is out of sphere at " << *(*VRunner) << " by " << distance << ".");
         return false;
       } else {
-        DoLog(1) && (Log() << Verbose(1) << "Candidate " << *Walker << " is inside by " << distance << "." << endl);
+        LOG(1, "Candidate " << *Walker << " is inside by " << distance << ".");
       }
     }
   }
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Checking whether sphere contains no others points ..." << endl);
+  LOG(1, "INFO: Checking whether sphere contains no others points ...");
   bool flag = true;
   for (list<const Vector *>::const_iterator VRunner = VectorList.begin(); VRunner != VectorList.end(); ++VRunner) {
@@ -129 +129 @@
     TesselPointList *ListofPoints = LC->GetPointsInsideSphere(RADIUS, (*VRunner));
 
-    DoLog(1) && (Log() << Verbose(1) << "The following atoms are inside sphere at " << (*VRunner) << ":" << endl);
+    LOG(1, "The following atoms are inside sphere at " << (*VRunner) << ":");
     for (TesselPointList::const_iterator Runner = ListofPoints->begin(); Runner != ListofPoints->end(); ++Runner)
-      DoLog(1) && (Log() << Verbose(1) << "  " << *(*Runner) << " with distance " << (*Runner)->distance(*(*VRunner)) << "." << endl);
+      LOG(1, "  " << *(*Runner) << " with distance " << (*Runner)->distance(*(*VRunner)) << ".");
 
     // remove baseline's endpoints and candidates
     for (int i = 0; i < 2; i++) {
-      DoLog(1) && (Log() << Verbose(1) << "INFO: removing baseline tesselpoint " << *BaseLine->endpoints[i]->node << "." << endl);
+      LOG(1, "INFO: removing baseline tesselpoint " << *BaseLine->endpoints[i]->node << ".");
       ListofPoints->remove(BaseLine->endpoints[i]->node);
     }
     for (TesselPointList::const_iterator Runner = pointlist.begin(); Runner != pointlist.end(); ++Runner) {
-      DoLog(1) && (Log() << Verbose(1) << "INFO: removing candidate tesselpoint " << *(*Runner) << "." << endl);
+      LOG(1, "INFO: removing candidate tesselpoint " << *(*Runner) << ".");
       ListofPoints->remove(*Runner);
     }
     if (!ListofPoints->empty()) {
-      DoeLog(1) && (eLog() << Verbose(1) << "CheckValidity: There are still " << ListofPoints->size() << " points inside the sphere." << endl);
+      ELOG(1, "CheckValidity: There are still " << ListofPoints->size() << " points inside the sphere.");
       flag = false;
-      DoeLog(1) && (eLog() << Verbose(1) << "External atoms inside of sphere at " << *(*VRunner) << ":" << endl);
+      ELOG(1, "External atoms inside of sphere at " << *(*VRunner) << ":");
       for (TesselPointList::const_iterator Runner = ListofPoints->begin(); Runner != ListofPoints->end(); ++Runner)
-        DoeLog(1) && (eLog() << Verbose(1) << "  " << *(*Runner) << " at distance " << setprecision(13) << (*Runner)->distance(*(*VRunner)) << setprecision(6) << "." << endl);
+        ELOG(1, "  " << *(*Runner) << " at distance " << setprecision(13) << (*Runner)->distance(*(*VRunner)) << setprecision(6) << ".");
 
       // check with animate_sphere.tcl VMD script
       if (ThirdPoint != NULL) {
-        DoeLog(1) && (eLog() << Verbose(1) << "Check by: animate_sphere 0 " << BaseLine->endpoints[0]->Nr + 1 << " " << BaseLine->endpoints[1]->Nr + 1 << " " << ThirdPoint->Nr + 1 << " " << RADIUS << " " << OldCenter[0] << " " << OldCenter[1] << " " << OldCenter[2] << " " << (*VRunner)->at(0) << " " << (*VRunner)->at(1) << " " << (*VRunner)->at(2) << endl);
+        ELOG(1, "Check by: animate_sphere 0 " << BaseLine->endpoints[0]->Nr + 1 << " " << BaseLine->endpoints[1]->Nr + 1 << " " << ThirdPoint->Nr + 1 << " " << RADIUS << " " << OldCenter[0] << " " << OldCenter[1] << " " << OldCenter[2] << " " << (*VRunner)->at(0) << " " << (*VRunner)->at(1) << " " << (*VRunner)->at(2));
       } else {
-        DoeLog(1) && (eLog() << Verbose(1) << "Check by: ... missing third point ..." << endl);
-        DoeLog(1) && (eLog() << Verbose(1) << "Check by: animate_sphere 0 " << BaseLine->endpoints[0]->Nr + 1 << " " << BaseLine->endpoints[1]->Nr + 1 << " ??? " << RADIUS << " " << OldCenter[0] << " " << OldCenter[1] << " " << OldCenter[2] << " " << (*VRunner)->at(0) << " " << (*VRunner)->at(1) << " " << (*VRunner)->at(2) << endl);
+        ELOG(1, "Check by: ... missing third point ...");
+        ELOG(1, "Check by: animate_sphere 0 " << BaseLine->endpoints[0]->Nr + 1 << " " << BaseLine->endpoints[1]->Nr + 1 << " ??? " << RADIUS << " " << OldCenter[0] << " " << OldCenter[1] << " " << OldCenter[2] << " " << (*VRunner)->at(0) << " " << (*VRunner)->at(1) << " " << (*VRunner)->at(2));
       }
     }

src/Tesselation/boundary.cpp

@@ -84 +84 @@
   } else {
     BoundaryPoints = BoundaryPtr;
-    DoLog(0) && (Log() << Verbose(0) << "Using given boundary points set." << endl);
+    LOG(0, "Using given boundary points set.");
   }
   // determine biggest "diameter" of cluster for each axis
@@ -91 +91 @@
   for (int axis = 0; axis < NDIM; axis++)
     { // regard each projected plane
-      //Log() << Verbose(1) << "Current axis is " << axis << "." << endl;
+      //LOG(1, "Current axis is " << axis << ".");
       for (int j = 0; j < 2; j++)
         { // and for both axis on the current plane
           component = (axis + j + 1) % NDIM;
           Othercomponent = (axis + 1 + ((j + 1) & 1)) % NDIM;
-          //Log() << Verbose(1) << "Current component is " << component << ", Othercomponent is " << Othercomponent << "." << endl;
+          //LOG(1, "Current component is " << component << ", Othercomponent is " << Othercomponent << ".");
           for (Boundaries::const_iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
-              //Log() << Verbose(1) << "Current runner is " << *(runner->second.second) << "." << endl;
+              //LOG(1, "Current runner is " << *(runner->second.second) << ".");
               // seek for the neighbours pair where the Othercomponent sign flips
               Neighbour = runner;
@@ -111 +111 @@
                     Neighbour = BoundaryPoints[axis].begin();
                   DistanceVector = (runner->second.second->getPosition()) - (Neighbour->second.second->getPosition());
-                  //Log() << Verbose(2) << "OldComponent is " << OldComponent << ", new one is " << DistanceVector.x[Othercomponent] << "." << endl;
+                  //LOG(2, "OldComponent is " << OldComponent << ", new one is " << DistanceVector.x[Othercomponent] << ".");
                 } while ((runner != Neighbour) && (fabs(OldComponent / fabs(
                   OldComponent) - DistanceVector[Othercomponent] / fabs(
@@ -120 +120 @@
                     OtherNeighbour = BoundaryPoints[axis].end();
                   OtherNeighbour--;
-                  //Log() << Verbose(1) << "The pair, where the sign of OtherComponent flips, is: " << *(Neighbour->second.second) << " and " << *(OtherNeighbour->second.second) << "." << endl;
+                  //LOG(1, "The pair, where the sign of OtherComponent flips, is: " << *(Neighbour->second.second) << " and " << *(OtherNeighbour->second.second) << ".");
                   // now we have found the pair: Neighbour and OtherNeighbour
                   OtherVector = (runner->second.second->getPosition()) - (OtherNeighbour->second.second->getPosition());
-                  //Log() << Verbose(1) << "Distances to Neighbour and OtherNeighbour are " << DistanceVector.x[component] << " and " << OtherVector.x[component] << "." << endl;
-                  //Log() << Verbose(1) << "OtherComponents to Neighbour and OtherNeighbour are " << DistanceVector.x[Othercomponent] << " and " << OtherVector.x[Othercomponent] << "." << endl;
+                  //LOG(1, "Distances to Neighbour and OtherNeighbour are " << DistanceVector.x[component] << " and " << OtherVector.x[component] << ".");
+                  //LOG(1, "OtherComponents to Neighbour and OtherNeighbour are " << DistanceVector.x[Othercomponent] << " and " << OtherVector.x[Othercomponent] << ".");
                   // do linear interpolation between points (is exact) to extract exact intersection between Neighbour and OtherNeighbour
                   w1 = fabs(OtherVector[Othercomponent]);
@@ -131 +131 @@
                       * OtherVector[component]) / (w1 + w2));
                   // mark if it has greater diameter
-                  //Log() << Verbose(1) << "Comparing current greatest " << GreatestDiameter[component] << " to new " << tmp << "." << endl;
+                  //LOG(1, "Comparing current greatest " << GreatestDiameter[component] << " to new " << tmp << ".");
                   GreatestDiameter[component] = (GreatestDiameter[component]
                       > tmp) ? GreatestDiameter[component] : tmp;
                 } //else
-              //Log() << Verbose(1) << "Saw no sign flip, probably top or bottom node." << endl;
+              //LOG(1, "Saw no sign flip, probably top or bottom node.");
             }
         }
     }
-  Log() << Verbose(0) << "RESULT: The biggest diameters are "
+  LOG(0, "RESULT: The biggest diameters are "
       << GreatestDiameter[0] << " and " << GreatestDiameter[1] << " and "
       << GreatestDiameter[2] << " " << (IsAngstroem ? "angstrom"
-      : "atomiclength") << "." << endl;
+      : "atomiclength") << ".");
 
   // free reference lists
@@ -186 +186 @@
     AngleReferenceNormalVector[(axis + 2) % NDIM] = 1.;
 
-    DoLog(1) && (Log() << Verbose(1) << "Axisvector is " << AxisVector << " and AngleReferenceVector is " << AngleReferenceVector << ", and AngleReferenceNormalVector is " << AngleReferenceNormalVector << "." << endl);
+    LOG(1, "Axisvector is " << AxisVector << " and AngleReferenceVector is " << AngleReferenceVector << ", and AngleReferenceNormalVector is " << AngleReferenceNormalVector << ".");
 
     // 3b. construct set of all points, transformed into cylindrical system and with left and right neighbours
@@ -200 +200 @@
         angle = 0.; // otherwise it's a vector in Axis Direction and unimportant for boundary issues
 
-      //Log() << Verbose(1) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
+      //LOG(1, "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << ".");
       if (ProjectedVector.ScalarProduct(AngleReferenceNormalVector) > 0) {
         angle = 2. * M_PI - angle;
       }
-    DoLog(1) && (Log() << Verbose(1) << "Inserting " << **iter << ": (r, alpha) = (" << radius << "," << angle << "): " << ProjectedVector << endl);
+    LOG(1, "Inserting " << **iter << ": (r, alpha) = (" << radius << "," << angle << "): " << ProjectedVector);
       BoundaryTestPair = BoundaryPoints[axis].insert(BoundariesPair(angle, TesselPointDistancePair (radius, (*iter))));
       if (!BoundaryTestPair.second) { // same point exists, check first r, then distance of original vectors to center of gravity
-        DoLog(2) && (Log() << Verbose(2) << "Encountered two vectors whose projection onto axis " << axis << " is equal: " << endl);
-        DoLog(2) && (Log() << Verbose(2) << "Present vector: " << *BoundaryTestPair.first->second.second << endl);
-        DoLog(2) && (Log() << Verbose(2) << "New vector: " << **iter << endl);
+        LOG(2, "Encountered two vectors whose projection onto axis " << axis << " is equal: ");
+        LOG(2, "Present vector: " << *BoundaryTestPair.first->second.second);
+        LOG(2, "New vector: " << **iter);
         const double ProjectedVectorNorm = ProjectedVector.NormSquared();
         if ((ProjectedVectorNorm - BoundaryTestPair.first->second.first) > MYEPSILON) {
           BoundaryTestPair.first->second.first = ProjectedVectorNorm;
           BoundaryTestPair.first->second.second = (*iter);
-          DoLog(2) && (Log() << Verbose(2) << "Keeping new vector due to larger projected distance " << ProjectedVectorNorm << "." << endl);
+          LOG(2, "Keeping new vector due to larger projected distance " << ProjectedVectorNorm << ".");
         } else if (fabs(ProjectedVectorNorm - BoundaryTestPair.first->second.first) < MYEPSILON) {
           helper = (*iter)->getPosition() - (*MolCenter);
@@ -221 +221 @@
           if (helper.NormSquared() < oldhelperNorm) {
             BoundaryTestPair.first->second.second = (*iter);
-            DoLog(2) && (Log() << Verbose(2) << "Keeping new vector due to larger distance to molecule center " << helper.NormSquared() << "." << endl);
+            LOG(2, "Keeping new vector due to larger distance to molecule center " << helper.NormSquared() << ".");
           } else {
-            DoLog(2) && (Log() << Verbose(2) << "Keeping present vector due to larger distance to molecule center " << oldhelperNorm << "." << endl);
+            LOG(2, "Keeping present vector due to larger distance to molecule center " << oldhelperNorm << ".");
           }
         } else {
-          DoLog(2) && (Log() << Verbose(2) << "Keeping present vector due to larger projected distance " << ProjectedVectorNorm << "." << endl);
+          LOG(2, "Keeping present vector due to larger projected distance " << ProjectedVectorNorm << ".");
         }
       }
@@ -232 +232 @@
     // printing all inserted for debugging
     //    {
-    //      Log() << Verbose(1) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl;
+    //      std::stringstream output;
+    //      output << "Printing list of candidates for axis " << axis << " which we have inserted so far: ";
     //      int i=0;
     //      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
     //        if (runner != BoundaryPoints[axis].begin())
-    //          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
+    //          output << ", " << i << ": " << *runner->second.second;
     //        else
-    //          Log() << Verbose(0) << i << ": " << *runner->second.second;
+    //          output << i << ": " << *runner->second.second;
     //        i++;
     //      }
-    //      Log() << Verbose(0) << endl;
+    //      LOG(1, output.str());
     //    }
     // 3c. throw out points whose distance is less than the mean of left and right neighbours
     bool flag = false;
-    DoLog(1) && (Log() << Verbose(1) << "Looking for candidates to kick out by convex condition ... " << endl);
+    LOG(1, "Looking for candidates to kick out by convex condition ... ");
     do { // do as long as we still throw one out per round
       flag = false;
@@ -273 +274 @@
           SideA = left->second.second->getPosition() - (*MolCenter);
           SideA.ProjectOntoPlane(AxisVector);
-          //          Log() << Verbose(1) << "SideA: " << SideA << endl;
+          //          LOG(1, "SideA: " << SideA);
 
           SideB = right->second.second->getPosition() -(*MolCenter);
           SideB.ProjectOntoPlane(AxisVector);
-          //          Log() << Verbose(1) << "SideB: " << SideB << endl;
+          //          LOG(1, "SideB: " << SideB);
 
           SideC = left->second.second->getPosition() - right->second.second->getPosition();
           SideC.ProjectOntoPlane(AxisVector);
-          //          Log() << Verbose(1) << "SideC: " << SideC << endl;
+          //          LOG(1, "SideC: " << SideC);
 
           SideH = runner->second.second->getPosition() -(*MolCenter);
           SideH.ProjectOntoPlane(AxisVector);
-          //          Log() << Verbose(1) << "SideH: " << SideH << endl;
+          //          LOG(1, "SideH: " << SideH);
 
           // calculate each length
@@ -298 +299 @@
           const double delta = SideC.Angle(SideH);
           const double MinDistance = a * sin(beta) / (sin(delta)) * (((alpha < M_PI / 2.) || (gamma < M_PI / 2.)) ? 1. : -1.);
-          //Log() << Verbose(1) << " I calculated: a = " << a << ", h = " << h << ", beta(" << left->second.second->Name << "," << left->second.second->Name << "-" << right->second.second->Name << ") = " << beta << ", delta(" << left->second.second->Name << "," << runner->second.second->Name << ") = " << delta << ", Min = " << MinDistance << "." << endl;
-          DoLog(1) && (Log() << Verbose(1) << "Checking CoG distance of runner " << *runner->second.second << " " << h << " against triangle's side length spanned by (" << *left->second.second << "," << *right->second.second << ") of " << MinDistance << "." << endl);
+          //LOG(1, " I calculated: a = " << a << ", h = " << h << ", beta(" << left->second.second->Name << "," << left->second.second->Name << "-" << right->second.second->Name << ") = " << beta << ", delta(" << left->second.second->Name << "," << runner->second.second->Name << ") = " << delta << ", Min = " << MinDistance << ".");
+          LOG(1, "Checking CoG distance of runner " << *runner->second.second << " " << h << " against triangle's side length spanned by (" << *left->second.second << "," << *right->second.second << ") of " << MinDistance << ".");
           if ((fabs(h / fabs(h) - MinDistance / fabs(MinDistance)) < MYEPSILON) && ((h - MinDistance)) < -MYEPSILON) {
             // throw out point
-            DoLog(1) && (Log() << Verbose(1) << "Throwing out " << *runner->second.second << "." << endl);
+            LOG(1, "Throwing out " << *runner->second.second << ".");
             BoundaryPoints[axis].erase(runner);
             runner = right;
@@ -340 +341 @@
   } else {
     BoundaryPoints = BoundaryPts;
-    DoLog(0) && (Log() << Verbose(0) << "Using given boundary points set." << endl);
+    LOG(0, "Using given boundary points set.");
   }
 
 // printing all inserted for debugging
-  for (int axis=0; axis < NDIM; axis++) {
-    DoLog(1) && (Log() << Verbose(1) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl);
-    int i=0;
-    for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
-      if (runner != BoundaryPoints[axis].begin())
-        DoLog(0) && (Log() << Verbose(0) << ", " << i << ": " << *runner->second.second);
-      else
-        DoLog(0) && (Log() << Verbose(0) << i << ": " << *runner->second.second);
-      i++;
-    }
-    DoLog(0) && (Log() << Verbose(0) << endl);
+  if (DoLog(1)) {
+    for (int axis=0; axis < NDIM; axis++) {
+      std::stringstream output;
+      output << "Printing list of candidates for axis " << axis << " which we have inserted so far: ";
+      int i=0;
+      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
+        if (runner != BoundaryPoints[axis].begin())
+          output << ", " << i << ": " << *runner->second.second;
+        else
+          output << i << ": " << *runner->second.second;
+        i++;
+      }
+      LOG(1, output.str());
+    }
   }
 
@@ -361 +365 @@
     for (Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++)
         if (!TesselStruct->AddBoundaryPoint(runner->second.second, 0))
-          DoLog(2) && (Log()<< Verbose(2) << "Point " << *(runner->second.second) << " is already present." << endl);
-
-  DoLog(0) && (Log() << Verbose(0) << "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary." << endl);
+          LOG(2, "Point " << *(runner->second.second) << " is already present.");
+
+  LOG(0, "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary.");
   // now we have the whole set of edge points in the BoundaryList
 
   // listing for debugging
-  //  Log() << Verbose(1) << "Listing PointsOnBoundary:";
+  //if (DoLog(1)) {
+  //  std::stringstream output;
+  //  output << "Listing PointsOnBoundary:";
   //  for(PointMap::iterator runner = PointsOnBoundary.begin(); runner != PointsOnBoundary.end(); runner++) {
-  //    Log() << Verbose(0) << " " << *runner->second;
+  //    output << " " << *runner->second;
   //  }
-  //  Log() << Verbose(0) << endl;
+  //  LOG(1, output.str());
+  //}
 
   // 3a. guess starting triangle
@@ -382 +389 @@
   // 3c. check whether all atoms lay inside the boundary, if not, add to boundary points, segment triangle into three with the new point
   if (!TesselStruct->InsertStraddlingPoints(cloud, LCList))
-    DoeLog(1) && (eLog()<< Verbose(1) << "Insertion of straddling points failed!" << endl);
-
-  DoLog(0) && (Log() << Verbose(0) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " intermediate triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl);
+    ELOG(1, "Insertion of straddling points failed!");
+
+  LOG(0, "I created " << TesselStruct->TrianglesOnBoundary.size() << " intermediate triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points.");
 
   // 4. Store triangles in tecplot file
@@ -396 +403 @@
     for (LineMap::iterator LineRunner = TesselStruct->LinesOnBoundary.begin(); LineRunner != TesselStruct->LinesOnBoundary.end(); LineRunner++) {
       line = LineRunner->second;
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Current line is " << *line << "." << endl);
+      LOG(1, "INFO: Current line is " << *line << ".");
       if (!line->CheckConvexityCriterion()) {
-        DoLog(1) && (Log() << Verbose(1) << "... line " << *line << " is concave, flipping it." << endl);
+        LOG(1, "... line " << *line << " is concave, flipping it.");
 
         // flip the line
         if (TesselStruct->PickFarthestofTwoBaselines(line) == 0.)
-          DoeLog(1) && (eLog()<< Verbose(1) << "Correction of concave baselines failed!" << endl);
+          ELOG(1, "Correction of concave baselines failed!");
         else {
           TesselStruct->FlipBaseline(line);
-          DoLog(1) && (Log() << Verbose(1) << "INFO: Correction of concave baselines worked." << endl);
+          LOG(1, "INFO: Correction of concave baselines worked.");
           LineRunner = TesselStruct->LinesOnBoundary.begin(); // LineRunner may have been erase if line was deleted from LinesOnBoundary
         }
@@ -414 +421 @@
   // 3e. we need another correction here, for TesselPoints that are below the surface (i.e. have an odd number of concave triangles surrounding it)
 //  if (!TesselStruct->CorrectConcaveTesselPoints(out))
-//    Log() << Verbose(1) << "Correction of concave tesselpoints failed!" << endl;
-
-  DoLog(0) && (Log() << Verbose(0) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl);
+//    ELOG(1, "Correction of concave tesselpoints failed!");
+
+  LOG(0, "I created " << TesselStruct->TrianglesOnBoundary.size() << " triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points.");
 
   // 4. Store triangles in tecplot file
@@ -440 +447 @@
 
   if ((TesselStruct == NULL) || (TesselStruct->PointsOnBoundary.empty())) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "TesselStruct is empty." << endl);
+    ELOG(1, "TesselStruct is empty.");
     return false;
   }
@@ -446 +453 @@
   PointMap::iterator PointRunner;
   while (!TesselStruct->PointsOnBoundary.empty()) {
-    DoLog(1) && (Log() << Verbose(1) << "Remaining points are: ");
-    for (PointMap::iterator PointSprinter = TesselStruct->PointsOnBoundary.begin(); PointSprinter != TesselStruct->PointsOnBoundary.end(); PointSprinter++)
-      DoLog(0) && (Log() << Verbose(0) << *(PointSprinter->second) << "\t");
-    DoLog(0) && (Log() << Verbose(0) << endl);
+    if (DoLog(1)) {
+      std::stringstream output;
+      output << "Remaining points are: ";
+      for (PointMap::iterator PointSprinter = TesselStruct->PointsOnBoundary.begin(); PointSprinter != TesselStruct->PointsOnBoundary.end(); PointSprinter++)
+        output << *(PointSprinter->second) << "\t";
+      LOG(1, output.str());
+    }
 
     PointRunner = TesselStruct->PointsOnBoundary.begin();
@@ -505 +515 @@
   // check whether there is something to work on
   if (TesselStruct == NULL) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "TesselStruct is empty!" << endl);
+    ELOG(1, "TesselStruct is empty!");
     return volume;
   }
@@ -521 +531 @@
       PointAdvance++;
       point = PointRunner->second;
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl);
+      LOG(1, "INFO: Current point is " << *point << ".");
       for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
         line = LineRunner->second;
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl);
+        LOG(1, "INFO: Current line of point " << *point << " is " << *line << ".");
         if (!line->CheckConvexityCriterion()) {
           // remove the point if needed
-          DoLog(1) && (Log() << Verbose(1) << "... point " << *point << " cannot be on convex envelope." << endl);
+          LOG(1, "... point " << *point << " cannot be on convex envelope.");
           volume += TesselStruct->RemovePointFromTesselatedSurface(point);
           sprintf(dummy, "-first-%d", ++run);
@@ -548 +558 @@
       LineAdvance++;
       line = LineRunner->second;
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Picking farthest baseline for line is " << *line << "." << endl);
+      LOG(1, "INFO: Picking farthest baseline for line is " << *line << ".");
       // take highest of both lines
       if (TesselStruct->IsConvexRectangle(line) == NULL) {
@@ -571 +581 @@
 //    LineAdvance++;
 //    line = LineRunner->second;
-//    Log() << Verbose(1) << "INFO: Current line is " << *line << "." << endl;
+//    LOG(1, "INFO: Current line is " << *line << ".");
 //    //if (LineAdvance != TesselStruct->LinesOnBoundary.end())
-//      //Log() << Verbose(1) << "INFO: Next line will be " << *(LineAdvance->second) << "." << endl;
+//      //LOG(1, "INFO: Next line will be " << *(LineAdvance->second) << ".");
 //    if (!line->CheckConvexityCriterion(out)) {
-//      Log() << Verbose(1) << "... line " << *line << " is concave, flipping it." << endl;
+//      LOG(1, "INFO: ... line " << *line << " is concave, flipping it.");
 //
 //      // take highest of both lines
@@ -589 +599 @@
 
   // end
-  DoLog(0) && (Log() << Verbose(0) << "Volume is " << volume << "." << endl);
+  LOG(0, "Volume is " << volume << ".");
   return volume;
 };
@@ -622 +632 @@
       const double h = x.Norm(); // distance of CoG to triangle
       const double PyramidVolume = (1. / 3.) * G * h; // this formula holds for _all_ pyramids (independent of n-edge base or (not) centered peak)
-      Log() << Verbose(1) << "Area of triangle is " << setprecision(10) << G << " "
+      LOG(1, "INFO: Area of triangle is " << setprecision(10) << G << " "
           << (IsAngstroem ? "angstrom" : "atomiclength") << "^2, height is "
           << h << " and the volume is " << PyramidVolume << " "
-          << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl;
+          << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
       volume += PyramidVolume;
     }
-  Log() << Verbose(0) << "RESULT: The summed volume is " << setprecision(6)
-      << volume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3."
-      << endl;
+  LOG(0, "RESULT: The summed volume is " << setprecision(6)
+      << volume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
 
   return volume;
@@ -722 +731 @@
       totalmass += (*iter)->getType()->getMass();
   }
-  DoLog(0) && (Log() << Verbose(0) << "RESULT: The summed mass is " << setprecision(10) << totalmass << " atomicmassunit." << endl);
-  DoLog(0) && (Log() << Verbose(0) << "RESULT: The average density is " << setprecision(10) << totalmass / clustervolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl);
+  LOG(0, "RESULT: The summed mass is " << setprecision(10) << totalmass << " atomicmassunit.");
+  LOG(0, "RESULT: The average density is " << setprecision(10) << totalmass / clustervolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
 
   // solve cubic polynomial
-  DoLog(1) && (Log() << Verbose(1) << "Solving equidistant suspension in water problem ..." << endl);
+  LOG(1, "Solving equidistant suspension in water problem ...");
   if (IsAngstroem)
     cellvolume = (TotalNoClusters * totalmass / SOLVENTDENSITY_A - (totalmass / clustervolume)) / (celldensity - 1);
   else
     cellvolume = (TotalNoClusters * totalmass / SOLVENTDENSITY_a0 - (totalmass / clustervolume)) / (celldensity - 1);
-  DoLog(1) && (Log() << Verbose(1) << "Cellvolume needed for a density of " << celldensity << " g/cm^3 is " << cellvolume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl);
+  LOG(1, "Cellvolume needed for a density of " << celldensity << " g/cm^3 is " << cellvolume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
 
   double minimumvolume = TotalNoClusters * (GreatestDiameter[0] * GreatestDiameter[1] * GreatestDiameter[2]);
-  DoLog(1) && (Log() << Verbose(1) << "Minimum volume of the convex envelope contained in a rectangular box is " << minimumvolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl);
+  LOG(1, "Minimum volume of the convex envelope contained in a rectangular box is " << minimumvolume << " atomicmassunit/" << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
   if (minimumvolume > cellvolume) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "the containing box already has a greater volume than the envisaged cell volume!" << endl);
-    DoLog(0) && (Log() << Verbose(0) << "Setting Box dimensions to minimum possible, the greatest diameters." << endl);
+    ELOG(1, "the containing box already has a greater volume than the envisaged cell volume!");
+    LOG(0, "Setting Box dimensions to minimum possible, the greatest diameters.");
     for (int i = 0; i < NDIM; i++)
       BoxLengths[i] = GreatestDiameter[i];
@@ -749 +758 @@
     double x2 = 0.;
     if (gsl_poly_solve_cubic(BoxLengths[0], BoxLengths[1], BoxLengths[2], &x0, &x1, &x2) == 1) // either 1 or 3 on return
-      DoLog(0) && (Log() << Verbose(0) << "RESULT: The resulting spacing is: " << x0 << " ." << endl);
+      LOG(0, "RESULT: The resulting spacing is: " << x0 << " .");
     else {
-      DoLog(0) && (Log() << Verbose(0) << "RESULT: The resulting spacings are: " << x0 << " and " << x1 << " and " << x2 << " ." << endl);
+      LOG(0, "RESULT: The resulting spacings are: " << x0 << " and " << x1 << " and " << x2 << " .");
       x0 = x2; // sorted in ascending order
     }
@@ -762 +771 @@
 
     // set new box dimensions
-    DoLog(0) && (Log() << Verbose(0) << "Translating to box with these boundaries." << endl);
+    LOG(0, "Translating to box with these boundaries.");
     mol->SetBoxDimension(&BoxLengths);
     mol->CenterInBox();
@@ -769 +778 @@
   // update Box of atoms by boundary
   mol->SetBoxDimension(&BoxLengths);
-  DoLog(0) && (Log() << Verbose(0) << "RESULT: The resulting cell dimensions are: " << BoxLengths[0] << " and " << BoxLengths[1] << " and " << BoxLengths[2] << " with total volume of " << cellvolume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3." << endl);
+  LOG(0, "RESULT: The resulting cell dimensions are: " << BoxLengths[0] << " and " << BoxLengths[1] << " and " << BoxLengths[2] << " with total volume of " << cellvolume << " " << (IsAngstroem ? "angstrom" : "atomiclength") << "^3.");
 };
 
@@ -809 +818 @@
   for (MoleculeList::iterator ListRunner = List->ListOfMolecules.begin(); ListRunner != List->ListOfMolecules.end(); ListRunner++)
     if ((*ListRunner)->getAtomCount() > 0) {
-      DoLog(1) && (Log() << Verbose(1) << "Pre-creating linked cell lists for molecule " << *ListRunner << "." << endl);
+      LOG(1, "Pre-creating linked cell lists for molecule " << *ListRunner << ".");
       PointCloudAdaptor< molecule > cloud(*ListRunner, (*ListRunner)->name);
       LCList[(*ListRunner)] = new LinkedCell(cloud, 10.); // get linked cell list
-      DoLog(1) && (Log() << Verbose(1) << "Pre-creating tesselation for molecule " << *ListRunner << "." << endl);
+      LOG(1, "Pre-creating tesselation for molecule " << *ListRunner << ".");
       TesselStruct[(*ListRunner)] = NULL;
       FindNonConvexBorder((*ListRunner), TesselStruct[(*ListRunner)], (const LinkedCell *&)LCList[(*ListRunner)], 5., NULL);
@@ -820 +829 @@
   filler->CenterEdge(&Inserter);
   const int FillerCount = filler->getAtomCount();
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Filler molecule has the following bonds:" << endl);
+  LOG(2, "INFO: Filler molecule has the following bonds:");
   for(molecule::iterator AtomRunner = filler->begin(); AtomRunner != filler->end(); ++AtomRunner) {
     const BondList& ListOfBonds = (*AtomRunner)->getListOfBonds();
@@ -827 +836 @@
         ++BondRunner) {
       if ((*BondRunner)->leftatom == *AtomRunner)
-        DoLog(2) && (Log() << Verbose(2) << "  " << *(*BondRunner) << endl);
+        LOG(2, "  " << *(*BondRunner));
     }
   }
@@ -837 +846 @@
   for(int i=0;i<NDIM;i++)
     N[i] = (int) ceil(1./FillerDistance[i]);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Grid steps are " << N[0] << ", " << N[1] << ", " << N[2] << "." << endl);
+  LOG(1, "INFO: Grid steps are " << N[0] << ", " << N[1] << ", " << N[2] << ".");
 
   // initialize seed of random number generator to current time
@@ -854 +863 @@
         for (int i=0;i<NDIM;i++)
           FillerTranslations[i] = RandomMolDisplacement*(random()/((rng_max-rng_min)/2.) - 1.);
-        DoLog(2) && (Log() << Verbose(2) << "INFO: Current Position is " << CurrentPosition << "+" << FillerTranslations << "." << endl);
+        LOG(2, "INFO: Current Position is " << CurrentPosition << "+" << FillerTranslations << ".");
 
         // go through all atoms
@@ -907 +916 @@
           // insert into Filling
           if (FillIt) {
-            DoLog(1) && (Log() << Verbose(1) << "INFO: Position at " << Inserter << " is outer point." << endl);
+            LOG(1, "INFO: Position at " << Inserter << " is outer point.");
             // copy atom ...
             CopyAtoms[(*iter)->getNr()] = (*iter)->clone();
             (*CopyAtoms[(*iter)->getNr()]).setPosition(Inserter);
             Filling->AddAtom(CopyAtoms[(*iter)->getNr()]);
-            DoLog(1) && (Log() << Verbose(1) << "Filling atom " << **iter << ", translated to " << AtomTranslations << ", at final position is " << (CopyAtoms[(*iter)->getNr()]->getPosition()) << "." << endl);
+            LOG(1, "Filling atom " << **iter << ", translated to " << AtomTranslations << ", at final position is " << (CopyAtoms[(*iter)->getNr()]->getPosition()) << ".");
           } else {
-            DoLog(1) && (Log() << Verbose(1) << "INFO: Position at " << Inserter << " is inner point, within boundary or outside of MaxDistance." << endl);
+            LOG(1, "INFO: Position at " << Inserter << " is inner point, within boundary or outside of MaxDistance.");
             CopyAtoms[(*iter)->getNr()] = NULL;
             continue;
@@ -928 +937 @@
               Binder = (*BondRunner);
               if ((CopyAtoms[Binder->leftatom->getNr()] != NULL) && (CopyAtoms[Binder->rightatom->getNr()] != NULL)) {
-                Log()  << Verbose(3) << "Adding Bond between " << *CopyAtoms[Binder->leftatom->getNr()] << " and " << *CopyAtoms[Binder->rightatom->getNr()]<< "." << endl;
+                LOG(3, "Adding Bond between " << *CopyAtoms[Binder->leftatom->getNr()] << " and " << *CopyAtoms[Binder->rightatom->getNr()]<< ".");
                 Filling->AddBond(CopyAtoms[Binder->leftatom->getNr()], CopyAtoms[Binder->rightatom->getNr()], Binder->BondDegree);
               }
@@ -997 +1006 @@
   }
   if (Filling->empty()) {
-    DoLog(0) && (Log() << Verbose(0) << "Removing molecule " << Filling->getName() << ", all atoms have been removed." << std::endl);
+    LOG(0, "Removing molecule " << Filling->getName() << ", all atoms have been removed.");
     World::getInstance().destroyMolecule(Filling);
     Filling = NULL;
@@ -1034 +1043 @@
   const bool result = (liste->size() == compareTo);
   if (!result) {
-    DoLog(0) && (Log() << Verbose(0) << "Skipping because of the following atoms:" << std::endl);
+    LOG(0, "Skipping because of the following atoms:");
     for (TesselPointSTLList::const_iterator iter = liste->begin();
         iter != liste->end();
         ++iter) {
-      DoLog(0) && (Log() << Verbose(0) << **iter << std::endl);
+      LOG(0, **iter);
     }
   }
@@ -1106 +1115 @@
   for (std::vector<molecule *>::iterator ListRunner = List.begin(); ListRunner != List.end(); ListRunner++)
     if ((*ListRunner)->getAtomCount() > 0) {
-      DoLog(1) && (Log() << Verbose(1) << "Pre-creating linked cell lists for molecule " << *ListRunner << "." << endl);
+      LOG(1, "Pre-creating linked cell lists for molecule " << *ListRunner << ".");
       PointCloudAdaptor< molecule > cloud(*ListRunner, (*ListRunner)->name);
       LCList[(*ListRunner)] = new LinkedCell(cloud, 10.); // get linked cell list
@@ -1116 +1125 @@
   delete gravity;
   //const int FillerCount = filler->getAtomCount();
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Filler molecule has the following bonds:" << endl);
+  LOG(2, "INFO: Filler molecule has the following bonds:");
   for(molecule::iterator AtomRunner = filler->begin(); AtomRunner != filler->end(); ++AtomRunner) {
     const BondList& ListOfBonds = (*AtomRunner)->getListOfBonds();
@@ -1123 +1132 @@
         ++BondRunner)
       if ((*BondRunner)->leftatom == *AtomRunner)
-        DoLog(2) && (Log() << Verbose(2) << "  " << *(*BondRunner) << endl);
+        LOG(2, "  " << *(*BondRunner));
   }
 
@@ -1130 +1139 @@
   for(int i=0;i<NDIM;i++)
     N[i] = (int) ceil(1./FillerDistance[i]);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Grid steps are " << N[0] << ", " << N[1] << ", " << N[2] << "." << endl);
+  LOG(1, "INFO: Grid steps are " << N[0] << ", " << N[1] << ", " << N[2] << ".");
 
   // initialize seed of random number generator to current time
@@ -1147 +1156 @@
         for (int i=0;i<NDIM;i++) // have the random values [-1,1]*RandomMolDisplacement
           FillerTranslations[i] = RandomMolDisplacement*(random()/((rng_max-rng_min)/2.) - 1.);
-        DoLog(2) && (Log() << Verbose(2) << "INFO: Current Position is " << CurrentPosition << "+" << FillerTranslations << "." << endl);
+        LOG(2, "INFO: Current Position is " << CurrentPosition << "+" << FillerTranslations << ".");
 
         // ... and rotation matrix
@@ -1173 +1182 @@
         if (FillIt) {
           Inserter = CurrentPosition + FillerTranslations;
-          DoLog(1) && (Log() << Verbose(1) << "INFO: Position at " << Inserter << " is void point." << endl);
+          LOG(1, "INFO: Position at " << Inserter << " is void point.");
           // fill!
           Filling = filler->CopyMolecule();
@@ -1195 +1204 @@
           }
         } else {
-         DoLog(1) && (Log() << Verbose(1) << "INFO: Position at " << Inserter << " is non-void point, within boundary or outside of MaxDistance." << endl);
+         LOG(1, "INFO: Position at " << Inserter << " is non-void point, within boundary or outside of MaxDistance.");
           continue;
         }
@@ -1221 +1230 @@
   }
 
-  DoLog(0) && (Log() << Verbose(0) << MolList->ListOfMolecules.size() << " molecules have been inserted." << std::endl);
+  LOG(0, MolList->ListOfMolecules.size() << " molecules have been inserted.");
 
   for (std::map<molecule *, LinkedCell *>::iterator ListRunner = LCList.begin(); !LCList.empty(); ListRunner = LCList.begin()) {
@@ -1250 +1259 @@
 
   if (TesselStruct == NULL) {
-    DoLog(1) && (Log() << Verbose(1) << "Allocating Tesselation struct ..." << endl);
+    LOG(1, "Allocating Tesselation struct ...");
     TesselStruct= new Tesselation;
   } else {
     delete(TesselStruct);
-    DoLog(1) && (Log() << Verbose(1) << "Re-Allocating Tesselation struct ..." << endl);
+    LOG(1, "Re-Allocating Tesselation struct ...");
     TesselStruct = new Tesselation;
   }
@@ -1267 +1276 @@
   // 1. get starting triangle
   if (!TesselStruct->FindStartingTriangle(RADIUS, LCList)) {
-    DoeLog(0) && (eLog() << Verbose(0) << "No valid starting triangle found." << endl);
+    ELOG(0, "No valid starting triangle found.");
     //performCriticalExit();
   }
@@ -1280 +1289 @@
     (cerr << "There are " <<  TesselStruct->TrianglesOnBoundary.size() << " triangles and " << TesselStruct->OpenLines.size() << " open lines to scan for candidates." << endl);
     // 2a. print OpenLines without candidates
-    DoLog(1) && (Log() << Verbose(1) << "There are the following open lines to scan for a candidates:" << endl);
+    LOG(1, "There are the following open lines to scan for a candidates:");
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
       if (Runner->second->pointlist.empty())
-        DoLog(1) && (Log() << Verbose(1) << " " << *(Runner->second) << endl);
+        LOG(1, " " << *(Runner->second));
 
     // 2b. find best candidate for each OpenLine
@@ -1289 +1298 @@
 
     // 2c. print OpenLines with candidates again
-    DoLog(1) && (Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:" << endl);
+    LOG(1, "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:");
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      DoLog(1) && (Log() << Verbose(1) << " " << *(Runner->second) << endl);
+      LOG(1, " " << *(Runner->second));
 
     // 2d. search for smallest ShortestAngle among all candidates
@@ -1299 +1308 @@
         baseline = Runner->second;
         ShortestAngle = baseline->ShortestAngle;
-        DoLog(1) && (Log() << Verbose(1) << "New best candidate is " << *baseline->BaseLine << " with point " << *(*baseline->pointlist.begin()) << " and angle " << baseline->ShortestAngle << endl);
+        LOG(1, "New best candidate is " << *baseline->BaseLine << " with point " << *(*baseline->pointlist.begin()) << " and angle " << baseline->ShortestAngle);
       }
     }
@@ -1324 +1333 @@
 //  class TesselPoint *Runner = NULL;
 //    Runner = *iter;
-//    Log() << Verbose(1) << "Checking on " << Runner->Name << " ... " << endl;
+//    LOG(1, "Checking on " << Runner->Name << " ... ");
 //    if (!->IsInnerPoint(Runner, LCList)) {
-//      Log() << Verbose(2) << Runner->Name << " is outside of envelope, adding via degenerated triangles." << endl;
+//      LOG(2, Runner->Name << " is outside of envelope, adding via degenerated triangles.");
 //      ->AddBoundaryPointByDegeneratedTriangle(Runner, LCList);
 //    } else {
-//      Log() << Verbose(2) << Runner->Name << " is inside of or on envelope." << endl;
+//      LOG(2, Runner->Name << " is inside of or on envelope.");
 //    }
 //  }

src/Tesselation/ellipsoid.cpp

@@ -55 +55 @@
   double psi,theta,phi; // euler angles in ZX'Z'' convention
 
-  //Log() << Verbose(3) << "Begin of SquaredDistanceToEllipsoid" << endl;
+  //LOG(3, "Begin of SquaredDistanceToEllipsoid");
 
   for(int i=0;i<3;i++)
@@ -62 +62 @@
   // 1. translate coordinate system so that ellipsoid center is in origin
   RefPoint = helper = x - EllipsoidCenter;
-  //Log() << Verbose(4) << "Translated given point is at " << RefPoint << "." << endl;
+  //LOG(4, "Translated given point is at " << RefPoint << ".");
 
   // 2. transform coordinate system by inverse of rotation matrix and of diagonal matrix
@@ -79 +79 @@
   helper *= Matrix;
   helper.ScaleAll(InverseLength);
-  //Log() << Verbose(4) << "Transformed RefPoint is at " << helper << "." << endl;
+  //LOG(4, "Transformed RefPoint is at " << helper << ".");
 
   // 3. construct intersection point with unit sphere and ray between origin and x
   helper.Normalize(); // is simply normalizes vector in distance direction
-  //Log() << Verbose(4) << "Transformed intersection is at " << helper << "." << endl;
+  //LOG(4, "Transformed intersection is at " << helper << ".");
 
   // 4. transform back the constructed intersection point
@@ -100 +100 @@
   Matrix.set(2,2, cos(theta));
   helper *= Matrix;
-  //Log() << Verbose(4) << "Intersection is at " << helper << "." << endl;
+  //LOG(4, "Intersection is at " << helper << ".");
 
   // 5. determine distance between backtransformed point and x
   distance = RefPoint.DistanceSquared(helper);
-  //Log() << Verbose(4) << "Squared distance between intersection and RefPoint is " << distance << "." << endl;
+  //LOG(4, "Squared distance between intersection and RefPoint is " << distance << ".");
 
   return distance;
-  //Log() << Verbose(3) << "End of SquaredDistanceToEllipsoid" << endl;
+  //LOG(3, "End of SquaredDistanceToEllipsoid");
 };
 
@@ -149 +149 @@
   }
 
-  //Log() << Verbose(0) << "Current summed distance is " << SumDistance << "." << endl;
+  //LOG(0, "Current summed distance is " << SumDistance << ".");
   return SumDistance;
 };
@@ -163 +163 @@
 {
   int status = GSL_SUCCESS;
-  DoLog(2) && (Log() << Verbose(2) << "Begin of FitPointSetToEllipsoid " << endl);
+  LOG(2, "Begin of FitPointSetToEllipsoid ");
   if (N >= 3) { // check that enough points are given (9 d.o.f.)
     struct EllipsoidMinimisation par;
@@ -216 +216 @@
           EllipsoidAngle[i] = gsl_vector_get (s->x, i+6);
         }
-        DoLog(4) && (Log() << Verbose(4) << setprecision(3) << "Converged fit at: " << *EllipsoidCenter << ", lengths " << EllipsoidLength[0] << ", " << EllipsoidLength[1] << ", " << EllipsoidLength[2] << ", angles " << EllipsoidAngle[0] << ", " << EllipsoidAngle[1] << ", " << EllipsoidAngle[2] << " with summed distance " << s->fval << "." << endl);
+        LOG(4, setprecision(3) << "Converged fit at: " << *EllipsoidCenter << ", lengths " << EllipsoidLength[0] << ", " << EllipsoidLength[1] << ", " << EllipsoidLength[2] << ", angles " << EllipsoidAngle[0] << ", " << EllipsoidAngle[1] << ", " << EllipsoidAngle[2] << " with summed distance " << s->fval << ".");
       }
 
@@ -226 +226 @@
 
   } else {
-    DoLog(3) && (Log() << Verbose(3) << "Not enough points provided for fit to ellipsoid." << endl);
+    LOG(3, "Not enough points provided for fit to ellipsoid.");
     return false;
   }
-  DoLog(2) && (Log() << Verbose(2) << "End of FitPointSetToEllipsoid" << endl);
+  LOG(2, "End of FitPointSetToEllipsoid");
   if (status == GSL_SUCCESS)
     return true;
@@ -252 +252 @@
   int index;
   TesselPoint *Candidate = NULL;
-  DoLog(2) && (Log() << Verbose(2) << "Begin of PickRandomPointSet" << endl);
+  LOG(2, "Begin of PickRandomPointSet");
 
   // allocate array
@@ -258 +258 @@
     x = new Vector[PointsToPick];
   } else {
-    DoeLog(2) && (eLog()<< Verbose(2) << "Given pointer to vector array seems already allocated." << endl);
+    ELOG(2, "Given pointer to vector array seems already allocated.");
   }
 
@@ -282 +282 @@
     for(int i=0;i<NDIM;i++) // pick three random indices
       LC->n[i] = ((int)random() % LC->N[i]);
-    DoLog(2) && (Log() << Verbose(2) << "INFO: Center cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " ... ");
+    LOG(2, "INFO: Center cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << ".");
     // get random cell
     const TesselPointSTLList *List = LC->GetCurrentCell();
@@ -288 +288 @@
       continue;
     }
-    DoLog(2) && (Log() << Verbose(2) << "with No. " << LC->index << "." << endl);
-
-    DoLog(2) && (Log() << Verbose(2) << "LC Intervals:");
+    LOG(2, "INFO: Cell index is No. " << LC->index << ".");
+
+    if (DoLog(2)) {
+      std::stringstream output;
+      output << "LC Intervals:";
+      for (int i=0;i<NDIM;i++)
+        output << " [" << Nlower[i] << "," << Nupper[i] << "] ";
+      LOG(2, output.str());
+    }
+
     for (int i=0;i<NDIM;i++) {
       Nlower[i] = ((LC->n[i]-1) >= 0) ? LC->n[i]-1 : 0;
       Nupper[i] = ((LC->n[i]+1) < LC->N[i]) ? LC->n[i]+1 : LC->N[i]-1;
-      DoLog(0) && (Log() << Verbose(0) << " [" << Nlower[i] << "," << Nupper[i] << "] ");
-    }
-    DoLog(0) && (Log() << Verbose(0) << endl);
+    }
 
     // count whether there are sufficient atoms in this cell+neighbors
@@ -306 +311 @@
           PointsLeft += List->size();
         }
-    DoLog(2) && (Log() << Verbose(2) << "There are " << PointsLeft << " atoms in this neighbourhood." << endl);
+    LOG(2, "There are " << PointsLeft << " atoms in this neighbourhood.");
     if (PointsLeft < PointsToPick) {  // ensure that we can pick enough points in its neighbourhood at all.
       continue;
@@ -317 +322 @@
       current = PickedAtomNrs.find(index);  // not present?
       if (current == PickedAtomNrs.end()) {
-        //Log() << Verbose(2) << "Picking atom Nr. " << index << "." << endl;
+        //LOG(2, "Picking atom Nr. " << index << ".");
         PickedAtomNrs.insert(index);
       }
@@ -329 +334 @@
         for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
           const TesselPointSTLList *List = LC->GetCurrentCell();
-//          Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
+//          LOG(2, "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points.");
           if (List != NULL) {
 //            if (List->begin() != List->end())
-//              Log() << Verbose(2) << "Going through candidates ... " << endl;
+//              LOG(2, "Going through candidates ... ");
 //            else
-//              Log() << Verbose(2) << "Cell is empty ... " << endl;
+//              LOG(2, "Cell is empty ... ");
             for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
               if ((current != PickedAtomNrs.end()) && (*current == index)) {
                 Candidate = (*Runner);
-                DoLog(2) && (Log() << Verbose(2) << "Current picked node is " << (*Runner)->getName() << " with index " << index << "." << endl);
+                LOG(2, "Current picked node is " << (*Runner)->getName() << " with index " << index << ".");
                 x[PointsPicked++] = Candidate->getPosition();    // we have one more atom picked
                 current++;    // next pre-picked atom
@@ -345 +350 @@
             }
 //          } else {
-//            Log() << Verbose(2) << "List for this index not allocated!" << endl;
+//            LOG(2, "List for this index not allocated!");
           }
         }
-    DoLog(2) && (Log() << Verbose(2) << "The following points were picked: " << endl);
+    LOG(2, "The following points were picked: ");
     for (size_t i=0;i<PointsPicked;i++)
-      DoLog(2) && (Log() << Verbose(2) << x[i] << endl);
+      LOG(2, x[i]);
     if (PointsPicked == PointsToPick)  // break out of loop if we have all
       break;
   } while(1);
 
-  DoLog(2) && (Log() << Verbose(2) << "End of PickRandomPointSet" << endl);
+  LOG(2, "End of PickRandomPointSet");
 };
 
@@ -370 +375 @@
   double value, threshold;
   PointMap *List = &T->PointsOnBoundary;
-  DoLog(2) && (Log() << Verbose(2) << "Begin of PickRandomPointSet" << endl);
+  LOG(2, "Begin of PickRandomPointSet");
 
   // allocate array
@@ -376 +381 @@
     x = new Vector[PointsToPick];
   } else {
-    DoeLog(2) && (eLog()<< Verbose(2) << "Given pointer to vector array seems already allocated." << endl);
+    ELOG(2, "Given pointer to vector array seems already allocated.");
   }
 
@@ -386 +391 @@
       threshold = 1. - (double)(PointsToPick - PointsPicked)/(double)PointsLeft;
       value = (double)random()/(double)(rng_max-rng_min);
-      //Log() << Verbose(3) << "Current node is " << *Runner->second->node << " with " << value << " ... " << threshold << ": ";
       if (value > threshold) {
         x[PointsPicked] = (Runner->second->node->getPosition());
         PointsPicked++;
-        //Log() << Verbose(0) << "IN." << endl;
+        //LOG(3, "Current node is " << *Runner->second->node << " with " << value << " ... " << threshold << ": IN.");
       } else {
-        //Log() << Verbose(0) << "OUT." << endl;
+        //LOG(3, "Current node is " << *Runner->second->node << " with " << value << " ... " << threshold << ": OUT.");
       }
       PointsLeft--;
     }
-  DoLog(2) && (Log() << Verbose(2) << "The following points were picked: " << endl);
+  LOG(2, "The following points were picked: ");
   for (size_t i=0;i<PointsPicked;i++)
-    DoLog(3) && (Log() << Verbose(3) << x[i] << endl);
-
-  DoLog(2) && (Log() << Verbose(2) << "End of PickRandomPointSet" << endl);
+    LOG(3, x[i]);
+
+  LOG(2, "End of PickRandomPointSet");
 };
 
@@ -420 +424 @@
   double EllipsoidAngle[3];
   double distance, MaxDistance, MinDistance;
-  DoLog(0) && (Log() << Verbose(0) << "Begin of FindDistributionOfEllipsoids" << endl);
+  LOG(0, "Begin of FindDistributionOfEllipsoids");
 
   // construct center of gravity of boundary point set for initial ellipsoid center
@@ -427 +431 @@
     Center += (Runner->second->node->getPosition());
   Center.Scale(1./T->PointsOnBoundaryCount);
-  DoLog(1) && (Log() << Verbose(1) << "Center is at " << Center << "." << endl);
+  LOG(1, "Center is at " << Center << ".");
 
   // Output header
@@ -435 +439 @@
   // loop over desired number of parameter sets
   for (;number >0;number--) {
-    DoLog(1) && (Log() << Verbose(1) << "Determining data set " << number << " ... " << endl);
+    LOG(1, "Determining data set " << number << " ... ");
     // pick the point set
     x = NULL;
@@ -451 +455 @@
         MinDistance = distance;
     }
-    //Log() << Verbose(2) << "MinDistance " << MinDistance << ", MaxDistance " << MaxDistance << "." << endl;
+    //LOG(2, "MinDistance " << MinDistance << ", MaxDistance " << MaxDistance << ".");
     EllipsoidCenter = Center;  // use Center of Gravity as initial center of ellipsoid
     for (int i=0;i<3;i++)
@@ -461 +465 @@
     // fit the parameters
     if (FitPointSetToEllipsoid(x, N, &EllipsoidCenter, &EllipsoidLength[0], &EllipsoidAngle[0])) {
-      DoLog(1) && (Log() << Verbose(1) << "Picking succeeded!" << endl);
+      LOG(1, "Picking succeeded!");
       // output obtained parameter set
       output << number << "\t";
@@ -472 +476 @@
       output << endl;
     } else { // increase N to pick one more
-      DoLog(1) && (Log() << Verbose(1) << "Picking failed!" << endl);
+      LOG(1, "Picking failed!");
       number++;
     }
@@ -480 +484 @@
   output.close();
 
-  DoLog(0) && (Log() << Verbose(0) << "End of FindDistributionOfEllipsoids" << endl);
-};
+  LOG(0, "End of FindDistributionOfEllipsoids");
+};

src/Tesselation/tesselation.cpp

@@ -22 +22 @@
 #include <fstream>
 #include <iomanip>
+#include <sstream>
 
 #include "BoundaryPointSet.hpp"
@@ -76 +77 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(0) && (Log() << Verbose(0) << "Free'ing TesselStruct ... " << endl);
+  LOG(0, "Free'ing TesselStruct ... ");
   for (TriangleMap::iterator runner = TrianglesOnBoundary.begin(); runner != TrianglesOnBoundary.end(); runner++) {
     if (runner->second != NULL) {
@@ -82 +83 @@
       runner->second = NULL;
     } else
-      DoeLog(1) && (eLog() << Verbose(1) << "The triangle " << runner->first << " has already been free'd." << endl);
-  }
-  DoLog(0) && (Log() << Verbose(0) << "This envelope was written to file " << TriangleFilesWritten << " times(s)." << endl);
+      ELOG(1, "The triangle " << runner->first << " has already been free'd.");
+  }
+  LOG(0, "This envelope was written to file " << TriangleFilesWritten << " times(s).");
 }
 
@@ -121 +122 @@
     }
   }
-  //    // listing distances
-  //    Log() << Verbose(1) << "Listing DistanceMMap:";
-  //    for(DistanceMultiMap::iterator runner = DistanceMMap.begin(); runner != DistanceMMap.end(); runner++) {
-  //      Log() << Verbose(0) << " " << runner->first << "(" << *runner->second.first->second << ", " << *runner->second.second->second << ")";
-  //    }
-  //    Log() << Verbose(0) << endl;
+//  // listing distances
+//  if (DoLog(1)) {
+//    std::stringstream output;
+//    output << "Listing DistanceMMap:";
+//    for(DistanceMultiMap::iterator runner = DistanceMMap.begin(); runner != DistanceMMap.end(); runner++) {
+//      output << " " << runner->first << "(" << *runner->second.first->second << ", " << *runner->second.second->second << ")";
+//    }
+//    LOG(1, output.str());
+//  }
   // 4b2. pick three baselines forming a triangle
   // 1. we take from the smallest sum of squared distance as the base line BC (with peak A) onward as the triangle candidate
@@ -137 +141 @@
                         baseline->second.first->second->node->getPosition(),
                         baseline->second.second->second->node->getPosition()).getNormal();
-    DoLog(2) && (Log() << Verbose(2) << "Plane vector of candidate triangle is " << PlaneVector << endl);
+    LOG(2, "Plane vector of candidate triangle is " << PlaneVector);
     // 4. loop over all points
     double sign = 0.;
@@ -150 +154 @@
       if (fabs(distance) < 1e-4) // we need to have a small epsilon around 0 which is still ok
         continue;
-      DoLog(2) && (Log() << Verbose(2) << "Projection of " << checker->second->node->getName() << " yields distance of " << distance << "." << endl);
+      LOG(2, "Projection of " << checker->second->node->getName() << " yields distance of " << distance << ".");
       tmp = distance / fabs(distance);
       // 4b. Any have different sign to than before? (i.e. would lie outside convex hull with this starting triangle)
       if ((sign != 0) && (tmp != sign)) {
         // 4c. If so, break 4. loop and continue with next candidate in 1. loop
-        DoLog(2) && (Log() << Verbose(2) << "Current candidates: " << A->second->node->getName() << "," << baseline->second.first->second->node->getName() << "," << baseline->second.second->second->node->getName() << " leaves " << checker->second->node->getName() << " outside the convex hull." << endl);
+        LOG(2, "Current candidates: " << A->second->node->getName() << "," << baseline->second.first->second->node->getName() << "," << baseline->second.second->second->node->getName() << " leaves " << checker->second->node->getName() << " outside the convex hull.");
         break;
       } else { // note the sign for later
-        DoLog(2) && (Log() << Verbose(2) << "Current candidates: " << A->second->node->getName() << "," << baseline->second.first->second->node->getName() << "," << baseline->second.second->second->node->getName() << " leave " << checker->second->node->getName() << " inside the convex hull." << endl);
+        LOG(2, "Current candidates: " << A->second->node->getName() << "," << baseline->second.first->second->node->getName() << "," << baseline->second.second->second->node->getName() << " leave " << checker->second->node->getName() << " inside the convex hull.");
         sign = tmp;
       }
@@ -178 +182 @@
     // 5. come this far, all on same side? Then break 1. loop and construct triangle
     if (checker == PointsOnBoundary.end()) {
-      DoLog(2) && (Log() << Verbose(2) << "Looks like we have a candidate!" << endl);
+      LOG(2, "Looks like we have a candidate!");
       break;
     }
@@ -202 +206 @@
     }
 
-    DoLog(1) && (Log() << Verbose(1) << "Starting triangle is " << *BTS << "." << endl);
+    LOG(1, "Starting triangle is " << *BTS << ".");
   } else {
-    DoeLog(0) && (eLog() << Verbose(0) << "No starting triangle found." << endl);
+    ELOG(0, "No starting triangle found.");
   }
 }
@@ -243 +247 @@
         // get peak point with respect to this base line's only triangle
         BTS = baseline->second->triangles.begin()->second; // there is only one triangle so far
-        DoLog(0) && (Log() << Verbose(0) << "Current baseline is between " << *(baseline->second) << "." << endl);
+        LOG(0, "Current baseline is between " << *(baseline->second) << ".");
         for (int i = 0; i < 3; i++)
           if ((BTS->endpoints[i] != baseline->second->endpoints[0]) && (BTS->endpoints[i] != baseline->second->endpoints[1]))
             peak = BTS->endpoints[i];
-        DoLog(1) && (Log() << Verbose(1) << " and has peak " << *peak << "." << endl);
+        LOG(1, " and has peak " << *peak << ".");
 
         // prepare some auxiliary vectors
@@ -260 +264 @@
           CenterVector += BTS->getEndpoint(i);
         CenterVector.Scale(1. / 3.);
-        DoLog(2) && (Log() << Verbose(2) << "CenterVector of base triangle is " << CenterVector << endl);
+        LOG(2, "CenterVector of base triangle is " << CenterVector);
 
         // normal vector of triangle
@@ -266 +270 @@
         BTS->GetNormalVector(NormalVector);
         NormalVector = BTS->NormalVector;
-        DoLog(2) && (Log() << Verbose(2) << "NormalVector of base triangle is " << NormalVector << endl);
+        LOG(2, "NormalVector of base triangle is " << NormalVector);
 
         // vector in propagation direction (out of triangle)
@@ -272 +276 @@
         PropagationVector = Plane(BaseLine, NormalVector,0).getNormal();
         TempVector = CenterVector - (baseline->second->endpoints[0]->node->getPosition()); // TempVector is vector on triangle plane pointing from one baseline egde towards center!
-        //Log() << Verbose(0) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
+        //LOG(0, "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << ".");
         if (PropagationVector.ScalarProduct(TempVector) > 0) // make sure normal propagation vector points outward from baseline
           PropagationVector.Scale(-1.);
-        DoLog(2) && (Log() << Verbose(2) << "PropagationVector of base triangle is " << PropagationVector << endl);
+        LOG(2, "PropagationVector of base triangle is " << PropagationVector);
         winner = PointsOnBoundary.end();
 
@@ -281 +285 @@
         for (PointMap::iterator target = PointsOnBoundary.begin(); target != PointsOnBoundary.end(); target++) {
           if ((target->second != baseline->second->endpoints[0]) && (target->second != baseline->second->endpoints[1])) { // don't take the same endpoints
-            DoLog(1) && (Log() << Verbose(1) << "Target point is " << *(target->second) << ":" << endl);
+            LOG(1, "Target point is " << *(target->second) << ":");
 
             // first check direction, so that triangles don't intersect
@@ -287 +291 @@
             VirtualNormalVector.ProjectOntoPlane(NormalVector);
             TempAngle = VirtualNormalVector.Angle(PropagationVector);
-            DoLog(2) && (Log() << Verbose(2) << "VirtualNormalVector is " << VirtualNormalVector << " and PropagationVector is " << PropagationVector << "." << endl);
+            LOG(2, "VirtualNormalVector is " << VirtualNormalVector << " and PropagationVector is " << PropagationVector << ".");
             if (TempAngle > (M_PI / 2.)) { // no bends bigger than Pi/2 (90 degrees)
-              DoLog(2) && (Log() << Verbose(2) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", bad direction!" << endl);
+              LOG(2, "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", bad direction!");
               continue;
             } else
-              DoLog(2) && (Log() << Verbose(2) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", good direction!" << endl);
+              LOG(2, "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", good direction!");
 
             // check first and second endpoint (if any connecting line goes to target has at least not more than 1 triangle)
@@ -298 +302 @@
             LineChecker[1] = baseline->second->endpoints[1]->lines.find(target->first);
             if (((LineChecker[0] != baseline->second->endpoints[0]->lines.end()) && (LineChecker[0]->second->triangles.size() == 2))) {
-              DoLog(2) && (Log() << Verbose(2) << *(baseline->second->endpoints[0]) << " has line " << *(LineChecker[0]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[0]->second->triangles.size() << " triangles." << endl);
+              LOG(2, *(baseline->second->endpoints[0]) << " has line " << *(LineChecker[0]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[0]->second->triangles.size() << " triangles.");
               continue;
             }
             if (((LineChecker[1] != baseline->second->endpoints[1]->lines.end()) && (LineChecker[1]->second->triangles.size() == 2))) {
-              DoLog(2) && (Log() << Verbose(2) << *(baseline->second->endpoints[1]) << " has line " << *(LineChecker[1]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[1]->second->triangles.size() << " triangles." << endl);
+              LOG(2, *(baseline->second->endpoints[1]) << " has line " << *(LineChecker[1]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[1]->second->triangles.size() << " triangles.");
               continue;
             }
@@ -308 +312 @@
             // check whether the envisaged triangle does not already exist (if both lines exist and have same endpoint)
             if ((((LineChecker[0] != baseline->second->endpoints[0]->lines.end()) && (LineChecker[1] != baseline->second->endpoints[1]->lines.end()) && (GetCommonEndpoint(LineChecker[0]->second, LineChecker[1]->second) == peak)))) {
-              DoLog(4) && (Log() << Verbose(4) << "Current target is peak!" << endl);
+              LOG(4, "Current target is peak!");
               continue;
             }
@@ -317 +321 @@
             helper.ProjectOntoPlane(TempVector);
             if (fabs(helper.NormSquared()) < MYEPSILON) {
-              DoLog(2) && (Log() << Verbose(2) << "Chosen set of vectors is linear dependent." << endl);
+              LOG(2, "Chosen set of vectors is linear dependent.");
               continue;
             }
@@ -335 +339 @@
             // calculate angle
             TempAngle = NormalVector.Angle(VirtualNormalVector);
-            DoLog(2) && (Log() << Verbose(2) << "NormalVector is " << VirtualNormalVector << " and the angle is " << TempAngle << "." << endl);
+            LOG(2, "NormalVector is " << VirtualNormalVector << " and the angle is " << TempAngle << ".");
             if ((SmallestAngle - TempAngle) > MYEPSILON) { // set to new possible winner
               SmallestAngle = TempAngle;
               winner = target;
-              DoLog(2) && (Log() << Verbose(2) << "New winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl);
+              LOG(2, "New winner " << *winner->second->node << " due to smaller angle between normal vectors.");
             } else if (fabs(SmallestAngle - TempAngle) < MYEPSILON) { // check the angle to propagation, both possible targets are in one plane! (their normals have same angle)
               // hence, check the angles to some normal direction from our base line but in this common plane of both targets...
@@ -354 +358 @@
                 SmallestAngle = TempAngle;
                 winner = target;
-                DoLog(2) && (Log() << Verbose(2) << "New winner " << *winner->second->node << " due to smaller angle " << TempAngle << " to propagation direction." << endl);
+                LOG(2, "New winner " << *winner->second->node << " due to smaller angle " << TempAngle << " to propagation direction.");
               } else
-                DoLog(2) && (Log() << Verbose(2) << "Keeping old winner " << *winner->second->node << " due to smaller angle to propagation direction." << endl);
+                LOG(2, "Keeping old winner " << *winner->second->node << " due to smaller angle to propagation direction.");
             } else
-              DoLog(2) && (Log() << Verbose(2) << "Keeping old winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl);
+              LOG(2, "Keeping old winner " << *winner->second->node << " due to smaller angle between normal vectors.");
           }
         } // end of loop over all boundary points
@@ -364 +368 @@
         // 5b. The point of the above whose triangle has the greatest angle with the triangle the current line belongs to (it only belongs to one, remember!): New triangle
         if (winner != PointsOnBoundary.end()) {
-          DoLog(0) && (Log() << Verbose(0) << "Winning target point is " << *(winner->second) << " with angle " << SmallestAngle << "." << endl);
+          LOG(0, "Winning target point is " << *(winner->second) << " with angle " << SmallestAngle << ".");
           // create the lins of not yet present
           BLS[0] = baseline->second;
@@ -394 +398 @@
           TrianglesOnBoundaryCount++;
         } else {
-          DoeLog(2) && (eLog() << Verbose(2) << "I could not determine a winner for this baseline " << *(baseline->second) << "." << endl);
+          ELOG(2, "I could not determine a winner for this baseline " << *(baseline->second) << ".");
         }
 
         // 5d. If the set of lines is not yet empty, go to 5. and continue
       } else
-        DoLog(0) && (Log() << Verbose(0) << "Baseline candidate " << *(baseline->second) << " has a triangle count of " << baseline->second->triangles.size() << "." << endl);
+        LOG(0, "Baseline candidate " << *(baseline->second) << " has a triangle count of " << baseline->second->triangles.size() << ".");
   } while (flag);
 
@@ -434 +438 @@
     }
     Walker = cloud.GetPoint();
-    DoLog(0) && (Log() << Verbose(0) << "Current point is " << *Walker << "." << endl);
+    LOG(0, "Current point is " << *Walker << ".");
     // get the next triangle
     triangles = FindClosestTrianglesToVector(Walker->getPosition(), BoundaryPoints);
@@ -443 +447 @@
     delete triangles;
     if ((BTS == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
-      DoLog(0) && (Log() << Verbose(0) << "No triangles found, probably a tesselation point itself." << endl);
+      LOG(0, "No triangles found, probably a tesselation point itself.");
       cloud.GoToNext();
       continue;
     } else {
     }
-    DoLog(0) && (Log() << Verbose(0) << "Closest triangle is " << *BTS << "." << endl);
+    LOG(0, "Closest triangle is " << *BTS << ".");
     // get the intersection point
     if (BTS->GetIntersectionInsideTriangle(*Center, Walker->getPosition(), Intersection)) {
-      DoLog(0) && (Log() << Verbose(0) << "We have an intersection at " << Intersection << "." << endl);
+      LOG(0, "We have an intersection at " << Intersection << ".");
       // we have the intersection, check whether in- or outside of boundary
       if ((Center->DistanceSquared(Walker->getPosition()) - Center->DistanceSquared(Intersection)) < -MYEPSILON) {
         // inside, next!
-        DoLog(0) && (Log() << Verbose(0) << *Walker << " is inside wrt triangle " << *BTS << "." << endl);
+        LOG(0, *Walker << " is inside wrt triangle " << *BTS << ".");
       } else {
         // outside!
-        DoLog(0) && (Log() << Verbose(0) << *Walker << " is outside wrt triangle " << *BTS << "." << endl);
+        LOG(0, *Walker << " is outside wrt triangle " << *BTS << ".");
         class BoundaryLineSet *OldLines[3], *NewLines[3];
         class BoundaryPointSet *OldPoints[3], *NewPoint;
@@ -468 +472 @@
         Normal = BTS->NormalVector;
         // add Walker to boundary points
-        DoLog(0) && (Log() << Verbose(0) << "Adding " << *Walker << " to BoundaryPoints." << endl);
+        LOG(0, "Adding " << *Walker << " to BoundaryPoints.");
         AddFlag = true;
         if (AddBoundaryPoint(Walker, 0))
@@ -475 +479 @@
           continue;
         // remove triangle
-        DoLog(0) && (Log() << Verbose(0) << "Erasing triangle " << *BTS << "." << endl);
+        LOG(0, "Erasing triangle " << *BTS << ".");
         TrianglesOnBoundary.erase(BTS->Nr);
         delete (BTS);
@@ -483 +487 @@
           BPS[1] = OldPoints[i];
           NewLines[i] = new class BoundaryLineSet(BPS, LinesOnBoundaryCount);
-          DoLog(1) && (Log() << Verbose(1) << "Creating new line " << *NewLines[i] << "." << endl);
+          LOG(1, "Creating new line " << *NewLines[i] << ".");
           LinesOnBoundary.insert(LinePair(LinesOnBoundaryCount, NewLines[i])); // no need for check for unique insertion as BPS[0] is definitely a new one
           LinesOnBoundaryCount++;
@@ -494 +498 @@
             if (NewLines[j]->IsConnectedTo(BLS[0])) {
               if (n > 2) {
-                DoeLog(2) && (eLog() << Verbose(2) << BLS[0] << " connects to all of the new lines?!" << endl);
+                ELOG(2, BLS[0] << " connects to all of the new lines?!");
                 return false;
               } else
@@ -505 +509 @@
           BTS->GetNormalVector(Normal);
           Normal.Scale(-1.);
-          DoLog(0) && (Log() << Verbose(0) << "Created new triangle " << *BTS << "." << endl);
+          LOG(0, "Created new triangle " << *BTS << ".");
           TrianglesOnBoundary.insert(TrianglePair(TrianglesOnBoundaryCount, BTS));
           TrianglesOnBoundaryCount++;
@@ -511 +515 @@
       }
     } else { // something is wrong with FindClosestTriangleToPoint!
-      DoeLog(1) && (eLog() << Verbose(1) << "The closest triangle did not produce an intersection!" << endl);
+      ELOG(1, "The closest triangle did not produce an intersection!");
       SuccessFlag = false;
       break;
@@ -562 +566 @@
   } else {
     delete TPS[n];
-    DoLog(0) && (Log() << Verbose(0) << "Node " << *((InsertUnique.first)->second->node) << " is already present in PointsOnBoundary." << endl);
+    LOG(0, "Node " << *((InsertUnique.first)->second->node) << " is already present in PointsOnBoundary.");
     TPS[n] = (InsertUnique.first)->second;
   }
@@ -599 +603 @@
   BoundaryLineSet *WinningLine = NULL;
   if (FindLine != a->lines.end()) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: There is at least one line between " << *a << " and " << *b << ": " << *(FindLine->second) << "." << endl);
+    LOG(1, "INFO: There is at least one line between " << *a << " and " << *b << ": " << *(FindLine->second) << ".");
 
     pair<LineMap::iterator, LineMap::iterator> FindPair;
@@ -605 +609 @@
 
     for (FindLine = FindPair.first; (FindLine != FindPair.second) && (insertNewLine); FindLine++) {
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Checking line " << *(FindLine->second) << " ..." << endl);
+      LOG(1, "INFO: Checking line " << *(FindLine->second) << " ...");
       // If there is a line with less than two attached triangles, we don't need a new line.
       if (FindLine->second->triangles.size() == 1) {
         CandidateMap::iterator Finder = OpenLines.find(FindLine->second);
         if (!Finder->second->pointlist.empty())
-          DoLog(1) && (Log() << Verbose(1) << "INFO: line " << *(FindLine->second) << " is open with candidate " << **(Finder->second->pointlist.begin()) << "." << endl);
+          LOG(1, "INFO: line " << *(FindLine->second) << " is open with candidate " << **(Finder->second->pointlist.begin()) << ".");
         else
-          DoLog(1) && (Log() << Verbose(1) << "INFO: line " << *(FindLine->second) << " is open with no candidate." << endl);
+          LOG(1, "INFO: line " << *(FindLine->second) << " is open with no candidate.");
         // get open line
         for (TesselPointList::const_iterator CandidateChecker = Finder->second->pointlist.begin(); CandidateChecker != Finder->second->pointlist.end(); ++CandidateChecker) {
           if ((*(CandidateChecker) == candidate->node) && (OptCenter == NULL || OptCenter->DistanceSquared(Finder->second->OptCenter) < MYEPSILON )) { // stop searching if candidate matches
-            DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Candidate " << *(*CandidateChecker) << " has the right center " << Finder->second->OptCenter << "." << endl);
+            LOG(1, "ACCEPT: Candidate " << *(*CandidateChecker) << " has the right center " << Finder->second->OptCenter << ".");
             insertNewLine = false;
             WinningLine = FindLine->second;
             break;
           } else {
-            DoLog(1) && (Log() << Verbose(1) << "REJECT: Candidate " << *(*CandidateChecker) << "'s center " << Finder->second->OptCenter << " does not match desired on " << *OptCenter << "." << endl);
+            LOG(1, "REJECT: Candidate " << *(*CandidateChecker) << "'s center " << Finder->second->OptCenter << " does not match desired on " << *OptCenter << ".");
           }
         }
@@ -647 +651 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(0) && (Log() << Verbose(0) << "Adding open line [" << LinesOnBoundaryCount << "|" << *(a->node) << " and " << *(b->node) << "." << endl);
+  LOG(0, "Adding open line [" << LinesOnBoundaryCount << "|" << *(a->node) << " and " << *(b->node) << ".");
   BPS[0] = a;
   BPS[1] = b;
@@ -669 +673 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(0) && (Log() << Verbose(0) << "Using existing line " << *Line << endl);
+  LOG(0, "Using existing line " << *Line);
 
   // set endpoints and line
@@ -678 +682 @@
   CandidateMap::iterator CandidateLine = OpenLines.find(BLS[n]);
   if (CandidateLine != OpenLines.end()) {
-    DoLog(1) && (Log() << Verbose(1) << " Removing line from OpenLines." << endl);
+    LOG(1, " Removing line from OpenLines.");
     delete (CandidateLine->second);
     OpenLines.erase(CandidateLine);
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Line exists and is attached to less than two triangles, but not in OpenLines!" << endl);
+    ELOG(1, "Line exists and is attached to less than two triangles, but not in OpenLines!");
   }
 }
@@ -693 +697 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(1) && (Log() << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl);
+  LOG(1, "Adding triangle to global TrianglesOnBoundary map.");
 
   // add triangle to global map
@@ -713 +717 @@
 {
   Info FunctionInfo(__func__);
-  DoLog(0) && (Log() << Verbose(0) << "Adding triangle to global TrianglesOnBoundary map." << endl);
+  LOG(0, "Adding triangle to global TrianglesOnBoundary map.");
 
   // add triangle to global map
@@ -737 +741 @@
   for (int i = 0; i < 3; i++) {
     if (triangle->lines[i] != NULL) {
-      DoLog(0) && (Log() << Verbose(0) << "Removing triangle Nr." << triangle->Nr << " in line " << *triangle->lines[i] << "." << endl);
+      LOG(0, "Removing triangle Nr." << triangle->Nr << " in line " << *triangle->lines[i] << ".");
       triangle->lines[i]->triangles.erase(triangle->Nr);
+      std::stringstream output;
+      output << "INFO: " << *triangle->lines[i] << " is ";
       if (triangle->lines[i]->triangles.empty()) {
-        DoLog(0) && (Log() << Verbose(0) << *triangle->lines[i] << " is no more attached to any triangle, erasing." << endl);
+        output << "no more attached to any triangle, erasing.";
         RemoveTesselationLine(triangle->lines[i]);
       } else {
-        DoLog(0) && (Log() << Verbose(0) << *triangle->lines[i] << " is still attached to another triangle: " << endl);
+        output << "still attached to another triangle: ";
         OpenLines.insert(pair<BoundaryLineSet *, CandidateForTesselation *> (triangle->lines[i], NULL));
         for (TriangleMap::iterator TriangleRunner = triangle->lines[i]->triangles.begin(); TriangleRunner != triangle->lines[i]->triangles.end(); TriangleRunner++)
-          DoLog(0) && (Log() << Verbose(0) << "\t[" << (TriangleRunner->second)->Nr << "|" << *((TriangleRunner->second)->endpoints[0]) << ", " << *((TriangleRunner->second)->endpoints[1]) << ", " << *((TriangleRunner->second)->endpoints[2]) << "] \t");
-        DoLog(0) && (Log() << Verbose(0) << endl);
-        //        for (int j=0;j<2;j++) {
-        //          Log() << Verbose(0) << "Lines of endpoint " << *(triangle->lines[i]->endpoints[j]) << ": ";
-        //          for(LineMap::iterator LineRunner = triangle->lines[i]->endpoints[j]->lines.begin(); LineRunner != triangle->lines[i]->endpoints[j]->lines.end(); LineRunner++)
-        //            Log() << Verbose(0) << "[" << *(LineRunner->second) << "] \t";
-        //          Log() << Verbose(0) << endl;
-        //        }
+          output << "\t[" << (TriangleRunner->second)->Nr << "|" << *((TriangleRunner->second)->endpoints[0]) << ", " << *((TriangleRunner->second)->endpoints[1]) << ", " << *((TriangleRunner->second)->endpoints[2]) << "] \t";
       }
+      LOG(1, output.str());
       triangle->lines[i] = NULL; // free'd or not: disconnect
     } else
-      DoeLog(1) && (eLog() << Verbose(1) << "This line " << i << " has already been free'd." << endl);
+      ELOG(1, "This line " << i << " has already been free'd.");
   }
 
   if (TrianglesOnBoundary.erase(triangle->Nr))
-    DoLog(0) && (Log() << Verbose(0) << "Removing triangle Nr. " << triangle->Nr << "." << endl);
+    LOG(0, "Removing triangle Nr. " << triangle->Nr << ".");
   delete (triangle);
 }
@@ -793 +793 @@
         for (LineMap::iterator Runner = erasor.first; Runner != erasor.second; Runner++)
           if ((*Runner).second == line) {
-            DoLog(0) && (Log() << Verbose(0) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl);
+            LOG(0, "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << ".");
             line->endpoints[i]->lines.erase(Runner);
             break;
@@ -799 +799 @@
       } else { // there's just a single line left
         if (line->endpoints[i]->lines.erase(line->Nr))
-          DoLog(0) && (Log() << Verbose(0) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl);
+          LOG(0, "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << ".");
       }
       if (line->endpoints[i]->lines.empty()) {
-        DoLog(0) && (Log() << Verbose(0) << *line->endpoints[i] << " has no more lines it's attached to, erasing." << endl);
+        LOG(0, *line->endpoints[i] << " has no more lines it's attached to, erasing.");
         RemoveTesselationPoint(line->endpoints[i]);
-      } else {
-        DoLog(0) && (Log() << Verbose(0) << *line->endpoints[i] << " has still lines it's attached to: ");
+      } else if (DoLog(0)) {
+        std::stringstream output;
+        output << *line->endpoints[i] << " has still lines it's attached to: ";
         for (LineMap::iterator LineRunner = line->endpoints[i]->lines.begin(); LineRunner != line->endpoints[i]->lines.end(); LineRunner++)
-          DoLog(0) && (Log() << Verbose(0) << "[" << *(LineRunner->second) << "] \t");
-        DoLog(0) && (Log() << Verbose(0) << endl);
+          output << "[" << *(LineRunner->second) << "] \t";
+        LOG(0, output.str());
       }
       line->endpoints[i] = NULL; // free'd or not: disconnect
     } else
-      DoeLog(1) && (eLog() << Verbose(1) << "Endpoint " << i << " has already been free'd." << endl);
+      ELOG(1, "Endpoint " << i << " has already been free'd.");
   }
   if (!line->triangles.empty())
-    DoeLog(2) && (eLog() << Verbose(2) << "Memory Leak! I " << *line << " am still connected to some triangles." << endl);
+    ELOG(2, "Memory Leak! I " << *line << " am still connected to some triangles.");
 
   if (LinesOnBoundary.erase(line->Nr))
-    DoLog(0) && (Log() << Verbose(0) << "Removing line Nr. " << line->Nr << "." << endl);
+    LOG(0, "Removing line Nr. " << line->Nr << ".");
   delete (line);
 }
@@ -834 +835 @@
     return;
   if (PointsOnBoundary.erase(point->Nr))
-    DoLog(0) && (Log() << Verbose(0) << "Removing point Nr. " << point->Nr << "." << endl);
+    LOG(0, "Removing point Nr. " << point->Nr << ".");
   delete (point);
 }
@@ -851 +852 @@
   Info FunctionInfo(__func__);
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Checking whether sphere contains no others points ..." << endl);
+  LOG(1, "INFO: Checking whether sphere contains no others points ...");
   bool flag = true;
 
-  DoLog(1) && (Log() << Verbose(1) << "Check by: draw sphere {" << CandidateLine.OtherOptCenter[0] << " " << CandidateLine.OtherOptCenter[1] << " " << CandidateLine.OtherOptCenter[2] << "} radius " << RADIUS << " resolution 30" << endl);
+  LOG(1, "Check by: draw sphere {" << CandidateLine.OtherOptCenter[0] << " " << CandidateLine.OtherOptCenter[1] << " " << CandidateLine.OtherOptCenter[2] << "} radius " << RADIUS << " resolution 30");
   // get all points inside the sphere
   TesselPointList *ListofPoints = LC->GetPointsInsideSphere(RADIUS, &CandidateLine.OtherOptCenter);
 
-  DoLog(1) && (Log() << Verbose(1) << "The following atoms are inside sphere at " << CandidateLine.OtherOptCenter << ":" << endl);
+  LOG(1, "The following atoms are inside sphere at " << CandidateLine.OtherOptCenter << ":");
   for (TesselPointList::const_iterator Runner = ListofPoints->begin(); Runner != ListofPoints->end(); ++Runner)
-    DoLog(1) && (Log() << Verbose(1) << "  " << *(*Runner) << " with distance " << (*Runner)->distance(CandidateLine.OtherOptCenter) << "." << endl);
+    LOG(1, "  " << *(*Runner) << " with distance " << (*Runner)->distance(CandidateLine.OtherOptCenter) << ".");
 
   // remove triangles's endpoints
@@ -872 +873 @@
   // check for other points
   if (!ListofPoints->empty()) {
-    DoLog(1) && (Log() << Verbose(1) << "CheckDegeneracy: There are still " << ListofPoints->size() << " points inside the sphere." << endl);
+    LOG(1, "CheckDegeneracy: There are still " << ListofPoints->size() << " points inside the sphere.");
     flag = false;
-    DoLog(1) && (Log() << Verbose(1) << "External atoms inside of sphere at " << CandidateLine.OtherOptCenter << ":" << endl);
+    LOG(1, "External atoms inside of sphere at " << CandidateLine.OtherOptCenter << ":");
     for (TesselPointList::const_iterator Runner = ListofPoints->begin(); Runner != ListofPoints->end(); ++Runner)
-      DoLog(1) && (Log() << Verbose(1) << "  " << *(*Runner) << " with distance " << (*Runner)->distance(CandidateLine.OtherOptCenter) << "." << endl);
+      LOG(1, "  " << *(*Runner) << " with distance " << (*Runner)->distance(CandidateLine.OtherOptCenter) << ".");
   }
   delete (ListofPoints);
@@ -917 +918 @@
           for (; (FindLine != Points[i]->lines.end()) && (FindLine->first == Points[j]->node->getNr()); FindLine++) {
             TriangleMap *triangles = &FindLine->second->triangles;
-            DoLog(1) && (Log() << Verbose(1) << "Current line is " << FindLine->first << ": " << *(FindLine->second) << " with triangles " << triangles << "." << endl);
+            LOG(1, "Current line is " << FindLine->first << ": " << *(FindLine->second) << " with triangles " << triangles << ".");
             for (TriangleMap::const_iterator FindTriangle = triangles->begin(); FindTriangle != triangles->end(); FindTriangle++) {
               if (FindTriangle->second->IsPresentTupel(Points)) {
@@ -923 +924 @@
               }
             }
-            DoLog(1) && (Log() << Verbose(1) << "end." << endl);
+            LOG(1, "end.");
           }
           // Only one of the triangle lines must be considered for the triangle count.
-          //Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+          //LOG(0, "Found " << adjacentTriangleCount << " adjacent triangles for the point set.");
           //return adjacentTriangleCount;
         }
@@ -933 +934 @@
   }
 
-  DoLog(0) && (Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl);
+  LOG(0, "Found " << adjacentTriangleCount << " adjacent triangles for the point set.");
   return adjacentTriangleCount;
 }
@@ -978 +979 @@
           }
           // Only one of the triangle lines must be considered for the triangle count.
-          //Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+          //LOG(0, "Found " << adjacentTriangleCount << " adjacent triangles for the point set.");
           //return adjacentTriangleCount;
         }
@@ -1028 +1029 @@
       for (LC->n[map[2]] = 0; LC->n[map[2]] < LC->N[map[2]]; LC->n[map[2]]++) {
         const TesselPointSTLList *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+        //LOG(1, "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << ".");
         if (List != NULL) {
           for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
             if ((*Runner)->at(map[0]) > maxCoordinate[map[0]]) {
-              DoLog(1) && (Log() << Verbose(1) << "New maximal for axis " << map[0] << " node is " << *(*Runner) << " at " << (*Runner)->getPosition() << "." << endl);
+              LOG(1, "New maximal for axis " << map[0] << " node is " << *(*Runner) << " at " << (*Runner)->getPosition() << ".");
               maxCoordinate[map[0]] = (*Runner)->at(map[0]);
               MaxPoint[map[0]] = (*Runner);
@@ -1038 +1039 @@
           }
         } else {
-          DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
+          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
         }
       }
   }
 
-  DoLog(1) && (Log() << Verbose(1) << "Found maximum coordinates: ");
-  for (int i = 0; i < NDIM; i++)
-    DoLog(0) && (Log() << Verbose(0) << i << ": " << *MaxPoint[i] << "\t");
-  DoLog(0) && (Log() << Verbose(0) << endl);
+  if (DoLog(1)) {
+    std::stringstream output;
+    output << "Found maximum coordinates: ";
+    for (int i = 0; i < NDIM; i++)
+      output << i << ": " << *MaxPoint[i] << "\t";
+    LOG(1, output.str());
+  }
 
   BTS = NULL;
@@ -1054 +1058 @@
     BaseLine = new BoundaryLineSet();
     BaseLine->endpoints[0] = new BoundaryPointSet(MaxPoint[k]);
-    DoLog(0) && (Log() << Verbose(0) << "Coordinates of start node at " << *BaseLine->endpoints[0]->node << "." << endl);
+    LOG(0, "Coordinates of start node at " << *BaseLine->endpoints[0]->node << ".");
 
     double ShortestAngle;
@@ -1088 +1092 @@
 
     // adding point 1 and point 2 and add the line between them
-    DoLog(0) && (Log() << Verbose(0) << "Coordinates of start node at " << *BaseLine->endpoints[0]->node << "." << endl);
-    DoLog(0) && (Log() << Verbose(0) << "Found second point is at " << *BaseLine->endpoints[1]->node << ".\n");
-
-    //Log() << Verbose(1) << "INFO: OldSphereCenter is at " << helper << ".\n";
+    LOG(0, "Coordinates of start node at " << *BaseLine->endpoints[0]->node << ".");
+    LOG(0, "Found second point is at " << *BaseLine->endpoints[1]->node << ".");
+
+    //LOG(1, "INFO: OldSphereCenter is at " << helper << ".");
     CandidateForTesselation OptCandidates(BaseLine);
     FindThirdPointForTesselation(NormalVector, SearchDirection, SphereCenter, OptCandidates, NULL, RADIUS, LC);
-    DoLog(0) && (Log() << Verbose(0) << "List of third Points is:" << endl);
+    LOG(0, "List of third Points is:");
     for (TesselPointList::iterator it = OptCandidates.pointlist.begin(); it != OptCandidates.pointlist.end(); it++) {
-      DoLog(0) && (Log() << Verbose(0) << " " << *(*it) << endl);
+      LOG(0, " " << *(*it));
     }
     if (!OptCandidates.pointlist.empty()) {
@@ -1150 +1154 @@
 //      if (FindLine != (FindPoint->second)->lines.end()) {
 //        Line = FindLine->second;
-//        Log() << Verbose(0) << "Found line " << *Line << "." << endl;
+//        LOG(0, "Found line " << *Line << ".");
 //        if (Line->triangles.size() == 1) {
 //          T = Line->triangles.begin()->second;
@@ -1167 +1171 @@
 //            CircleRadius = RADIUS*RADIUS - radius/4.;
 //            CirclePlaneNormal.Normalize();
-//            //Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
+//            //LOG(1, "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << ".");
 //
 //            // construct old center
@@ -1176 +1180 @@
 //            OldSphereCenter.AddVector(&helper);
 //            OldSphereCenter.SubtractVector(&CircleCenter);
-//            //Log() << Verbose(1) << "INFO: OldSphereCenter is at " << OldSphereCenter << "." << endl;
+//            //LOG(1, "INFO: OldSphereCenter is at " << OldSphereCenter << ".");
 //
 //            // construct SearchDirection
@@ -1186 +1190 @@
 //            SearchDirection.ProjectOntoPlane(&OldSphereCenter);
 //            SearchDirection.Normalize();
-//            Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
+//            LOG(1, "INFO: SearchDirection is " << SearchDirection << ".");
 //            if (fabs(OldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {
 //              // rotated the wrong way!
-//              DoeLog(1) && (eLog()<< Verbose(1) << "SearchDirection and RelativeOldSphereCenter are still not orthogonal!" << endl);
+//              ELOG(1, "SearchDirection and RelativeOldSphereCenter are still not orthogonal!");
 //            }
 //
@@ -1197 +1201 @@
 //              if (((*it) == BaseRay->endpoints[0]->node) || ((*it) == BaseRay->endpoints[1]->node)) // skip if it's the same triangle than suggested
 //                continue;
-//              Log() << Verbose(0) << " Third point candidate is " << (*it)
-//              << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
-//              Log() << Verbose(0) << " Baseline is " << *BaseRay << endl;
+//              LOG(1, "INFO: Third point candidate is " << (*it)
+//              << " with circumsphere's center at " << (*it)->OptCenter << ".");
+//              LOG(1, "INFO: Baseline is " << *BaseRay);
 //
 //              // check whether all edges of the new triangle still have space for one more triangle (i.e. TriangleCount <2)
@@ -1233 +1237 @@
 //              if (check) {
 //                if (ShortestAngle > OtherShortestAngle) {
-//                  Log() << Verbose(0) << "There is a better candidate than " << *ThirdNode << " with " << ShortestAngle << " from baseline " << *Line << ": " << *OtherOptCandidate << " with " << OtherShortestAngle << "." << endl;
+//                  LOG(0, "There is a better candidate than " << *ThirdNode << " with " << ShortestAngle << " from baseline " << *Line << ": " << *OtherOptCandidate << " with " << OtherShortestAngle << ".");
 //                  result = true;
 //                  break;
@@ -1243 +1247 @@
 //              break;
 //          } else {
-//            Log() << Verbose(0) << "Circumcircle for base line " << *Line << " and base triangle " << T << " is too big!" << endl;
+//            LOG(0, "Circumcircle for base line " << *Line << " and base triangle " << T << " is too big!");
 //          }
 //        } else {
-//          DoeLog(2) && (eLog()<< Verbose(2) << "Baseline is connected to two triangles already?" << endl);
+//          ELOG(2, "Baseline is connected to two triangles already?");
 //        }
 //      } else {
-//        Log() << Verbose(1) << "No present baseline between " << BaseRay->endpoints[0] << " and candidate " << *ThirdNode << "." << endl;
+//        LOG(1, "No present baseline between " << BaseRay->endpoints[0] << " and candidate " << *ThirdNode << ".");
 //      }
 //    }
 //  } else {
-//    DoeLog(1) && (eLog()<< Verbose(1) << "Could not find the TesselPoint " << *ThirdNode << "." << endl);
+//    ELOG(1, "Could not find the TesselPoint " << *ThirdNode << ".");
 //  }
 //
@@ -1284 +1288 @@
       break;
     }
-  DoLog(0) && (Log() << Verbose(0) << "Current baseline is " << *CandidateLine.BaseLine << " with ThirdPoint " << *ThirdPoint << " of triangle " << T << "." << endl);
+  LOG(0, "Current baseline is " << *CandidateLine.BaseLine << " with ThirdPoint " << *ThirdPoint << " of triangle " << T << ".");
 
   CandidateLine.T = &T;
@@ -1304 +1308 @@
     CircleRadius = RADIUS * RADIUS - radius / 4.;
     CirclePlaneNormal.Normalize();
-    DoLog(1) && (Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl);
-
-    DoLog(1) && (Log() << Verbose(1) << "INFO: OldSphereCenter is at " << T.SphereCenter << "." << endl);
+    LOG(1, "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << ".");
+
+    LOG(1, "INFO: OldSphereCenter is at " << T.SphereCenter << ".");
 
     // construct SearchDirection and an "outward pointer"
@@ -1313 +1317 @@
     if (helper.ScalarProduct(SearchDirection) < -HULLEPSILON)// ohoh, SearchDirection points inwards!
       SearchDirection.Scale(-1.);
-    DoLog(1) && (Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl);
+    LOG(1, "INFO: SearchDirection is " << SearchDirection << ".");
     if (fabs(RelativeSphereCenter.ScalarProduct(SearchDirection)) > HULLEPSILON) {
       // rotated the wrong way!
-      DoeLog(1) && (eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are still not orthogonal!" << endl);
+      ELOG(1, "SearchDirection and RelativeOldSphereCenter are still not orthogonal!");
     }
 
@@ -1323 +1327 @@
 
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Circumcircle for base line " << *CandidateLine.BaseLine << " and base triangle " << T << " is too big!" << endl);
+    LOG(0, "Circumcircle for base line " << *CandidateLine.BaseLine << " and base triangle " << T << " is too big!");
   }
 
   if (CandidateLine.pointlist.empty()) {
-    DoeLog(2) && (eLog() << Verbose(2) << "Could not find a suitable candidate." << endl);
+    ELOG(2, "Could not find a suitable candidate.");
     return false;
   }
-  DoLog(0) && (Log() << Verbose(0) << "Third Points are: " << endl);
+  LOG(0, "Third Points are: ");
   for (TesselPointList::iterator it = CandidateLine.pointlist.begin(); it != CandidateLine.pointlist.end(); ++it) {
-    DoLog(0) && (Log() << Verbose(0) << " " << *(*it) << endl);
+    LOG(0, " " << *(*it));
   }
 
@@ -1356 +1360 @@
       ASSERT((baseline->BaseLine->triangles.size() == 1),"Open line without exactly one attached triangle");
       T = (((baseline->BaseLine->triangles.begin()))->second);
-      DoLog(1) && (Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl);
+      LOG(1, "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T);
       TesselationFailFlag = TesselationFailFlag && FindNextSuitableTriangle(*baseline, *T, RADIUS, LCList); //the line is there, so there is a triangle, but only one.
     }
@@ -1387 +1391 @@
   TesselPointList *connectedClosestPoints = GetCircleOfSetOfPoints(&SetOfNeighbours, TurningPoint, CandidateLine.BaseLine->endpoints[1]->node->getPosition());
 
-  DoLog(0) && (Log() << Verbose(0) << "List of Candidates for Turning Point " << *TurningPoint << ":" << endl);
+  LOG(0, "List of Candidates for Turning Point " << *TurningPoint << ":");
   for (TesselPointList::iterator TesselRunner = connectedClosestPoints->begin(); TesselRunner != connectedClosestPoints->end(); ++TesselRunner)
-    DoLog(0) && (Log() << Verbose(0) << " " << **TesselRunner << endl);
+    LOG(0, " " << **TesselRunner);
 
   // go through all angle-sorted candidates (in degenerate n-nodes case we may have to add multiple triangles)
@@ -1396 +1400 @@
   Sprinter++;
   while (Sprinter != connectedClosestPoints->end()) {
-    DoLog(0) && (Log() << Verbose(0) << "Current Runner is " << *(*Runner) << " and sprinter is " << *(*Sprinter) << "." << endl);
+    LOG(0, "Current Runner is " << *(*Runner) << " and sprinter is " << *(*Sprinter) << ".");
 
     AddTesselationPoint(TurningPoint, 0);
@@ -1409 +1413 @@
       // fill the internal open lines with its respective candidate (otherwise lines in degenerate case are not picked)
       FindDegeneratedCandidatesforOpenLines(*Sprinter, &CandidateLine.OptCenter); // Assume BTS contains last triangle
-      DoLog(0) && (Log() << Verbose(0) << " There are still more triangles to add." << endl);
+      LOG(0, " There are still more triangles to add.");
     }
     // pick candidates for other open lines as well
@@ -1417 +1421 @@
     if (CheckDegeneracy(CandidateLine, RADIUS, LC)) {
       // add normal and degenerate triangles
-      DoLog(1) && (Log() << Verbose(1) << "Triangle of endpoints " << *TPS[0] << "," << *TPS[1] << " and " << *TPS[2] << " is degenerated, adding both sides." << endl);
+      LOG(1, "Triangle of endpoints " << *TPS[0] << "," << *TPS[1] << " and " << *TPS[2] << " is degenerated, adding both sides.");
       AddCandidateTriangle(CandidateLine, OtherOpt);
 
@@ -1441 +1445 @@
   pair<LineMap::iterator, LineMap::iterator> FindPair = TPS[0]->lines.equal_range(TPS[2]->node->getNr());
   for (LineMap::const_iterator FindLine = FindPair.first; FindLine != FindPair.second; FindLine++) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Checking line " << *(FindLine->second) << " ..." << endl);
+    LOG(1, "INFO: Checking line " << *(FindLine->second) << " ...");
     // If there is a line with less than two attached triangles, we don't need a new line.
     if (FindLine->second->triangles.size() == 1) {
       CandidateMap::iterator Finder = OpenLines.find(FindLine->second);
       if (!Finder->second->pointlist.empty())
-        DoLog(1) && (Log() << Verbose(1) << "INFO: line " << *(FindLine->second) << " is open with candidate " << **(Finder->second->pointlist.begin()) << "." << endl);
+        LOG(1, "INFO: line " << *(FindLine->second) << " is open with candidate " << **(Finder->second->pointlist.begin()) << ".");
       else {
-        DoLog(1) && (Log() << Verbose(1) << "INFO: line " << *(FindLine->second) << " is open with no candidate, setting to next Sprinter" << (*Sprinter) << endl);
+        LOG(1, "INFO: line " << *(FindLine->second) << " is open with no candidate, setting to next Sprinter" << (*Sprinter));
         Finder->second->T = BTS;  // is last triangle
         Finder->second->pointlist.push_back(Sprinter);
@@ -1473 +1477 @@
 
   /// 1. Create or pick the lines for the first triangle
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Creating/Picking lines for first triangle ..." << endl);
+  LOG(0, "INFO: Creating/Picking lines for first triangle ...");
   for (int i = 0; i < 3; i++) {
     BLS[i] = NULL;
-    DoLog(0) && (Log() << Verbose(0) << "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":" << endl);
+    LOG(0, "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":");
     AddTesselationLine(&CandidateLine.OptCenter, TPS[(i + 2) % 3], TPS[(i + 0) % 3], TPS[(i + 1) % 3], i);
   }
 
   /// 2. create the first triangle and NormalVector and so on
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Adding first triangle with center at " << CandidateLine.OptCenter << " ..." << endl);
+  LOG(0, "INFO: Adding first triangle with center at " << CandidateLine.OptCenter << " ...");
   BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
   AddTesselationTriangle();
@@ -1492 +1496 @@
   // give some verbose output about the whole procedure
   if (CandidateLine.T != NULL)
-    DoLog(0) && (Log() << Verbose(0) << "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << "." << endl);
+    LOG(0, "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << ".");
   else
-    DoLog(0) && (Log() << Verbose(0) << "--> New starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle." << endl);
+    LOG(0, "--> New starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle.");
   triangle = BTS;
 
   /// 3. Gather candidates for each new line
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Adding candidates to new lines ..." << endl);
+  LOG(0, "INFO: Adding candidates to new lines ...");
   for (int i = 0; i < 3; i++) {
-    DoLog(0) && (Log() << Verbose(0) << "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":" << endl);
+    LOG(0, "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":");
     CandidateCheck = OpenLines.find(BLS[i]);
     if ((CandidateCheck != OpenLines.end()) && (CandidateCheck->second->pointlist.empty())) {
@@ -1510 +1514 @@
 
   /// 4. Create or pick the lines for the second triangle
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Creating/Picking lines for second triangle ..." << endl);
+  LOG(0, "INFO: Creating/Picking lines for second triangle ...");
   for (int i = 0; i < 3; i++) {
-    DoLog(0) && (Log() << Verbose(0) << "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":" << endl);
+    LOG(0, "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":");
     AddTesselationLine(&CandidateLine.OtherOptCenter, TPS[(i + 2) % 3], TPS[(i + 0) % 3], TPS[(i + 1) % 3], i);
   }
 
   /// 5. create the second triangle and NormalVector and so on
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Adding second triangle with center at " << CandidateLine.OtherOptCenter << " ..." << endl);
+  LOG(0, "INFO: Adding second triangle with center at " << CandidateLine.OtherOptCenter << " ...");
   BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
   AddTesselationTriangle();
@@ -1527 +1531 @@
   // give some verbose output about the whole procedure
   if (CandidateLine.T != NULL)
-    DoLog(0) && (Log() << Verbose(0) << "--> New degenerate triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << "." << endl);
+    LOG(0, "--> New degenerate triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << ".");
   else
-    DoLog(0) && (Log() << Verbose(0) << "--> New degenerate starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle." << endl);
+    LOG(0, "--> New degenerate starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle.");
 
   /// 6. Adding triangle to new lines
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Adding second triangles to new lines ..." << endl);
+  LOG(0, "INFO: Adding second triangles to new lines ...");
   for (int i = 0; i < 3; i++) {
-    DoLog(0) && (Log() << Verbose(0) << "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":" << endl);
+    LOG(0, "Current line is between " << *TPS[(i + 0) % 3] << " and " << *TPS[(i + 1) % 3] << ":");
     CandidateCheck = OpenLines.find(BLS[i]);
     if ((CandidateCheck != OpenLines.end()) && (CandidateCheck->second->pointlist.empty())) {
@@ -1572 +1576 @@
   // give some verbose output about the whole procedure
   if (CandidateLine.T != NULL)
-    DoLog(0) && (Log() << Verbose(0) << "--> New" << ((type == OtherOpt) ? " degenerate " : " ") << "triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << "." << endl);
+    LOG(0, "--> New" << ((type == OtherOpt) ? " degenerate " : " ") << "triangle with " << *BTS << " and normal vector " << BTS->NormalVector << ", from " << *CandidateLine.T << " and angle " << CandidateLine.ShortestAngle << ".");
   else
-    DoLog(0) && (Log() << Verbose(0) << "--> New" << ((type == OtherOpt) ? " degenerate " : " ") << "starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle." << endl);
+    LOG(0, "--> New" << ((type == OtherOpt) ? " degenerate " : " ") << "starting triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " and no top triangle.");
 }
 ;
@@ -1599 +1603 @@
   OtherBase = new class BoundaryLineSet(BPS, -1);
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Current base line is " << *Base << "." << endl);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Other base line is " << *OtherBase << "." << endl);
+  LOG(1, "INFO: Current base line is " << *Base << ".");
+  LOG(1, "INFO: Other base line is " << *OtherBase << ".");
 
   // get the closest point on each line to the other line
@@ -1618 +1622 @@
   delete (ClosestPoint);
   if ((distance[0] * distance[1]) > 0) { // have same sign?
-    DoLog(1) && (Log() << Verbose(1) << "REJECT: Both SKPs have same sign: " << distance[0] << " and " << distance[1] << ". " << *Base << "' rectangle is concave." << endl);
+    LOG(1, "REJECT: Both SKPs have same sign: " << distance[0] << " and " << distance[1] << ". " << *Base << "' rectangle is concave.");
     if (distance[0] < distance[1]) {
       Spot = Base->endpoints[0];
@@ -1626 +1630 @@
     return Spot;
   } else { // different sign, i.e. we are in between
-    DoLog(0) && (Log() << Verbose(0) << "ACCEPT: Rectangle of triangles of base line " << *Base << " is convex." << endl);
+    LOG(0, "ACCEPT: Rectangle of triangles of base line " << *Base << " is convex.");
     return NULL;
   }
@@ -1637 +1641 @@
   Info FunctionInfo(__func__);
   // print all lines
-  DoLog(0) && (Log() << Verbose(0) << "Printing all boundary points for debugging:" << endl);
+  LOG(0, "Printing all boundary points for debugging:");
   for (PointMap::const_iterator PointRunner = PointsOnBoundary.begin(); PointRunner != PointsOnBoundary.end(); PointRunner++)
-    DoLog(0) && (Log() << Verbose(0) << *(PointRunner->second) << endl);
+    LOG(0, *(PointRunner->second));
 }
 ;
@@ -1647 +1651 @@
   Info FunctionInfo(__func__);
   // print all lines
-  DoLog(0) && (Log() << Verbose(0) << "Printing all boundary lines for debugging:" << endl);
+  LOG(0, "Printing all boundary lines for debugging:");
   for (LineMap::const_iterator LineRunner = LinesOnBoundary.begin(); LineRunner != LinesOnBoundary.end(); LineRunner++)
-    DoLog(0) && (Log() << Verbose(0) << *(LineRunner->second) << endl);
+    LOG(0, *(LineRunner->second));
 }
 ;
@@ -1657 +1661 @@
   Info FunctionInfo(__func__);
   // print all triangles
-  DoLog(0) && (Log() << Verbose(0) << "Printing all boundary triangles for debugging:" << endl);
+  LOG(0, "Printing all boundary triangles for debugging:");
   for (TriangleMap::const_iterator TriangleRunner = TrianglesOnBoundary.begin(); TriangleRunner != TrianglesOnBoundary.end(); TriangleRunner++)
-    DoLog(0) && (Log() << Verbose(0) << *(TriangleRunner->second) << endl);
+    LOG(0, *(TriangleRunner->second));
 }
 ;
@@ -1682 +1686 @@
   OtherBase = new class BoundaryLineSet(BPS, -1);
 
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Current base line is " << *Base << "." << endl);
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Other base line is " << *OtherBase << "." << endl);
+  LOG(0, "INFO: Current base line is " << *Base << ".");
+  LOG(0, "INFO: Other base line is " << *OtherBase << ".");
 
   // get the closest point on each line to the other line
@@ -1701 +1705 @@
 
   if (Distance.NormSquared() < MYEPSILON) { // check for intersection
-    DoLog(0) && (Log() << Verbose(0) << "REJECT: Both lines have an intersection: Nothing to do." << endl);
+    LOG(0, "REJECT: Both lines have an intersection: Nothing to do.");
     return false;
   } else { // check for sign against BaseLineNormal
@@ -1707 +1711 @@
     BaseLineNormal.Zero();
     if (Base->triangles.size() < 2) {
-      DoeLog(1) && (eLog() << Verbose(1) << "Less than two triangles are attached to this baseline!" << endl);
+      ELOG(1, "Less than two triangles are attached to this baseline!");
       return 0.;
     }
     for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl);
+    LOG(1, "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << ".");
       BaseLineNormal += (runner->second->NormalVector);
     }
@@ -1717 +1721 @@
 
     if (Distance.ScalarProduct(BaseLineNormal) > MYEPSILON) { // Distance points outwards, hence OtherBase higher than Base -> flip
-      DoLog(0) && (Log() << Verbose(0) << "ACCEPT: Other base line would be higher: Flipping baseline." << endl);
+      LOG(0, "ACCEPT: Other base line would be higher: Flipping baseline.");
       // calculate volume summand as a general tetraeder
       return volume;
     } else { // Base higher than OtherBase -> do nothing
-      DoLog(0) && (Log() << Verbose(0) << "REJECT: Base line is higher: Nothing to do." << endl);
+      LOG(0, "REJECT: Base line is higher: Nothing to do.");
       return 0.;
     }
@@ -1747 +1751 @@
   BaseLineNormal.Zero();
   if (Base->triangles.size() < 2) {
-    DoeLog(1) && (eLog() << Verbose(1) << "Less than two triangles are attached to this baseline!" << endl);
+    ELOG(1, "Less than two triangles are attached to this baseline!");
     return NULL;
   }
   for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl);
+    LOG(1, "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << ".");
     BaseLineNormal += (runner->second->NormalVector);
   }
@@ -1764 +1768 @@
   i = 0;
   m = 0;
-  DoLog(0) && (Log() << Verbose(0) << "The four old lines are: ");
+
+  // print OldLines and OldPoints for debugging
+  if (DoLog(0)) {
+    std::stringstream output;
+    output << "The four old lines are: ";
+    for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
+      for (int j = 0; j < 3; j++) // all of their endpoints and baselines
+        if (runner->second->lines[j] != Base) // pick not the central baseline
+          output << *runner->second->lines[j] << "\t";
+    LOG(0, output.str());
+  }
+  if (DoLog(0)) {
+    std::stringstream output;
+    output << "The two old points are: ";
+    for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
+      for (int j = 0; j < 3; j++) // all of their endpoints and baselines
+        if (!Base->ContainsBoundaryPoint(runner->second->endpoints[j])) // and neither of its endpoints
+          output << *runner->second->endpoints[j] << "\t";
+    LOG(0, output.str());
+  }
+
+  // index OldLines and OldPoints
   for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
     for (int j = 0; j < 3; j++) // all of their endpoints and baselines
-      if (runner->second->lines[j] != Base) { // pick not the central baseline
+      if (runner->second->lines[j] != Base) // pick not the central baseline
         OldLines[i++] = runner->second->lines[j];
-        DoLog(0) && (Log() << Verbose(0) << *runner->second->lines[j] << "\t");
-      }
-  DoLog(0) && (Log() << Verbose(0) << endl);
-  DoLog(0) && (Log() << Verbose(0) << "The two old points are: ");
   for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
     for (int j = 0; j < 3; j++) // all of their endpoints and baselines
-      if (!Base->ContainsBoundaryPoint(runner->second->endpoints[j])) { // and neither of its endpoints
+      if (!Base->ContainsBoundaryPoint(runner->second->endpoints[j])) // and neither of its endpoints
         OldPoints[m++] = runner->second->endpoints[j];
-        DoLog(0) && (Log() << Verbose(0) << *runner->second->endpoints[j] << "\t");
-      }
-  DoLog(0) && (Log() << Verbose(0) << endl);
 
   // check whether everything is in place to create new lines and triangles
   if (i < 4) {
-    DoeLog(1) && (eLog() << Verbose(1) << "We have not gathered enough baselines!" << endl);
+    ELOG(1, "We have not gathered enough baselines!");
     return NULL;
   }
   for (int j = 0; j < 4; j++)
     if (OldLines[j] == NULL) {
-      DoeLog(1) && (eLog() << Verbose(1) << "We have not gathered enough baselines!" << endl);
+      ELOG(1, "We have not gathered enough baselines!");
       return NULL;
     }
   for (int j = 0; j < 2; j++)
     if (OldPoints[j] == NULL) {
-      DoeLog(1) && (eLog() << Verbose(1) << "We have not gathered enough endpoints!" << endl);
+      ELOG(1, "We have not gathered enough endpoints!");
       return NULL;
     }
 
   // remove triangles and baseline removes itself
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Deleting baseline " << *Base << " from global list." << endl);
+  LOG(0, "INFO: Deleting baseline " << *Base << " from global list.");
   OldBaseLineNr = Base->Nr;
   m = 0;
@@ -1807 +1825 @@
   // .. then delete each triangle (which deletes the line as well)
   for (list <BoundaryTriangleSet *>::iterator runner = TrianglesOfBase.begin(); !TrianglesOfBase.empty(); runner = TrianglesOfBase.begin()) {
-    DoLog(0) && (Log() << Verbose(0) << "INFO: Deleting triangle " << *(*runner) << "." << endl);
+    LOG(0, "INFO: Deleting triangle " << *(*runner) << ".");
     OldTriangleNrs[m++] = (*runner)->Nr;
     RemoveTesselationTriangle((*runner));
@@ -1818 +1836 @@
   NewLine = new class BoundaryLineSet(BPS, OldBaseLineNr);
   LinesOnBoundary.insert(LinePair(OldBaseLineNr, NewLine)); // no need for check for unique insertion as NewLine is definitely a new one
-  DoLog(0) && (Log() << Verbose(0) << "INFO: Created new baseline " << *NewLine << "." << endl);
+  LOG(0, "INFO: Created new baseline " << *NewLine << ".");
 
   // construct new triangles with flipped baseline
@@ -1833 +1851 @@
     BTS->GetNormalVector(BaseLineNormal);
     AddTesselationTriangle(OldTriangleNrs[0]);
-    DoLog(0) && (Log() << Verbose(0) << "INFO: Created new triangle " << *BTS << "." << endl);
+    LOG(0, "INFO: Created new triangle " << *BTS << ".");
 
     BLS[0] = (i == 2 ? OldLines[3] : OldLines[2]);
@@ -1841 +1859 @@
     BTS->GetNormalVector(BaseLineNormal);
     AddTesselationTriangle(OldTriangleNrs[1]);
-    DoLog(0) && (Log() << Verbose(0) << "INFO: Created new triangle " << *BTS << "." << endl);
+    LOG(0, "INFO: Created new triangle " << *BTS << ".");
   } else {
-    DoeLog(0) && (eLog() << Verbose(0) << "The four old lines do not connect, something's utterly wrong here!" << endl);
+    ELOG(0, "The four old lines do not connect, something's utterly wrong here!");
     return NULL;
   }
@@ -1874 +1892 @@
       N[i] = LC->n[i];
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Point " << *a << " is not found in cell " << LC->index << "." << endl);
+    ELOG(1, "Point " << *a << " is not found in cell " << LC->index << ".");
     return;
   }
@@ -1882 +1900 @@
     Nupper[i] = ((N[i] + 1) < LC->N[i]) ? N[i] + 1 : LC->N[i] - 1;
   }
-  DoLog(0) && (Log() << Verbose(0) << "LC Intervals from [" << N[0] << "<->" << LC->N[0] << ", " << N[1] << "<->" << LC->N[1] << ", " << N[2] << "<->" << LC->N[2] << "] :" << " [" << Nlower[0] << "," << Nupper[0] << "], " << " [" << Nlower[1] << "," << Nupper[1] << "], " << " [" << Nlower[2] << "," << Nupper[2] << "], " << endl);
+  LOG(0, "LC Intervals from [" << N[0] << "<->" << LC->N[0] << ", " << N[1] << "<->" << LC->N[1] << ", " << N[2] << "<->" << LC->N[2] << "] :" << " [" << Nlower[0] << "," << Nupper[0] << "], " << " [" << Nlower[1] << "," << Nupper[1] << "], " << " [" << Nlower[2] << "," << Nupper[2] << "], ");
 
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
@@ -1888 +1906 @@
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const TesselPointSTLList *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+        //LOG(1, "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << ".");
         if (List != NULL) {
           for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -1915 +1933 @@
                 angle = AngleCheck.Angle(Oben);
                 if (angle < Storage[0]) {
-                  //Log() << Verbose(1) << "Old values of Storage: %lf %lf \n", Storage[0], Storage[1]);
-                  DoLog(1) && (Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".\n");
+                  //LOG(1, "INFO: Old values of Storage is " << Storage[0] << ", " << Storage[1]);
+                  LOG(1, "INFO: Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".");
                   OptCandidate = Candidate;
                   Storage[0] = angle;
-                  //Log() << Verbose(1) << "Changing something in Storage: %lf %lf. \n", Storage[0], Storage[2]);
+                  //LOG(1, "INFO: Changing something in  Storage is " << Storage[0] << ", " << Storage[1]);
                 } else {
-                  //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate << endl;
+                  //LOG(1, "INFO: Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate);
                 }
               } else {
-                //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Refused due to Radius " << norm << endl;
+                //LOG(1, "INFO: Current candidate is " << *Candidate << ": Refused due to Radius " << norm);
               }
             } else {
-              //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Candidate is equal to first endpoint." << *a << "." << endl;
+              //LOG(1, "INFO: Current candidate is " << *Candidate << ": Candidate is equal to first endpoint." << *a << ".");
             }
           }
         } else {
-          DoLog(0) && (Log() << Verbose(0) << "Linked cell list is empty." << endl);
+          LOG(0, "Linked cell list is empty.");
         }
       }
@@ -1986 +2004 @@
   TesselPoint *Candidate = NULL;
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: NormalVector of BaseTriangle is " << NormalVector << "." << endl);
+  LOG(1, "INFO: NormalVector of BaseTriangle is " << NormalVector << ".");
 
   // copy old center
@@ -2008 +2026 @@
     CircleRadius = RADIUS * RADIUS - radius;
     CirclePlaneNormal.Normalize();
-    DoLog(1) && (Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl);
+    LOG(1, "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << ".");
 
     // test whether old center is on the band's plane
     if (fabs(RelativeOldSphereCenter.ScalarProduct(CirclePlaneNormal)) > HULLEPSILON) {
-      DoeLog(1) && (eLog() << Verbose(1) << "Something's very wrong here: RelativeOldSphereCenter is not on the band's plane as desired by " << fabs(RelativeOldSphereCenter.ScalarProduct(CirclePlaneNormal)) << "!" << endl);
+      ELOG(1, "Something's very wrong here: RelativeOldSphereCenter is not on the band's plane as desired by " << fabs(RelativeOldSphereCenter.ScalarProduct(CirclePlaneNormal)) << "!");
       RelativeOldSphereCenter.ProjectOntoPlane(CirclePlaneNormal);
     }
     radius = RelativeOldSphereCenter.NormSquared();
     if (fabs(radius - CircleRadius) < HULLEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << "INFO: RelativeOldSphereCenter is at " << RelativeOldSphereCenter << "." << endl);
+      LOG(1, "INFO: RelativeOldSphereCenter is at " << RelativeOldSphereCenter << ".");
 
       // check SearchDirection
-      DoLog(1) && (Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl);
+      LOG(1, "INFO: SearchDirection is " << SearchDirection << ".");
       if (fabs(RelativeOldSphereCenter.ScalarProduct(SearchDirection)) > HULLEPSILON) { // rotated the wrong way!
-        DoeLog(1) && (eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are not orthogonal!" << endl);
+        ELOG(1, "SearchDirection and RelativeOldSphereCenter are not orthogonal!");
       }
 
@@ -2029 +2047 @@
         for (int i = 0; i < NDIM; i++) // store indices of this cell
           N[i] = LC->n[i];
-        //Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
+        //LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
       } else {
-        DoeLog(1) && (eLog() << Verbose(1) << "Vector " << CircleCenter << " is outside of LinkedCell's bounding box." << endl);
+        ELOG(1, "Vector " << CircleCenter << " is outside of LinkedCell's bounding box.");
         return;
       }
       // then go through the current and all neighbouring cells and check the contained points for possible candidates
-      //Log() << Verbose(1) << "LC Intervals:";
+//      if (DoLog(0)) {
+//        std::stringstream output;
+//        output << "LC Intervals:";
+//        for (int i = 0; i < NDIM; i++)
+//          output << " [" << Nlower[i] << "," << Nupper[i] << "] ";
+//        LOG(0, output.str());
+//      }
       for (int i = 0; i < NDIM; i++) {
         Nlower[i] = ((N[i] - 1) >= 0) ? N[i] - 1 : 0;
         Nupper[i] = ((N[i] + 1) < LC->N[i]) ? N[i] + 1 : LC->N[i] - 1;
-        //Log() << Verbose(0) << " [" << Nlower[i] << "," << Nupper[i] << "] ";
       }
-      //Log() << Verbose(0) << endl;
       for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
         for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
           for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
             const TesselPointSTLList *List = LC->GetCurrentCell();
-            //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+            //LOG(1, "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << ".");
             if (List != NULL) {
               for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -2052 +2074 @@
 
                 // check for three unique points
-                DoLog(2) && (Log() << Verbose(2) << "INFO: Current Candidate is " << *Candidate << " for BaseLine " << *CandidateLine.BaseLine << " with OldSphereCenter " << OldSphereCenter << "." << endl);
+                LOG(2, "INFO: Current Candidate is " << *Candidate << " for BaseLine " << *CandidateLine.BaseLine << " with OldSphereCenter " << OldSphereCenter << ".");
                 if ((Candidate != CandidateLine.BaseLine->endpoints[0]->node) && (Candidate != CandidateLine.BaseLine->endpoints[1]->node)) {
 
                   // find center on the plane
                   GetCenterofCircumcircle(NewPlaneCenter, CandidateLine.BaseLine->endpoints[0]->node->getPosition(), CandidateLine.BaseLine->endpoints[1]->node->getPosition(), Candidate->getPosition());
-                  DoLog(1) && (Log() << Verbose(1) << "INFO: NewPlaneCenter is " << NewPlaneCenter << "." << endl);
+                  LOG(1, "INFO: NewPlaneCenter is " << NewPlaneCenter << ".");
 
                   try {
@@ -2063 +2085 @@
                                             (CandidateLine.BaseLine->endpoints[1]->node->getPosition()),
                                             (Candidate->getPosition())).getNormal();
-                    DoLog(1) && (Log() << Verbose(1) << "INFO: NewNormalVector is " << NewNormalVector << "." << endl);
+                    LOG(1, "INFO: NewNormalVector is " << NewNormalVector << ".");
                     radius = CandidateLine.BaseLine->endpoints[0]->node->DistanceSquared(NewPlaneCenter);
-                    DoLog(1) && (Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl);
-                    DoLog(1) && (Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl);
-                    DoLog(1) && (Log() << Verbose(1) << "INFO: Radius of CircumCenterCircle is " << radius << "." << endl);
+                    LOG(1, "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << ".");
+                    LOG(1, "INFO: SearchDirection is " << SearchDirection << ".");
+                    LOG(1, "INFO: Radius of CircumCenterCircle is " << radius << ".");
                     if (radius < RADIUS * RADIUS) {
                       otherradius = CandidateLine.BaseLine->endpoints[1]->node->DistanceSquared(NewPlaneCenter);
@@ -2076 +2098 @@
                         helper = NewNormalVector;
                         helper.Scale(sqrt(RADIUS * RADIUS - radius));
-                        DoLog(2) && (Log() << Verbose(2) << "INFO: Distance of NewPlaneCenter " << NewPlaneCenter << " to either NewSphereCenter is " << helper.Norm() << " of vector " << helper << " with sphere radius " << RADIUS << "." << endl);
+                        LOG(2, "INFO: Distance of NewPlaneCenter " << NewPlaneCenter << " to either NewSphereCenter is " << helper.Norm() << " of vector " << helper << " with sphere radius " << RADIUS << ".");
                         NewSphereCenter += helper;
-                        DoLog(2) && (Log() << Verbose(2) << "INFO: NewSphereCenter is at " << NewSphereCenter << "." << endl);
+                        LOG(2, "INFO: NewSphereCenter is at " << NewSphereCenter << ".");
                         // OtherNewSphereCenter is created by the same vector just in the other direction
                         helper.Scale(-1.);
                         OtherNewSphereCenter += helper;
-                        DoLog(2) && (Log() << Verbose(2) << "INFO: OtherNewSphereCenter is at " << OtherNewSphereCenter << "." << endl);
+                        LOG(2, "INFO: OtherNewSphereCenter is at " << OtherNewSphereCenter << ".");
                         alpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, NewSphereCenter, OldSphereCenter, NormalVector, SearchDirection, HULLEPSILON);
                         Otheralpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, OtherNewSphereCenter, OldSphereCenter, NormalVector, SearchDirection, HULLEPSILON);
@@ -2103 +2125 @@
                           if ((CandidateLine.ShortestAngle - HULLEPSILON) < alpha) {
                             CandidateLine.pointlist.push_back(Candidate);
-                            DoLog(0) && (Log() << Verbose(0) << "ACCEPT: We have found an equally good candidate: " << *(Candidate) << " with " << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl);
+                            LOG(0, "ACCEPT: We have found an equally good candidate: " << *(Candidate) << " with " << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << ".");
                           } else {
                             // remove all candidates from the list and then the list itself
                             CandidateLine.pointlist.clear();
                             CandidateLine.pointlist.push_back(Candidate);
-                            DoLog(0) && (Log() << Verbose(0) << "ACCEPT: We have found a better candidate: " << *(Candidate) << " with " << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl);
+                            LOG(0, "ACCEPT: We have found a better candidate: " << *(Candidate) << " with " << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << ".");
                           }
                           CandidateLine.ShortestAngle = alpha;
-                          DoLog(0) && (Log() << Verbose(0) << "INFO: There are " << CandidateLine.pointlist.size() << " candidates in the list now." << endl);
+                          LOG(0, "INFO: There are " << CandidateLine.pointlist.size() << " candidates in the list now.");
                         } else {
                           if ((Candidate != NULL) && (CandidateLine.pointlist.begin() != CandidateLine.pointlist.end())) {
-                            DoLog(1) && (Log() << Verbose(1) << "REJECT: Old candidate " << *(*CandidateLine.pointlist.begin()) << " with " << CandidateLine.ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " ." << endl);
+                            LOG(1, "REJECT: Old candidate " << *(*CandidateLine.pointlist.begin()) << " with " << CandidateLine.ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " .");
                           } else {
-                            DoLog(1) && (Log() << Verbose(1) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl);
+                            LOG(1, "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected.");
                           }
                         }
                       } else {
-                        DoeLog(0) && (eLog() << Verbose(1) << "REJECT: Distance to center of circumcircle is not the same from each corner of the triangle: " << fabs(radius - otherradius) << endl);
+                        ELOG(0, "REJECT: Distance to center of circumcircle is not the same from each corner of the triangle: " << fabs(radius - otherradius));
                       }
                     } else {
-                      DoLog(1) && (Log() << Verbose(1) << "REJECT: NewSphereCenter " << NewSphereCenter << " for " << *Candidate << " is too far away: " << radius << "." << endl);
+                      LOG(1, "REJECT: NewSphereCenter " << NewSphereCenter << " for " << *Candidate << " is too far away: " << radius << ".");
                     }
                   }
                   catch (LinearDependenceException &excp){
-                    Log() << Verbose(1) << boost::diagnostic_information(excp);
-                    Log() << Verbose(1) << "REJECT: Three points from " << *CandidateLine.BaseLine << " and Candidate " << *Candidate << " are linear-dependent." << endl;
+                    LOG(1, boost::diagnostic_information(excp));
+                    LOG(1, "REJECT: Three points from " << *CandidateLine.BaseLine << " and Candidate " << *Candidate << " are linear-dependent.");
                   }
                 } else {
                   if (ThirdPoint != NULL) {
-                    DoLog(1) && (Log() << Verbose(1) << "REJECT: Base triangle " << *CandidateLine.BaseLine << " and " << *ThirdPoint << " contains Candidate " << *Candidate << "." << endl);
+                    LOG(1, "REJECT: Base triangle " << *CandidateLine.BaseLine << " and " << *ThirdPoint << " contains Candidate " << *Candidate << ".");
                   } else {
-                    DoLog(1) && (Log() << Verbose(1) << "REJECT: Base triangle " << *CandidateLine.BaseLine << " contains Candidate " << *Candidate << "." << endl);
+                    LOG(1, "REJECT: Base triangle " << *CandidateLine.BaseLine << " contains Candidate " << *Candidate << ".");
                   }
                 }
@@ -2141 +2163 @@
           }
     } else {
-      DoeLog(1) && (eLog() << Verbose(1) << "The projected center of the old sphere has radius " << radius << " instead of " << CircleRadius << "." << endl);
+      ELOG(1, "The projected center of the old sphere has radius " << radius << " instead of " << CircleRadius << ".");
     }
   } else {
     if (ThirdPoint != NULL)
-      DoLog(1) && (Log() << Verbose(1) << "Circumcircle for base line " << *CandidateLine.BaseLine << " and third node " << *ThirdPoint << " is too big!" << endl);
+      LOG(1, "Circumcircle for base line " << *CandidateLine.BaseLine << " and third node " << *ThirdPoint << " is too big!");
     else
-      DoLog(1) && (Log() << Verbose(1) << "Circumcircle for base line " << *CandidateLine.BaseLine << " is too big!" << endl);
-  }
-
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Sorting candidate list ..." << endl);
+      LOG(1, "Circumcircle for base line " << *CandidateLine.BaseLine << " is too big!");
+  }
+
+  LOG(1, "INFO: Sorting candidate list ...");
   if (CandidateLine.pointlist.size() > 1) {
     CandidateLine.pointlist.unique();
@@ -2157 +2179 @@
 
   if ((!CandidateLine.pointlist.empty()) && (!CandidateLine.CheckValidity(RADIUS, LC))) {
-    DoeLog(0) && (eLog() << Verbose(0) << "There were other points contained in the rolling sphere as well!" << endl);
+    ELOG(0, "There were other points contained in the rolling sphere as well!");
     performCriticalExit();
   }
@@ -2181 +2203 @@
       if (!OrderTest.second) { // if insertion fails, we have common endpoint
         node = OrderTest.first->second;
-        DoLog(1) && (Log() << Verbose(1) << "Common endpoint of lines " << *line1 << " and " << *line2 << " is: " << *node << "." << endl);
+        LOG(1, "Common endpoint of lines " << *line1 << " and " << *line2 << " is: " << *node << ".");
         j = 2;
         i = 2;
@@ -2203 +2225 @@
 
   if (LinesOnBoundary.empty()) {
-    DoeLog(1) && (eLog() << Verbose(1) << "There is no tesselation structure to compare the point with, please create one first." << endl);
+    ELOG(1, "There is no tesselation structure to compare the point with, please create one first.");
     return NULL;
   }
@@ -2211 +2233 @@
   for (int i = 0; i < NDIM; i++) // store indices of this cell
     N[i] = LC->n[i];
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
+  LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
   DistanceToPointMap * points = new DistanceToPointMap;
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const TesselPointSTLList *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //LOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2]);
         if (List != NULL) {
           for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -2225 +2246 @@
             if (FindPoint != PointsOnBoundary.end()) {
               points->insert(DistanceToPointPair(FindPoint->second->node->DistanceSquared(x), FindPoint->second));
-              DoLog(1) && (Log() << Verbose(1) << "INFO: Putting " << *FindPoint->second << " into the list." << endl);
+              LOG(1, "INFO: Putting " << *FindPoint->second << " into the list.");
             }
           }
         } else {
-          DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
+          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
         }
       }
@@ -2235 +2256 @@
   // check whether we found some points
   if (points->empty()) {
-    DoeLog(1) && (eLog() << Verbose(1) << "There is no nearest point: too far away from the surface." << endl);
+    ELOG(1, "There is no nearest point: too far away from the surface.");
     delete (points);
     return NULL;
@@ -2254 +2275 @@
   DistanceToPointMap * points = FindClosestBoundaryPointsToVector(x, LC);
   if (points == NULL) {
-    DoeLog(1) && (eLog() << Verbose(1) << "There is no nearest point: too far away from the surface." << endl);
+    ELOG(1, "There is no nearest point: too far away from the surface.");
     return NULL;
   }
 
   // for each point, check its lines, remember closest
-  DoLog(1) && (Log() << Verbose(1) << "Finding closest BoundaryLine to " << x << " ... " << endl);
+  LOG(1, "Finding closest BoundaryLine to " << x << " ... ");
   BoundaryLineSet *ClosestLine = NULL;
   double MinDistance = -1.;
@@ -2284 +2305 @@
           ClosestLine = LineRunner->second;
           MinDistance = distance;
-          DoLog(1) && (Log() << Verbose(1) << "ACCEPT: New closest line is " << *ClosestLine << " with projected distance " << MinDistance << "." << endl);
+          LOG(1, "ACCEPT: New closest line is " << *ClosestLine << " with projected distance " << MinDistance << ".");
         } else {
-          DoLog(1) && (Log() << Verbose(1) << "REJECT: Intersection is outside of the line section: " << lengthA << " and " << lengthB << "." << endl);
+          LOG(1, "REJECT: Intersection is outside of the line section: " << lengthA << " and " << lengthB << ".");
         }
       } else {
-        DoLog(1) && (Log() << Verbose(1) << "REJECT: Point is too further away than present line: " << distance << " >> " << MinDistance << "." << endl);
+        LOG(1, "REJECT: Point is too further away than present line: " << distance << " >> " << MinDistance << ".");
       }
     }
@@ -2296 +2317 @@
   // check whether closest line is "too close" :), then it's inside
   if (ClosestLine == NULL) {
-    DoLog(0) && (Log() << Verbose(0) << "Is the only point, no one else is closeby." << endl);
+    LOG(0, "Is the only point, no one else is closeby.");
     return NULL;
   }
@@ -2314 +2335 @@
   DistanceToPointMap * points = FindClosestBoundaryPointsToVector(x, LC);
   if (points == NULL) {
-    DoeLog(1) && (eLog() << Verbose(1) << "There is no nearest point: too far away from the surface." << endl);
+    ELOG(1, "There is no nearest point: too far away from the surface.");
     return NULL;
   }
 
   // for each point, check its lines, remember closest
-  DoLog(1) && (Log() << Verbose(1) << "Finding closest BoundaryTriangle to " << x << " ... " << endl);
+  LOG(1, "Finding closest BoundaryTriangle to " << x << " ... ");
   LineSet ClosestLines;
   double MinDistance = 1e+16;
@@ -2345 +2366 @@
           ClosestLines.insert(LineRunner->second);
           MinDistance = lengthEnd;
-          DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Line " << *LineRunner->second << " to endpoint " << *LineRunner->second->endpoints[0]->node << " is closer with " << lengthEnd << "." << endl);
+          LOG(1, "ACCEPT: Line " << *LineRunner->second << " to endpoint " << *LineRunner->second->endpoints[0]->node << " is closer with " << lengthEnd << ".");
         } else if (fabs(lengthEnd - MinDistance) < MYEPSILON) { // additional best candidate
           ClosestLines.insert(LineRunner->second);
-          DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Line " << *LineRunner->second << " to endpoint " << *LineRunner->second->endpoints[1]->node << " is equally good with " << lengthEnd << "." << endl);
+          LOG(1, "ACCEPT: Line " << *LineRunner->second << " to endpoint " << *LineRunner->second->endpoints[1]->node << " is equally good with " << lengthEnd << ".");
         } else { // line is worse
-          DoLog(1) && (Log() << Verbose(1) << "REJECT: Line " << *LineRunner->second << " to either endpoints is further away than present closest line candidate: " << lengthEndA << ", " << lengthEndB << ", and distance is longer than baseline:" << lengthBase << "." << endl);
+          LOG(1, "REJECT: Line " << *LineRunner->second << " to either endpoints is further away than present closest line candidate: " << lengthEndA << ", " << lengthEndB << ", and distance is longer than baseline:" << lengthBase << ".");
         }
       } else { // intersection is closer, calculate
@@ -2360 +2381 @@
         const double distance = BaseLineIntersection.NormSquared();
         if (Center.NormSquared() > BaseLine.NormSquared()) {
-          DoeLog(0) && (eLog() << Verbose(0) << "Algorithmic error: In second case we have intersection outside of baseline!" << endl);
+          ELOG(0, "Algorithmic error: In second case we have intersection outside of baseline!");
         }
         if ((ClosestLines.empty()) || (distance < MinDistance)) {
           ClosestLines.insert(LineRunner->second);
           MinDistance = distance;
-          DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Intersection in between endpoints, new closest line " << *LineRunner->second << " is " << *ClosestLines.begin() << " with projected distance " << MinDistance << "." << endl);
+          LOG(1, "ACCEPT: Intersection in between endpoints, new closest line " << *LineRunner->second << " is " << *ClosestLines.begin() << " with projected distance " << MinDistance << ".");
         } else {
-          DoLog(2) && (Log() << Verbose(2) << "REJECT: Point is further away from line " << *LineRunner->second << " than present closest line: " << distance << " >> " << MinDistance << "." << endl);
+          LOG(2, "REJECT: Point is further away from line " << *LineRunner->second << " than present closest line: " << distance << " >> " << MinDistance << ".");
         }
       }
@@ -2376 +2397 @@
   // check whether closest line is "too close" :), then it's inside
   if (ClosestLines.empty()) {
-    DoLog(0) && (Log() << Verbose(0) << "Is the only point, no one else is closeby." << endl);
+    LOG(0, "Is the only point, no one else is closeby.");
     return NULL;
   }
@@ -2416 +2437 @@
       result = *Runner;
       MinAlignment = Alignment;
-      DoLog(1) && (Log() << Verbose(1) << "ACCEPT: Triangle " << *result << " is better aligned with " << MinAlignment << "." << endl);
+      LOG(1, "ACCEPT: Triangle " << *result << " is better aligned with " << MinAlignment << ".");
     } else {
-      DoLog(1) && (Log() << Verbose(1) << "REJECT: Triangle " << *result << " is worse aligned with " << MinAlignment << "." << endl);
+      LOG(1, "REJECT: Triangle " << *result << " is worse aligned with " << MinAlignment << ".");
     }
   }
@@ -2471 +2492 @@
 
   if (triangle == NULL) {// is boundary point or only point in point cloud?
-    DoLog(1) && (Log() << Verbose(1) << "No triangle given!" << endl);
+    LOG(1, "No triangle given!");
     return -1.;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Closest triangle found is " << *triangle << " with normal vector " << triangle->NormalVector << "." << endl);
+    LOG(1, "INFO: Closest triangle found is " << *triangle << " with normal vector " << triangle->NormalVector << ".");
   }
 
   triangle->GetCenter(Center);
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Central point of the triangle is " << Center << "." << endl);
+  LOG(2, "INFO: Central point of the triangle is " << Center << ".");
   DistanceToCenter = Center - Point;
-  DoLog(2) && (Log() << Verbose(2) << "INFO: Vector from point to test to center is " << DistanceToCenter << "." << endl);
+  LOG(2, "INFO: Vector from point to test to center is " << DistanceToCenter << ".");
 
   // check whether we are on boundary
@@ -2487 +2508 @@
     DistanceToCenter = Point + triangle->NormalVector; // points outside
     Center = Point - triangle->NormalVector; // points towards MolCenter
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Calling Intersection with " << Center << " and " << DistanceToCenter << "." << endl);
+    LOG(1, "INFO: Calling Intersection with " << Center << " and " << DistanceToCenter << ".");
     if (triangle->GetIntersectionInsideTriangle(Center, DistanceToCenter, Intersection)) {
-      DoLog(1) && (Log() << Verbose(1) << Point << " is inner point: sufficiently close to boundary, " << Intersection << "." << endl);
+      LOG(1, Point << " is inner point: sufficiently close to boundary, " << Intersection << ".");
       return 0.;
     } else {
-      DoLog(1) && (Log() << Verbose(1) << Point << " is NOT an inner point: on triangle plane but outside of triangle bounds." << endl);
+      LOG(1, Point << " is NOT an inner point: on triangle plane but outside of triangle bounds.");
       return false;
     }
@@ -2498 +2519 @@
     // calculate smallest distance
     distance = triangle->GetClosestPointInsideTriangle(Point, Intersection);
-    DoLog(1) && (Log() << Verbose(1) << "Closest point on triangle is " << Intersection << "." << endl);
+    LOG(1, "Closest point on triangle is " << Intersection << ".");
 
     // then check direction to boundary
     if (DistanceToCenter.ScalarProduct(triangle->NormalVector) > MYEPSILON) {
-      DoLog(1) && (Log() << Verbose(1) << Point << " is an inner point, " << distance << " below surface." << endl);
+      LOG(1, Point << " is an inner point, " << distance << " below surface.");
       return -distance;
     } else {
-      DoLog(1) && (Log() << Verbose(1) << Point << " is NOT an inner point, " << distance << " above surface." << endl);
+      LOG(1, Point << " is NOT an inner point, " << distance << " above surface.");
       return +distance;
     }
@@ -2560 +2581 @@
     ReferencePoint = PointRunner->second;
   } else {
-    DoeLog(2) && (eLog() << Verbose(2) << "GetAllConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << "." << endl);
+    ELOG(2, "GetAllConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << ".");
     ReferencePoint = NULL;
   }
@@ -2585 +2606 @@
 
     if (takePoint) {
-      DoLog(1) && (Log() << Verbose(1) << "INFO: Endpoint " << *current << " of line " << *(findLines->second) << " is enlisted." << endl);
+      LOG(1, "INFO: Endpoint " << *current << " of line " << *(findLines->second) << " is enlisted.");
       connectedPoints->insert(current);
     }
@@ -2593 +2614 @@
 
   if (connectedPoints->empty()) { // if have not found any points
-    DoeLog(1) && (eLog() << Verbose(1) << "We have not found any connected points to " << *Point << "." << endl);
+    ELOG(1, "We have not found any connected points to " << *Point << ".");
     return NULL;
   }
@@ -2626 +2647 @@
 
   if (SetOfNeighbours == NULL) {
-    DoeLog(2) && (eLog() << Verbose(2) << "Could not find any connected points!" << endl);
+    ELOG(2, "Could not find any connected points!");
     delete (connectedCircle);
     return NULL;
@@ -2637 +2658 @@
       PlaneNormal += (*Runner)->NormalVector;
   } else {
-    DoeLog(0) && (eLog() << Verbose(0) << "Could not find any triangles for point " << *Point << "." << endl);
+    ELOG(0, "Could not find any triangles for point " << *Point << ".");
     performCriticalExit();
   }
   PlaneNormal.Scale(1.0 / triangles->size());
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Calculated PlaneNormal of all circle points is " << PlaneNormal << "." << endl);
+  LOG(1, "INFO: Calculated PlaneNormal of all circle points is " << PlaneNormal << ".");
   PlaneNormal.Normalize();
 
@@ -2648 +2669 @@
   AngleZero.ProjectOntoPlane(PlaneNormal);
   if ((AngleZero.NormSquared() < MYEPSILON)) {
-    DoLog(1) && (Log() << Verbose(1) << "Using alternatively " << (*SetOfNeighbours->begin())->getPosition() << " as angle 0 referencer." << endl);
+    LOG(1, "Using alternatively " << (*SetOfNeighbours->begin())->getPosition() << " as angle 0 referencer.");
     AngleZero = ((*SetOfNeighbours->begin())->getPosition()) - (Point->getPosition());
     AngleZero.ProjectOntoPlane(PlaneNormal);
     if (AngleZero.NormSquared() < MYEPSILON) {
-      DoeLog(0) && (eLog() << Verbose(0) << "CRITIAL: AngleZero is 0 even with alternative reference. The algorithm has to be changed here!" << endl);
+      ELOG(0, "CRITIAL: AngleZero is 0 even with alternative reference. The algorithm has to be changed here!");
       performCriticalExit();
     }
   }
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << "." << endl);
+  LOG(1, "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << ".");
   if (AngleZero.NormSquared() > MYEPSILON)
     OrthogonalVector = Plane(PlaneNormal, AngleZero,0).getNormal();
   else
     OrthogonalVector.MakeNormalTo(PlaneNormal);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: OrthogonalVector on plane is " << OrthogonalVector << "." << endl);
+  LOG(1, "INFO: OrthogonalVector on plane is " << OrthogonalVector << ".");
 
   // go through all connected points and calculate angle
@@ -2668 +2689 @@
     helper.ProjectOntoPlane(PlaneNormal);
     double angle = GetAngle(helper, AngleZero, OrthogonalVector);
-    DoLog(0) && (Log() << Verbose(0) << "INFO: Calculated angle is " << angle << " for point " << **listRunner << "." << endl);
+    LOG(0, "INFO: Calculated angle is " << angle << " for point " << **listRunner << ".");
     anglesOfPoints.insert(pair<double, TesselPoint*> (angle, (*listRunner)));
   }
@@ -2702 +2723 @@
 
   if (SetOfNeighbours == NULL) {
-    DoeLog(2) && (eLog() << Verbose(2) << "Could not find any connected points!" << endl);
+    ELOG(2, "Could not find any connected points!");
     delete (connectedCircle);
     return NULL;
@@ -2714 +2735 @@
   }
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Point is " << *Point << " and Reference is " << Reference << "." << endl);
+  LOG(1, "INFO: Point is " << *Point << " and Reference is " << Reference << ".");
   // calculate central point
   TesselPointSet::const_iterator TesselA = SetOfNeighbours->begin();
@@ -2727 +2748 @@
                    ((*TesselB)->getPosition()),
                    ((*TesselC)->getPosition())).getNormal();
-    DoLog(0) && (Log() << Verbose(0) << "Making normal vector out of " << *(*TesselA) << ", " << *(*TesselB) << " and " << *(*TesselC) << ":" << helper << endl);
+    LOG(0, "Making normal vector out of " << *(*TesselA) << ", " << *(*TesselB) << " and " << *(*TesselC) << ":" << helper);
     counter++;
     TesselA++;
@@ -2734 +2755 @@
     PlaneNormal += helper;
   }
-  //Log() << Verbose(0) << "Summed vectors " << center << "; number of points " << connectedPoints.size()
-  //  << "; scale factor " << counter;
+  //LOG(0, "Summed vectors " << center << "; number of points " << connectedPoints.size() << "; scale factor " << counter);
   PlaneNormal.Scale(1.0 / (double) counter);
-  //  Log() << Verbose(1) << "INFO: Calculated center of all circle points is " << center << "." << endl;
+  //  LOG(1, "INFO: Calculated center of all circle points is " << center << ".");
   //
   //  // projection plane of the circle is at the closes Point and normal is pointing away from center of all circle points
@@ -2743 +2763 @@
   //  PlaneNormal.SubtractVector(&center);
   //  PlaneNormal.Normalize();
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Calculated plane normal of circle is " << PlaneNormal << "." << endl);
+  LOG(1, "INFO: Calculated plane normal of circle is " << PlaneNormal << ".");
 
   // construct one orthogonal vector
@@ -2751 +2771 @@
   }
   if ((Reference.IsZero()) || (AngleZero.NormSquared() < MYEPSILON )) {
-    DoLog(1) && (Log() << Verbose(1) << "Using alternatively " << (*SetOfNeighbours->begin())->getPosition() << " as angle 0 referencer." << endl);
+    LOG(1, "Using alternatively " << (*SetOfNeighbours->begin())->getPosition() << " as angle 0 referencer.");
     AngleZero = ((*SetOfNeighbours->begin())->getPosition()) - (Point->getPosition());
     AngleZero.ProjectOntoPlane(PlaneNormal);
     if (AngleZero.NormSquared() < MYEPSILON) {
-      DoeLog(0) && (eLog() << Verbose(0) << "CRITIAL: AngleZero is 0 even with alternative reference. The algorithm has to be changed here!" << endl);
+      ELOG(0, "CRITIAL: AngleZero is 0 even with alternative reference. The algorithm has to be changed here!");
       performCriticalExit();
     }
   }
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << "." << endl);
+  LOG(1, "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << ".");
   if (AngleZero.NormSquared() > MYEPSILON)
     OrthogonalVector = Plane(PlaneNormal, AngleZero,0).getNormal();
   else
     OrthogonalVector.MakeNormalTo(PlaneNormal);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: OrthogonalVector on plane is " << OrthogonalVector << "." << endl);
+  LOG(1, "INFO: OrthogonalVector on plane is " << OrthogonalVector << ".");
 
   // go through all connected points and calculate angle
@@ -2774 +2794 @@
     if (angle > M_PI) // the correction is of no use here (and not desired)
       angle = 2. * M_PI - angle;
-    DoLog(0) && (Log() << Verbose(0) << "INFO: Calculated angle between " << helper << " and " << AngleZero << " is " << angle << " for point " << **listRunner << "." << endl);
+    LOG(0, "INFO: Calculated angle between " << helper << " and " << AngleZero << " is " << angle << " for point " << **listRunner << ".");
     InserterTest = anglesOfPoints.insert(pair<double, TesselPoint*> (angle, (*listRunner)));
     if (!InserterTest.second) {
-      DoeLog(0) && (eLog() << Verbose(0) << "GetCircleOfSetOfPoints() got two atoms with same angle: " << *((InserterTest.first)->second) << " and " << (*listRunner) << endl);
+      ELOG(0, "GetCircleOfSetOfPoints() got two atoms with same angle: " << *((InserterTest.first)->second) << " and " << (*listRunner));
       performCriticalExit();
     }
@@ -2816 +2836 @@
     ReferencePoint = PointRunner->second;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "GetPathOfConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << "." << endl);
+    ELOG(1, "GetPathOfConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << ".");
     return NULL;
   }
@@ -2833 +2853 @@
       LineRunner = TouchedLine.find(runner->second);
       if (LineRunner == TouchedLine.end()) {
-        DoeLog(1) && (eLog() << Verbose(1) << "I could not find " << *runner->second << " in the touched list." << endl);
+        ELOG(1, "I could not find " << *runner->second << " in the touched list.");
       } else if (!LineRunner->second) {
         LineRunner->second = true;
@@ -2841 +2861 @@
         StartLine = CurrentLine;
         CurrentPoint = CurrentLine->GetOtherEndpoint(ReferencePoint);
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Beginning path retrieval at " << *CurrentPoint << " of line " << *CurrentLine << "." << endl);
+        LOG(1, "INFO: Beginning path retrieval at " << *CurrentPoint << " of line " << *CurrentLine << ".");
         do {
           // push current one
-          DoLog(1) && (Log() << Verbose(1) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl);
+          LOG(1, "INFO: Putting " << *CurrentPoint << " at end of path.");
           connectedPath->push_back(CurrentPoint->node);
 
           // find next triangle
           for (TriangleMap::iterator Runner = CurrentLine->triangles.begin(); Runner != CurrentLine->triangles.end(); Runner++) {
-            DoLog(1) && (Log() << Verbose(1) << "INFO: Inspecting triangle " << *Runner->second << "." << endl);
+            LOG(1, "INFO: Inspecting triangle " << *Runner->second << ".");
             if ((Runner->second != triangle)) { // look for first triangle not equal to old one
               triangle = Runner->second;
@@ -2856 +2876 @@
                 if (!TriangleRunner->second) {
                   TriangleRunner->second = true;
-                  DoLog(1) && (Log() << Verbose(1) << "INFO: Connecting triangle is " << *triangle << "." << endl);
+                  LOG(1, "INFO: Connecting triangle is " << *triangle << ".");
                   break;
                 } else {
-                  DoLog(1) && (Log() << Verbose(1) << "INFO: Skipping " << *triangle << ", as we have already visited it." << endl);
+                  LOG(1, "INFO: Skipping " << *triangle << ", as we have already visited it.");
                   triangle = NULL;
                 }
               } else {
-                DoeLog(1) && (eLog() << Verbose(1) << "I could not find " << *triangle << " in the touched list." << endl);
+                ELOG(1, "I could not find " << *triangle << " in the touched list.");
                 triangle = NULL;
               }
@@ -2874 +2894 @@
             if ((triangle->lines[i] != CurrentLine) && (triangle->lines[i]->ContainsBoundaryPoint(ReferencePoint))) { // not the current line and still containing Point
               CurrentLine = triangle->lines[i];
-              DoLog(1) && (Log() << Verbose(1) << "INFO: Connecting line is " << *CurrentLine << "." << endl);
+              LOG(1, "INFO: Connecting line is " << *CurrentLine << ".");
               break;
             }
@@ -2880 +2900 @@
           LineRunner = TouchedLine.find(CurrentLine);
           if (LineRunner == TouchedLine.end())
-            DoeLog(1) && (eLog() << Verbose(1) << "I could not find " << *CurrentLine << " in the touched list." << endl);
+            ELOG(1, "I could not find " << *CurrentLine << " in the touched list.");
           else
             LineRunner->second = true;
@@ -2888 +2908 @@
         } while (CurrentLine != StartLine);
         // last point is missing, as it's on start line
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl);
+        LOG(1, "INFO: Putting " << *CurrentPoint << " at end of path.");
         if (StartLine->GetOtherEndpoint(ReferencePoint)->node != connectedPath->back())
           connectedPath->push_back(StartLine->GetOtherEndpoint(ReferencePoint)->node);
@@ -2894 +2914 @@
         ListOfPaths->push_back(connectedPath);
       } else {
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Skipping " << *runner->second << ", as we have already visited it." << endl);
+        LOG(1, "INFO: Skipping " << *runner->second << ", as we have already visited it.");
       }
     }
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "There are no lines attached to " << *ReferencePoint << "." << endl);
+    ELOG(1, "There are no lines attached to " << *ReferencePoint << ".");
   }
 
@@ -2924 +2944 @@
     connectedPath = *ListRunner;
 
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Current path is " << connectedPath << "." << endl);
+    LOG(1, "INFO: Current path is " << connectedPath << ".");
 
     // go through list, look for reappearance of starting Point and count
@@ -2933 +2953 @@
       if ((*CircleRunner == *CircleStart) && (CircleRunner != CircleStart)) { // is not the very first point
         // we have a closed circle from Marker to new Marker
-        DoLog(1) && (Log() << Verbose(1) << count + 1 << ". closed path consists of: ");
+        if (DoLog(1)) {
+          std::stringstream output;
+          output << count + 1 << ". closed path consists of: ";
+          for (TesselPointList::iterator CircleSprinter = Marker;
+              CircleSprinter != CircleRunner;
+              CircleSprinter++)
+            output << (**CircleSprinter) << " <-> ";
+          LOG(1, output.str());
+        }
         newPath = new TesselPointList;
         TesselPointList::iterator CircleSprinter = Marker;
-        for (; CircleSprinter != CircleRunner; CircleSprinter++) {
+        for (; CircleSprinter != CircleRunner; CircleSprinter++)
           newPath->push_back(*CircleSprinter);
-          DoLog(0) && (Log() << Verbose(0) << (**CircleSprinter) << " <-> ");
-        }
-        DoLog(0) && (Log() << Verbose(0) << ".." << endl);
         count++;
         Marker = CircleRunner;
@@ -2949 +2974 @@
     }
   }
-  DoLog(1) && (Log() << Verbose(1) << "INFO: " << count << " closed additional path(s) have been created." << endl);
+  LOG(1, "INFO: " << count << " closed additional path(s) have been created.");
 
   // delete list of paths
@@ -2975 +3000 @@
 
   if (Point == NULL) {
-    DoeLog(1) && (eLog() << Verbose(1) << "Point given is NULL." << endl);
+    ELOG(1, "Point given is NULL.");
   } else {
     // go through its lines and insert all triangles
@@ -3008 +3033 @@
 
   if (point == NULL) {
-    DoeLog(1) && (eLog() << Verbose(1) << "Cannot remove the point " << point << ", it's NULL!" << endl);
+    ELOG(1, "Cannot remove the point " << point << ", it's NULL!");
     return 0.;
   } else
-    DoLog(0) && (Log() << Verbose(0) << "Removing point " << *point << " from tesselated boundary ..." << endl);
+    LOG(0, "Removing point " << *point << " from tesselated boundary ...");
 
   // copy old location for the volume
@@ -3018 +3043 @@
   // get list of connected points
   if (point->lines.empty()) {
-    DoeLog(1) && (eLog() << Verbose(1) << "Cannot remove the point " << *point << ", it's connected to no lines!" << endl);
+    ELOG(1, "Cannot remove the point " << *point << ", it's connected to no lines!");
     return 0.;
   }
@@ -3041 +3066 @@
   NormalVector.Zero();
   for (TriangleMap::iterator Runner = Candidates.begin(); Runner != Candidates.end(); Runner++) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Removing triangle " << *(Runner->second) << "." << endl);
+    LOG(1, "INFO: Removing triangle " << *(Runner->second) << ".");
     NormalVector -= Runner->second->NormalVector; // has to point inward
     RemoveTesselationTriangle(Runner->second);
     count++;
   }
-  DoLog(1) && (Log() << Verbose(1) << count << " triangles were removed." << endl);
+  LOG(1, count << " triangles were removed.");
 
   list<TesselPointList *>::iterator ListAdvance = ListOfClosedPaths->begin();
@@ -3070 +3095 @@
         smallestangle = 0.;
         for (MiddleNode = connectedPath->begin(); MiddleNode != connectedPath->end(); MiddleNode++) {
-          DoLog(1) && (Log() << Verbose(1) << "INFO: MiddleNode is " << **MiddleNode << "." << endl);
+          LOG(1, "INFO: MiddleNode is " << **MiddleNode << ".");
           // construct vectors to next and previous neighbour
           StartNode = MiddleNode;
@@ -3076 +3101 @@
             StartNode = connectedPath->end();
           StartNode--;
-          //Log() << Verbose(3) << "INFO: StartNode is " << **StartNode << "." << endl;
+          //LOG(3, "INFO: StartNode is " << **StartNode << ".");
           Point = ((*StartNode)->getPosition()) - ((*MiddleNode)->getPosition());
           StartNode = MiddleNode;
@@ -3082 +3107 @@
           if (StartNode == connectedPath->end())
             StartNode = connectedPath->begin();
-          //Log() << Verbose(3) << "INFO: EndNode is " << **StartNode << "." << endl;
+          //LOG(3, "INFO: EndNode is " << **StartNode << ".");
           Reference = ((*StartNode)->getPosition()) - ((*MiddleNode)->getPosition());
           OrthogonalVector = ((*MiddleNode)->getPosition()) - OldPoint;
@@ -3095 +3120 @@
         MiddleNode = EndNode;
         if (MiddleNode == connectedPath->end()) {
-          DoeLog(0) && (eLog() << Verbose(0) << "CRITICAL: Could not find a smallest angle!" << endl);
+          ELOG(0, "CRITICAL: Could not find a smallest angle!");
           performCriticalExit();
         }
@@ -3105 +3130 @@
         if (EndNode == connectedPath->end())
           EndNode = connectedPath->begin();
-        DoLog(2) && (Log() << Verbose(2) << "INFO: StartNode is " << **StartNode << "." << endl);
-        DoLog(2) && (Log() << Verbose(2) << "INFO: MiddleNode is " << **MiddleNode << "." << endl);
-        DoLog(2) && (Log() << Verbose(2) << "INFO: EndNode is " << **EndNode << "." << endl);
-        DoLog(1) && (Log() << Verbose(1) << "INFO: Attempting to create triangle " << (*StartNode)->getName() << ", " << (*MiddleNode)->getName() << " and " << (*EndNode)->getName() << "." << endl);
+        LOG(2, "INFO: StartNode is " << **StartNode << ".");
+        LOG(2, "INFO: MiddleNode is " << **MiddleNode << ".");
+        LOG(2, "INFO: EndNode is " << **EndNode << ".");
+        LOG(1, "INFO: Attempting to create triangle " << (*StartNode)->getName() << ", " << (*MiddleNode)->getName() << " and " << (*EndNode)->getName() << ".");
         TriangleCandidates[0] = *StartNode;
         TriangleCandidates[1] = *MiddleNode;
@@ -3114 +3139 @@
         triangle = GetPresentTriangle(TriangleCandidates);
         if (triangle != NULL) {
-          DoeLog(0) && (eLog() << Verbose(0) << "New triangle already present, skipping!" << endl);
+          ELOG(0, "New triangle already present, skipping!");
           StartNode++;
           MiddleNode++;
@@ -3126 +3151 @@
           continue;
         }
-        DoLog(3) && (Log() << Verbose(3) << "Adding new triangle points." << endl);
+        LOG(3, "Adding new triangle points.");
         AddTesselationPoint(*StartNode, 0);
         AddTesselationPoint(*MiddleNode, 1);
         AddTesselationPoint(*EndNode, 2);
-        DoLog(3) && (Log() << Verbose(3) << "Adding new triangle lines." << endl);
+        LOG(3, "Adding new triangle lines.");
         AddTesselationLine(NULL, NULL, TPS[0], TPS[1], 0);
         AddTesselationLine(NULL, NULL, TPS[0], TPS[2], 1);
@@ -3145 +3170 @@
         // prepare nodes for next triangle
         StartNode = EndNode;
-        DoLog(2) && (Log() << Verbose(2) << "Removing " << **MiddleNode << " from closed path, remaining points: " << connectedPath->size() << "." << endl);
+        LOG(2, "Removing " << **MiddleNode << " from closed path, remaining points: " << connectedPath->size() << ".");
         connectedPath->remove(*MiddleNode); // remove the middle node (it is surrounded by triangles)
         if (connectedPath->size() == 2) { // we are done
@@ -3152 +3177 @@
           break;
         } else if (connectedPath->size() < 2) { // something's gone wrong!
-          DoeLog(0) && (eLog() << Verbose(0) << "CRITICAL: There are only two endpoints left!" << endl);
+          ELOG(0, "CRITICAL: There are only two endpoints left!");
           performCriticalExit();
         } else {
@@ -3181 +3206 @@
           if (maxgain != 0) {
             volume += maxgain;
-            DoLog(1) && (Log() << Verbose(1) << "Flipping baseline with highest volume" << **Candidate << "." << endl);
+            LOG(1, "Flipping baseline with highest volume" << **Candidate << ".");
             OtherBase = FlipBaseline(*Candidate);
             NewLines.erase(Candidate);
@@ -3192 +3217 @@
       delete (connectedPath);
     }
-    DoLog(0) && (Log() << Verbose(0) << count << " triangles were created." << endl);
+    LOG(0, count << " triangles were created.");
   } else {
     while (!ListOfClosedPaths->empty()) {
@@ -3200 +3225 @@
       delete (connectedPath);
     }
-    DoLog(0) && (Log() << Verbose(0) << "No need to create any triangles." << endl);
+    LOG(0, "No need to create any triangles.");
   }
   delete (ListOfClosedPaths);
 
-  DoLog(0) && (Log() << Verbose(0) << "Removed volume is " << volume << "." << endl);
+  LOG(0, "Removed volume is " << volume << ".");
 
   return volume;
@@ -3298 +3323 @@
     }
     default:
-      DoeLog(0) && (eLog() << Verbose(0) << "Number of wildcards is greater than 3, cannot happen!" << endl);
+      ELOG(0, "Number of wildcards is greater than 3, cannot happen!");
       performCriticalExit();
       break;
@@ -3354 +3379 @@
   // sanity check
   if (LinesOnBoundary.empty()) {
-    DoeLog(2) && (eLog() << Verbose(2) << "FindAllDegeneratedTriangles() was called without any tesselation structure.");
+    ELOG(2, "FindAllDegeneratedTriangles() was called without any tesselation structure.");
     return DegeneratedLines;
   }
@@ -3369 +3394 @@
   AllLines.clear();
 
-  DoLog(0) && (Log() << Verbose(0) << "FindAllDegeneratedLines() found " << DegeneratedLines->size() << " lines." << endl);
+  LOG(0, "FindAllDegeneratedLines() found " << DegeneratedLines->size() << " lines.");
   IndexToIndex::iterator it;
   for (it = DegeneratedLines->begin(); it != DegeneratedLines->end(); it++) {
@@ -3375 +3400 @@
     const LineMap::const_iterator Line2 = LinesOnBoundary.find((*it).second);
     if (Line1 != LinesOnBoundary.end() && Line2 != LinesOnBoundary.end())
-      DoLog(0) && (Log() << Verbose(0) << *Line1->second << " => " << *Line2->second << endl);
+      LOG(0, *Line1->second << " => " << *Line2->second);
     else
-      DoeLog(1) && (eLog() << Verbose(1) << "Either " << (*it).first << " or " << (*it).second << " are not in LinesOnBoundary!" << endl);
+      ELOG(1, "Either " << (*it).first << " or " << (*it).second << " are not in LinesOnBoundary!");
   }
 
@@ -3417 +3442 @@
   delete (DegeneratedLines);
 
-  DoLog(0) && (Log() << Verbose(0) << "FindAllDegeneratedTriangles() found " << DegeneratedTriangles->size() << " triangles:" << endl);
+  LOG(0, "FindAllDegeneratedTriangles() found " << DegeneratedTriangles->size() << " triangles:");
   for (IndexToIndex::iterator it = DegeneratedTriangles->begin(); it != DegeneratedTriangles->end(); it++)
-    DoLog(0) && (Log() << Verbose(0) << (*it).first << " => " << (*it).second << endl);
+    LOG(0, (*it).first << " => " << (*it).second);
 
   return DegeneratedTriangles;
@@ -3438 +3463 @@
   // iterate over all degenerated triangles
   for (IndexToIndex::iterator TriangleKeyRunner = DegeneratedTriangles->begin(); !DegeneratedTriangles->empty(); TriangleKeyRunner = DegeneratedTriangles->begin()) {
-    DoLog(0) && (Log() << Verbose(0) << "Checking presence of triangles " << TriangleKeyRunner->first << " and " << TriangleKeyRunner->second << "." << endl);
+    LOG(0, "Checking presence of triangles " << TriangleKeyRunner->first << " and " << TriangleKeyRunner->second << ".");
     // both ways are stored in the map, only use one
     if (TriangleKeyRunner->first > TriangleKeyRunner->second)
@@ -3495 +3520 @@
       // erase the pair
       count += (int) DegeneratedTriangles->erase(triangle->Nr);
-      DoLog(0) && (Log() << Verbose(0) << "RemoveDegeneratedTriangles() removes triangle " << *triangle << "." << endl);
+      LOG(0, "RemoveDegeneratedTriangles() removes triangle " << *triangle << ".");
       RemoveTesselationTriangle(triangle);
       count += (int) DegeneratedTriangles->erase(partnerTriangle->Nr);
-      DoLog(0) && (Log() << Verbose(0) << "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << "." << endl);
+      LOG(0, "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << ".");
       RemoveTesselationTriangle(partnerTriangle);
     } else {
-      DoLog(0) && (Log() << Verbose(0) << "RemoveDegeneratedTriangles() does not remove triangle " << *triangle << " and its partner " << *partnerTriangle << " because it is essential for at" << " least one of the endpoints to be kept in the tesselation structure." << endl);
+      LOG(0, "RemoveDegeneratedTriangles() does not remove triangle " << *triangle << " and its partner " << *partnerTriangle << " because it is essential for at" << " least one of the endpoints to be kept in the tesselation structure.");
     }
   }
@@ -3508 +3533 @@
     LastTriangle = NULL;
 
-  DoLog(0) && (Log() << Verbose(0) << "RemoveDegeneratedTriangles() removed " << count << " triangles:" << endl);
+  LOG(0, "RemoveDegeneratedTriangles() removed " << count << " triangles:");
 }
 
@@ -3534 +3559 @@
     NearestBoundaryPoint = PointRunner->second;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "I cannot find the boundary point." << endl);
+    ELOG(1, "I cannot find the boundary point.");
     return;
   }
-  DoLog(0) && (Log() << Verbose(0) << "Nearest point on boundary is " << NearestPoint->getName() << "." << endl);
+  LOG(0, "Nearest point on boundary is " << NearestPoint->getName() << ".");
 
   // go through its lines and find the best one to split
@@ -3569 +3594 @@
 
   // create new triangle to connect point (connects automatically with the missing spot of the chosen line)
-  DoLog(2) && (Log() << Verbose(2) << "Adding new triangle points." << endl);
+  LOG(2, "Adding new triangle points.");
   AddTesselationPoint((BestLine->endpoints[0]->node), 0);
   AddTesselationPoint((BestLine->endpoints[1]->node), 1);
   AddTesselationPoint(point, 2);
-  DoLog(2) && (Log() << Verbose(2) << "Adding new triangle lines." << endl);
+  LOG(2, "Adding new triangle lines.");
   AddTesselationLine(NULL, NULL, TPS[0], TPS[1], 0);
   AddTesselationLine(NULL, NULL, TPS[0], TPS[2], 1);
@@ -3580 +3605 @@
   BTS->GetNormalVector(TempTriangle->NormalVector);
   BTS->NormalVector.Scale(-1.);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: NormalVector of new triangle is " << BTS->NormalVector << "." << endl);
+  LOG(1, "INFO: NormalVector of new triangle is " << BTS->NormalVector << ".");
   AddTesselationTriangle();
 
   // create other side of this triangle and close both new sides of the first created triangle
-  DoLog(2) && (Log() << Verbose(2) << "Adding new triangle points." << endl);
+  LOG(2, "Adding new triangle points.");
   AddTesselationPoint((BestLine->endpoints[0]->node), 0);
   AddTesselationPoint((BestLine->endpoints[1]->node), 1);
   AddTesselationPoint(point, 2);
-  DoLog(2) && (Log() << Verbose(2) << "Adding new triangle lines." << endl);
+  LOG(2, "Adding new triangle lines.");
   AddTesselationLine(NULL, NULL, TPS[0], TPS[1], 0);
   AddTesselationLine(NULL, NULL, TPS[0], TPS[2], 1);
@@ -3594 +3619 @@
   BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
   BTS->GetNormalVector(TempTriangle->NormalVector);
-  DoLog(1) && (Log() << Verbose(1) << "INFO: NormalVector of other new triangle is " << BTS->NormalVector << "." << endl);
+  LOG(1, "INFO: NormalVector of other new triangle is " << BTS->NormalVector << ".");
   AddTesselationTriangle();
 
@@ -3601 +3626 @@
     if ((BTS->lines[i]->ContainsBoundaryPoint(BestLine->endpoints[0])) && (BTS->lines[i]->ContainsBoundaryPoint(BestLine->endpoints[1]))) {
       if (BestLine == BTS->lines[i]) {
-        DoeLog(0) && (eLog() << Verbose(0) << "BestLine is same as found line, something's wrong here!" << endl);
+        ELOG(0, "BestLine is same as found line, something's wrong here!");
         performCriticalExit();
       }
@@ -3634 +3659 @@
         NameofTempFile.erase(npos, 1);
       NameofTempFile.append(TecplotSuffix);
-      DoLog(0) && (Log() << Verbose(0) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n");
+      LOG(1, "INFO: Writing temporary non convex hull to file " << NameofTempFile << ".");
       tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
       WriteTecplotFile(tempstream, this, cloud, TriangleFilesWritten);
@@ -3648 +3673 @@
         NameofTempFile.erase(npos, 1);
       NameofTempFile.append(Raster3DSuffix);
-      DoLog(0) && (Log() << Verbose(0) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n");
+      LOG(1, "INFO: Writing temporary non convex hull to file " << NameofTempFile << ".");
       tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
       WriteRaster3dFile(tempstream, this, cloud);
@@ -3700 +3725 @@
   pair<map<int, Vector *>::iterator, bool> TriangleInsertionTester;
   for (PointMap::const_iterator Runner = PointsOnBoundary.begin(); Runner != PointsOnBoundary.end(); Runner++) {
-    DoLog(0) && (Log() << Verbose(0) << "Current point is " << *Runner->second << "." << endl);
+    LOG(0, "Current point is " << *Runner->second << ".");
     map<int, Vector *> TriangleVectors;
     // gather all NormalVectors
-    DoLog(1) && (Log() << Verbose(1) << "Gathering triangles ..." << endl);
+    LOG(1, "Gathering triangles ...");
     for (LineMap::const_iterator LineRunner = (Runner->second)->lines.begin(); LineRunner != (Runner->second)->lines.end(); LineRunner++)
       for (TriangleMap::const_iterator TriangleRunner = (LineRunner->second)->triangles.begin(); TriangleRunner != (LineRunner->second)->triangles.end(); TriangleRunner++) {
@@ -3709 +3734 @@
           TriangleInsertionTester = TriangleVectors.insert(pair<int, Vector *> ((TriangleRunner->second)->Nr, &((TriangleRunner->second)->NormalVector)));
           if (TriangleInsertionTester.second)
-            DoLog(1) && (Log() << Verbose(1) << " Adding triangle " << *(TriangleRunner->second) << " to triangles to check-list." << endl);
+            LOG(1, " Adding triangle " << *(TriangleRunner->second) << " to triangles to check-list.");
         } else {
-          DoLog(1) && (Log() << Verbose(1) << " NOT adding triangle " << *(TriangleRunner->second) << " as it's a simply degenerated one." << endl);
+          LOG(1, " NOT adding triangle " << *(TriangleRunner->second) << " as it's a simply degenerated one.");
         }
       }
     // check whether there are two that are parallel
-    DoLog(1) && (Log() << Verbose(1) << "Finding two parallel triangles ..." << endl);
+    LOG(1, "Finding two parallel triangles ...");
     for (map<int, Vector *>::iterator VectorWalker = TriangleVectors.begin(); VectorWalker != TriangleVectors.end(); VectorWalker++)
       for (map<int, Vector *>::iterator VectorRunner = VectorWalker; VectorRunner != TriangleVectors.end(); VectorRunner++)
         if (VectorWalker != VectorRunner) { // skip equals
           const double SCP = VectorWalker->second->ScalarProduct(*VectorRunner->second); // ScalarProduct should result in -1. for degenerated triangles
-          DoLog(1) && (Log() << Verbose(1) << "Checking " << *VectorWalker->second << " against " << *VectorRunner->second << ": " << SCP << endl);
+          LOG(1, "Checking " << *VectorWalker->second << " against " << *VectorRunner->second << ": " << SCP);
           if (fabs(SCP + 1.) < ParallelEpsilon) {
             InsertionTester = EndpointCandidateList.insert((Runner->second));
             if (InsertionTester.second)
-              DoLog(0) && (Log() << Verbose(0) << " Adding " << *Runner->second << " to endpoint candidate list." << endl);
+              LOG(0, " Adding " << *Runner->second << " to endpoint candidate list.");
             // and break out of both loops
             VectorWalker = TriangleVectors.end();
@@ -3743 +3768 @@
     Walker = *(EndpointCandidateList.begin());
     if (Current == NULL) { // create a new polygon with current candidate
-      DoLog(0) && (Log() << Verbose(0) << "Starting new polygon set at point " << *Walker << endl);
+      LOG(0, "Starting new polygon set at point " << *Walker);
       Current = new BoundaryPolygonSet;
       Current->endpoints.insert(Walker);
@@ -3756 +3781 @@
       for (LineMap::const_iterator LineWalker = Walker->lines.begin(); LineWalker != Walker->lines.end(); LineWalker++) {
         OtherWalker = (LineWalker->second)->GetOtherEndpoint(Walker);
-        DoLog(1) && (Log() << Verbose(1) << "Checking " << *OtherWalker << endl);
+        LOG(1, "Checking " << *OtherWalker);
         set<BoundaryPointSet *>::iterator Finder = EndpointCandidateList.find(OtherWalker);
         if (Finder != EndpointCandidateList.end()) { // found a connected partner
-          DoLog(1) && (Log() << Verbose(1) << " Adding to polygon." << endl);
+          LOG(1, " Adding to polygon.");
           Current->endpoints.insert(OtherWalker);
           EndpointCandidateList.erase(Finder); // remove from candidates
           ToCheckConnecteds.push(OtherWalker); // but check its partners too
         } else {
-          DoLog(1) && (Log() << Verbose(1) << " is not connected to " << *Walker << endl);
+          LOG(1, " is not connected to " << *Walker);
         }
       }
     }
 
-    DoLog(0) && (Log() << Verbose(0) << "Final polygon is " << *Current << endl);
+    LOG(0, "Final polygon is " << *Current);
     ListofDegeneratedPolygons.insert(Current);
     Current = NULL;
@@ -3776 +3801 @@
   const int counter = ListofDegeneratedPolygons.size();
 
-  DoLog(0) && (Log() << Verbose(0) << "The following " << counter << " degenerated polygons have been found: " << endl);
-  for (UniquePolygonSet::iterator PolygonRunner = ListofDegeneratedPolygons.begin(); PolygonRunner != ListofDegeneratedPolygons.end(); PolygonRunner++)
-    DoLog(0) && (Log() << Verbose(0) << " " << **PolygonRunner << endl);
+  if (DoLog(0)) {
+    std::stringstream output;
+    output << "The following " << counter << " degenerated polygons have been found: ";
+    for (UniquePolygonSet::iterator PolygonRunner = ListofDegeneratedPolygons.begin(); PolygonRunner != ListofDegeneratedPolygons.end(); PolygonRunner++)
+      output << " " << **PolygonRunner;
+    LOG(0, output.str());
+  }
 
   /// 4. Go through all these degenerated polygons
@@ -3789 +3818 @@
     // check whether number is bigger than 2, otherwise it's just a simply degenerated one and nothing to do.
     if (T->size() == 2) {
-      DoLog(1) && (Log() << Verbose(1) << " Skipping degenerated polygon, is just a (already simply degenerated) triangle." << endl);
+      LOG(1, " Skipping degenerated polygon, is just a (already simply degenerated) triangle.");
       delete (T);
       continue;
@@ -3799 +3828 @@
     // connections to either polygon ...
     if (T->size() % 2 != 0) {
-      DoeLog(0) && (eLog() << Verbose(0) << " degenerated polygon contains an odd number of triangles, probably contains bridging non-degenerated ones, too!" << endl);
+      ELOG(0, " degenerated polygon contains an odd number of triangles, probably contains bridging non-degenerated ones, too!");
       performCriticalExit();
     }
@@ -3805 +3834 @@
     /// 4a. Get NormalVector for one side (this is "front")
     NormalVector = (*TriangleWalker)->NormalVector;
-    DoLog(1) && (Log() << Verbose(1) << "\"front\" defining triangle is " << **TriangleWalker << " and Normal vector of \"front\" side is " << NormalVector << endl);
+    LOG(1, "\"front\" defining triangle is " << **TriangleWalker << " and Normal vector of \"front\" side is " << NormalVector);
     TriangleWalker++;
     TriangleSet::iterator TriangleSprinter = TriangleWalker; // is the inner advanced iterator
@@ -3814 +3843 @@
       triangle = *TriangleWalker;
       TriangleSprinter++;
-      DoLog(1) && (Log() << Verbose(1) << "Current triangle to test for removal: " << *triangle << endl);
+      LOG(1, "Current triangle to test for removal: " << *triangle);
       if (triangle->NormalVector.ScalarProduct(NormalVector) < 0) { // if from other side, then delete and remove from list
-        DoLog(1) && (Log() << Verbose(1) << " Removing ... " << endl);
+        LOG(1, " Removing ... ");
         TriangleNrs.push(triangle->Nr);
         T->erase(TriangleWalker);
         RemoveTesselationTriangle(triangle);
       } else
-        DoLog(1) && (Log() << Verbose(1) << " Keeping ... " << endl);
+        LOG(1, " Keeping ... ");
     }
     /// 4c. Copy all "front" triangles but with inverse NormalVector
     TriangleWalker = T->begin();
     while (TriangleWalker != T->end()) { // go through all front triangles
-      DoLog(1) && (Log() << Verbose(1) << " Re-creating triangle " << **TriangleWalker << " with NormalVector " << (*TriangleWalker)->NormalVector << endl);
+      LOG(1, " Re-creating triangle " << **TriangleWalker << " with NormalVector " << (*TriangleWalker)->NormalVector);
       for (int i = 0; i < 3; i++)
         AddTesselationPoint((*TriangleWalker)->endpoints[i]->node, i);
@@ -3833 +3862 @@
       AddTesselationLine(NULL, NULL, TPS[1], TPS[2], 2);
       if (TriangleNrs.empty())
-        DoeLog(0) && (eLog() << Verbose(0) << "No more free triangle numbers!" << endl);
+        ELOG(0, "No more free triangle numbers!");
       BTS = new BoundaryTriangleSet(BLS, TriangleNrs.top()); // copy triangle ...
       AddTesselationTriangle(); // ... and add
@@ -3841 +3870 @@
     }
     if (!TriangleNrs.empty()) {
-      DoeLog(0) && (eLog() << Verbose(0) << "There have been less triangles created than removed!" << endl);
+      ELOG(0, "There have been less triangles created than removed!");
     }
     delete (T); // remove the triangleset
   }
   IndexToIndex * SimplyDegeneratedTriangles = FindAllDegeneratedTriangles();
-  DoLog(0) && (Log() << Verbose(0) << "Final list of simply degenerated triangles found, containing " << SimplyDegeneratedTriangles->size() << " triangles:" << endl);
+  LOG(0, "Final list of simply degenerated triangles found, containing " << SimplyDegeneratedTriangles->size() << " triangles:");
   IndexToIndex::iterator it;
   for (it = SimplyDegeneratedTriangles->begin(); it != SimplyDegeneratedTriangles->end(); it++)
-    DoLog(0) && (Log() << Verbose(0) << (*it).first << " => " << (*it).second << endl);
+    LOG(0, (*it).first << " => " << (*it).second);
   delete (SimplyDegeneratedTriangles);
   /// 5. exit

src/Tesselation/tesselationhelpers.cpp

@@ -76 +76 @@
 
   if (fabs(m11) < MYEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "three points are colinear." << endl);
+    ELOG(1, "three points are colinear.");
 
   center->at(0) =  0.5 * m12/ m11;
@@ -83 +83 @@
 
   if (fabs(a.distance(*center) - RADIUS) > MYEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "The given center is further way by " << fabs(a.distance(*center) - RADIUS) << " from a than RADIUS." << endl);
+    ELOG(1, "The given center is further way by " << fabs(a.distance(*center) - RADIUS) << " from a than RADIUS.");
 };
 
@@ -122 +122 @@
   Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
   (*NewUmkreismittelpunkt) = (*Center);
-  DoLog(1) && (Log() << Verbose(1) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n");
+  LOG(2, "INFO: Center of new circumference is " << *NewUmkreismittelpunkt << ".");
   // Here we calculated center of circumscribing circle, using barycentric coordinates
-  DoLog(1) && (Log() << Verbose(1) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n");
+  LOG(2, "INFO: Center of circumference is " << *Center << " in direction " << *Direction << ".");
 
   TempNormal = a - b;
@@ -146 +146 @@
   TempNormal.Normalize();
   Restradius = sqrt(RADIUS*RADIUS - Umkreisradius*Umkreisradius);
-  DoLog(1) && (Log() << Verbose(1) << "Height of center of circumference to center of sphere is " << Restradius << ".\n");
+  LOG(2, "Height of center of circumference to center of sphere is " << Restradius << ".");
   TempNormal.Scale(Restradius);
-  DoLog(1) && (Log() << Verbose(1) << "Shift vector to sphere of circumference is " << TempNormal << ".\n");
+  LOG(2, "Shift vector to sphere of circumference is " << TempNormal << ".");
   (*Center) += TempNormal;
-  DoLog(1) && (Log() << Verbose(1) << "Center of sphere of circumference is " << *Center << ".\n");
+  LOG(2, "Center of sphere of circumference is " << *Center << ".");
   GetSphere(&OtherCenter, a, b, c, RADIUS);
-  DoLog(1) && (Log() << Verbose(1) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n");
+  LOG(2, "OtherCenter of sphere of circumference is " << OtherCenter << ".");
 };
 
@@ -180 +180 @@
   if (fabs(helper[0]+helper[1]+helper[2]) > MYEPSILON)
     Center.Scale(1./(helper[0]+helper[1]+helper[2]));
-  Log() << Verbose(1) << "INFO: Center (2nd algo) is at " << Center << "." << endl;
+  LOG(1, "INFO: Center (2nd algo) is at " << Center << ".");
 };
 
@@ -208 +208 @@
   // test whether new center is on the parameter circle's plane
   if (fabs(helper.ScalarProduct(CirclePlaneNormal)) > HULLEPSILON) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Something's very wrong here: NewSphereCenter is not on the band's plane as desired by " <<fabs(helper.ScalarProduct(CirclePlaneNormal))  << "!" << endl);
+    ELOG(1, "Something's very wrong here: NewSphereCenter is not on the band's plane as desired by " <<fabs(helper.ScalarProduct(CirclePlaneNormal))  << "!");
     helper.ProjectOntoPlane(CirclePlaneNormal);
   }
@@ -214 +214 @@
   // test whether the new center vector has length of CircleRadius
   if (fabs(radius - CircleRadius) > HULLEPSILON)
-    DoeLog(1) && (eLog()<< Verbose(1) << "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl);
+    ELOG(1, "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << ".");
   alpha = helper.Angle(RelativeOldSphereCenter);
   // make the angle unique by checking the halfplanes/search direction
   if (helper.ScalarProduct(SearchDirection) < -HULLEPSILON)  // acos is not unique on [0, 2.*M_PI), hence extra check to decide between two half intervals
     alpha = 2.*M_PI - alpha;
-  DoLog(1) && (Log() << Verbose(1) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << "." << endl);
+  LOG(1, "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << ".");
   radius = helper.distance(RelativeOldSphereCenter);
   helper.ProjectOntoPlane(NormalVector);
   // check whether new center is somewhat away or at least right over the current baseline to prevent intersecting triangles
   if ((radius > HULLEPSILON) || (helper.Norm() < HULLEPSILON)) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << "." << endl);
+    LOG(1, "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << ".");
     return alpha;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << "." << endl);
+    LOG(1, "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << ".");
     return 2.*M_PI;
   }
@@ -262 +262 @@
   }
 
-  DoLog(1) && (Log() << Verbose(1) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl);
+  LOG(1, "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << ".");
 
   return phi;
@@ -329 +329 @@
     for (int j=i+1; j<3; j++) {
       if (nodes[i] == NULL) {
-        DoLog(1) && (Log() << Verbose(1) << "Node nr. " << i << " is not yet present." << endl);
+        LOG(1, "Node nr. " << i << " is not yet present.");
         result = true;
       } else if (nodes[i]->lines.find(nodes[j]->node->getNr()) != nodes[i]->lines.end()) {  // there already is a line
@@ -343 +343 @@
         }
       } else { // no line
-        DoLog(1) && (Log() << Verbose(1) << "The line between " << *nodes[i] << " and " << *nodes[j] << " is not yet present, hence no need for a degenerate triangle." << endl);
+        LOG(1, "The line between " << *nodes[i] << " and " << *nodes[j] << " is not yet present, hence no need for a degenerate triangle.");
         result = true;
       }
     }
   if ((!result) && (counter > 1)) {
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl);
+    LOG(1, "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used.");
     result = true;
   }
@@ -362 +362 @@
 //  Vector BaseLineVector, OrthogonalVector, helper;
 //  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
-//    DoeLog(1) && (eLog()<< Verbose(1) << "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl);
+//    ELOG(1, "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << ".");
 //    //return false;
 //    exit(1);
@@ -393 +393 @@
 //  }
 //
-//  Log() << Verbose(1) << *candidate1->point << " has angle " << phi << endl;
-//  Log() << Verbose(1) << *candidate2->point << " has angle " << psi << endl;
+//  LOG(1, *candidate1->point << " has angle " << phi);
+//  LOG(1, *candidate2->point << " has angle " << psi);
 //
 //  // return comparison
@@ -421 +421 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
+  LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const TesselPointSTLList *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //LOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2]);
         if (List != NULL) {
           for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -441 +440 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << "." << endl;
+              //LOG(2, "INFO: New Second Nearest Neighbour is " << *secondClosestPoint << ".");
             }
           }
         } else {
-          DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
+          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
         }
       }
@@ -474 +473 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  DoLog(1) && (Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl);
+  LOG(1, "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << ".");
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const TesselPointSTLList *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //LOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2]);
         if (List != NULL) {
           for (TesselPointSTLList::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -492 +490 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
+              //LOG(1, "INFO: New Nearest Neighbour is " << *closestPoint << ".");
             } else if (currentNorm < secondDistance) {
               secondDistance = currentNorm;
               SecondPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
+              //LOG(1, "INFO: New Second Nearest Neighbour is " << *SecondPoint << ".");
             }
           }
         } else {
-          DoeLog(1) && (eLog() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!" << endl);
+          ELOG(1, "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << " is invalid!");
         }
       }
   // output
   if (closestPoint != NULL) {
-    DoLog(1) && (Log() << Verbose(1) << "Closest point is " << *closestPoint);
-    if (SecondPoint != NULL)
-      DoLog(0) && (Log() << Verbose(0) << " and second closest is " << *SecondPoint);
-    DoLog(0) && (Log() << Verbose(0) << "." << endl);
+    if (DoLog(1)) {
+      std::stringstream output;
+      output << "Closest point is " << *closestPoint;
+      if (SecondPoint != NULL)
+        output << " and second closest is " << *SecondPoint;
+      LOG(0, output.str() << ".");
+    }
   }
   return closestPoint;
@@ -528 +529 @@
   Normal.VectorProduct(OtherBaseline);
   Normal.Normalize();
-  DoLog(1) && (Log() << Verbose(1) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl);
+  LOG(1, "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << ".");
 
   // project one offset point of OtherBase onto this plane (and add plane offset vector)
@@ -542 +543 @@
   *Intersection = line1.getIntersection(line2);
   Normal = (*Intersection) - (Base->endpoints[0]->node->getPosition());
-  DoLog(1) && (Log() << Verbose(1) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << "." << endl);
+  LOG(1, "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << ".");
 
   return Intersection;
@@ -577 +578 @@
   Vector *center = cloud.GetCenter();
   if (vrmlfile != NULL) {
-    //Log() << Verbose(1) << "Writing Raster3D file ... ";
+    LOG(1, "INFO: Writing Raster3D file ... ");
     *vrmlfile << "#VRML V2.0 utf8" << endl;
     *vrmlfile << "#Created by molecuilder" << endl;
@@ -603 +604 @@
     }
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Given vrmlfile is " << vrmlfile << "." << endl);
+    ELOG(1, "Given vrmlfile is " << vrmlfile << ".");
   }
   delete(center);
@@ -649 +650 @@
   Vector *center = cloud.GetCenter();
   if (rasterfile != NULL) {
-    //Log() << Verbose(1) << "Writing Raster3D file ... ";
+    LOG(1, "INFO: Writing Raster3D file ... ");
     *rasterfile << "# Raster3D object description, created by MoleCuilder" << endl;
     *rasterfile << "@header.r3d" << endl;
@@ -681 +682 @@
     *rasterfile << "9\n#  terminating special property\n";
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Given rasterfile is " << rasterfile << "." << endl);
+    ELOG(1, "Given rasterfile is " << rasterfile << ".");
   }
   IncludeSphereinRaster3D(rasterfile, Tess, cloud);
@@ -734 +735 @@
     *tecplot << endl;
     // print connectivity
-    DoLog(1) && (Log() << Verbose(1) << "The following triangles were created:" << endl);
+    LOG(1, "The following triangles were created:");
     for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
-      DoLog(1) && (Log() << Verbose(1) << " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName() << endl);
+      LOG(1, " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName());
       *tecplot << LookupList[runner->second->endpoints[0]->node->getNr()] << " " << LookupList[runner->second->endpoints[1]->node->getNr()] << " " << LookupList[runner->second->endpoints[2]->node->getNr()] << endl;
     }
@@ -761 +762 @@
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
     point = PointRunner->second;
-    DoLog(1) && (Log() << Verbose(1) << "INFO: Current point is " << *point << "." << endl);
+    LOG(1, "INFO: Current point is " << *point << ".");
 
     // calculate mean concavity over all connected line
@@ -767 +768 @@
     for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
       line = LineRunner->second;
-      //Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+      //LOG(1, "INFO: Current line of point " << *point << " is " << *line << ".");
       ConcavityPerLine -= line->CalculateConvexity();
     }
@@ -815 +816 @@
 
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
-    DoeLog(1) && (eLog() << Verbose(1) << "INFO: Current point is " << * PointRunner->second << "." << endl);
+    ELOG(1, "INFO: Current point is " << * PointRunner->second << ".");
 
     distance = 0.;
@@ -840 +841 @@
   int counter = 0;
 
-  DoLog(1) && (Log() << Verbose(1) << "Check: List of Baselines with not two connected triangles:" << endl);
+  LOG(1, "Check: List of Baselines with not two connected triangles:");
   for (testline = TesselStruct->LinesOnBoundary.begin(); testline != TesselStruct->LinesOnBoundary.end(); testline++) {
     if (testline->second->triangles.size() != 2) {
-      DoLog(2) && (Log() << Verbose(2) << *testline->second << "\t" << testline->second->triangles.size() << endl);
+      LOG(2, *testline->second << "\t" << testline->second->triangles.size());
       counter++;
     }
   }
   if (counter == 0) {
-    DoLog(1) && (Log() << Verbose(1) << "None." << endl);
+    LOG(1, "None.");
     result = true;
   }
@@ -863 +864 @@
   // check number of endpoints in *P
   if (P->endpoints.size() != 4) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!" << endl);
+    ELOG(1, "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!");
     return 0;
   }
@@ -869 +870 @@
   // check number of triangles in *T
   if (T->size() < 2) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Not enough triangles to have pairs!" << endl);
+    ELOG(1, "Not enough triangles to have pairs!");
     return 0;
   }
 
-  DoLog(0) && (Log() << Verbose(0) << "Polygon is " << *P << endl);
+  LOG(0, "Polygon is " << *P);
   // create each pair, get the endpoints and check whether *P is contained.
   int counter = 0;
@@ -889 +890 @@
         const int size = PairTrianglenodes.endpoints.size();
         if (size == 4) {
-          DoLog(0) && (Log() << Verbose(0) << " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes << endl);
+          LOG(0, " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes);
           // now check
           if (PairTrianglenodes.ContainsPresentTupel(P)) {
             counter++;
-            DoLog(0) && (Log() << Verbose(0) << "  ACCEPT: Matches with " << *P << endl);
+            LOG(0, "  ACCEPT: Matches with " << *P);
           } else {
-            DoLog(0) && (Log() << Verbose(0) << "  REJECT: No match with " << *P << endl);
+            LOG(0, "  REJECT: No match with " << *P);
           }
         } else {
-          DoLog(0) && (Log() << Verbose(0) << "  REJECT: Less than four endpoints." << endl);
+          LOG(0, "  REJECT: Less than four endpoints.");
         }
       }
@@ -919 +920 @@
     if (P2->ContainsBoundaryPoint((*Runner))) {
       counter++;
-      DoLog(1) && (Log() << Verbose(1) << *(*Runner) << " of second polygon is found in the first one." << endl);
+      LOG(1, *(*Runner) << " of second polygon is found in the first one.");
       return true;
     }
@@ -937 +938 @@
     Tester = P1->endpoints.insert((*Runner));
     if (Tester.second)
-      DoLog(0) && (Log() << Verbose(0) << "Inserting endpoint " << *(*Runner) << " into first polygon." << endl);
+      LOG(0, "Inserting endpoint " << *(*Runner) << " into first polygon.");
   }
   P2->endpoints.clear();

src/Tesselation/triangleintersectionlist.cpp

@@ -141 +141 @@
   boost::scoped_ptr< DistanceToPointMap > points(Tess->FindClosestBoundaryPointsToVector(Point,Vicinity));
   if (points == NULL) {
-    DoeLog(1) && (eLog()<< Verbose(1) << "There is no nearest point: too far away from the surface." << endl);
+    ELOG(1, "There is no nearest point: too far away from the surface.");
     return;
   }
@@ -157 +157 @@
     Intersection = new Vector;
     (*TriangleRunner)->GetClosestPointInsideTriangle(Point, *Intersection);
-    //Log() << Verbose(1) << "Intersection between " << Point << " and " << **TriangleRunner << " is at " << *Intersection << "." << endl;
+    //LOG(1, "Intersection between " << Point << " and " << **TriangleRunner << " is at " << *Intersection << ".");
     IntersectionList.insert( pair<BoundaryTriangleSet *, Vector * > (*TriangleRunner, Intersection) );
   }
@@ -172 +172 @@
 
   //for (DistanceTriangleMap::const_iterator runner = DistanceList.begin(); runner != DistanceList.end(); runner++)
-  //  Log() << Verbose(1) << (*runner).first << " away from " << *(*runner).second << endl;
+  //  LOG(1, (*runner).first << " away from " << *(*runner).second);
 };
 

src/Tesselation/unittests/Tesselation_InsideOutsideUnitTest.cpp

@@ -110 +110 @@
   while ((!TesselStruct->OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
     // 2a. fill all new OpenLines
-    DoLog(1) && (Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for candidates:" << endl);
+    LOG(1, "There are " << TesselStruct->OpenLines.size() << " open lines to scan for candidates:");
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      DoLog(2) && (Log() << Verbose(2) << *(Runner->second) << endl);
+      LOG(2, *(Runner->second));
 
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
@@ -118 +118 @@
       if (baseline->pointlist.empty()) {
         T = (((baseline->BaseLine->triangles.begin()))->second);
-        DoLog(1) && (Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl);
+        LOG(1, "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T);
         TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList); //the line is there, so there is a triangle, but only one.
       }
@@ -125 +125 @@
     // 2b. search for smallest ShortestAngle among all candidates
     double ShortestAngle = 4.*M_PI;
-    DoLog(1) && (Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:" << endl);
+    LOG(1, "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:");
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      DoLog(2) && (Log() << Verbose(2) << *(Runner->second) << endl);
+      LOG(2, *(Runner->second));
 
     for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
@@ -133 +133 @@
         baseline = Runner->second;
         ShortestAngle = baseline->ShortestAngle;
-        //Log() << Verbose(1) << "New best candidate is " << *baseline->BaseLine << " with point " << *baseline->point << " and angle " << baseline->ShortestAngle << endl;
+        //LOG(1, "New best candidate is " << *baseline->BaseLine << " with point " << *baseline->point << " and angle " << baseline->ShortestAngle);
       }
     }