Changes in src/analyzer.cpp [a67d19:717e0c]

File:

• src/analyzer.cpp (modified) (7 diffs)

src/analyzer.cpp

@@ -7 +7 @@
 
 //============================ INCLUDES ===========================
-
-#include <cstring>
 
 #include "datacreator.hpp"
@@ -63 +61 @@
   int counter = 0;
 
-  DoLog(0) && (Log() << Verbose(0) << "ANOVA Analyzer" << endl);
-  DoLog(0) && (Log() << Verbose(0) << "==============" << endl);
+  Log() << Verbose(0) << "ANOVA Analyzer" << endl;
+  Log() << Verbose(0) << "==============" << endl;
 
   // Get the command line options
   if (argc < 4) {
-    DoLog(0) && (Log() << Verbose(0) << "Usage: " << argv[0] << " <inputdir> <prefix> <outputdir> [elementsdb]" << endl);
-    DoLog(0) && (Log() << Verbose(0) << "<inputdir>\ttherein the output of a molecuilder fragmentation is expected, each fragment with a subdir containing an energy.all and a forces.all file." << endl);
-    DoLog(0) && (Log() << Verbose(0) << "<prefix>\tprefix of energy and forces file." << endl);
-    DoLog(0) && (Log() << Verbose(0) << "<outputdir>\tcreated plotfiles and datafiles are placed into this directory " << endl);
-    DoLog(0) && (Log() << Verbose(0) << "[elementsdb]\tpath to elements database, needed for shieldings." << endl);
+    Log() << Verbose(0) << "Usage: " << argv[0] << " <inputdir> <prefix> <outputdir> [elementsdb]" << endl;
+    Log() << Verbose(0) << "<inputdir>\ttherein the output of a molecuilder fragmentation is expected, each fragment with a subdir containing an energy.all and a forces.all file." << endl;
+    Log() << Verbose(0) << "<prefix>\tprefix of energy and forces file." << endl;
+    Log() << Verbose(0) << "<outputdir>\tcreated plotfiles and datafiles are placed into this directory " << endl;
+    Log() << Verbose(0) << "[elementsdb]\tpath to elements database, needed for shieldings." << endl;
     return 1;
   } else {
@@ -81 +79 @@
 
   if (argc > 4) {
-    DoLog(0) && (Log() << Verbose(0) << "Loading periodentafel." << endl);
+    Log() << Verbose(0) << "Loading periodentafel." << endl;
     periode = Malloc<periodentafel>(1, "main - periode");
     periode->LoadPeriodentafel(argv[4]);
@@ -96 +94 @@
   if (!Hcorrection.ParseFragmentMatrix(argv[1], "", HCORRECTIONSUFFIX,0,0)) {
     NoHCorrection = true;
-    DoeLog(2) && (eLog()<< Verbose(2) << "No HCorrection file found, skipping these." << endl);
+    eLog() << Verbose(2) << "No HCorrection file found, skipping these." << endl;
   }
   
@@ -102 +100 @@
   if (!Hessian.ParseFragmentMatrix(argv[1], dir, HessianSuffix,0,0)) {
     NoHessian = true;
-    DoeLog(2) && (eLog()<< Verbose(2) << "No Hessian file found, skipping these." << endl);
+    eLog() << Verbose(2) << "No Hessian file found, skipping these." << endl;
   }
   if (!Time.ParseFragmentMatrix(argv[1], dir, TimeSuffix, 10,1)) {
     NoTime = true;
-    DoeLog(2) && (eLog()<< Verbose(2) << "No speed file found, skipping these." << endl);
+    eLog() << Verbose(2) << "No speed file found, skipping these." << endl;
   }
   if (periode != NULL) { // also look for PAS values
@@ -248 +246 @@
   // +++++++++++++++ ANALYZING ++++++++++++++++++++++++++++++
 
-  DoLog(0) && (Log() << Verbose(0) << "Analyzing ..." << endl);
+  Log() << Verbose(0) << "Analyzing ..." << endl;
 
   // ======================================= Creating the data files ==============================================================
@@ -559 +557 @@
   delete(periode);
   Free(&dir);
-  DoLog(0) && (Log() << Verbose(0) << "done." << endl);
+  Log() << Verbose(0) << "done." << endl;
   return 0;
 };