From d15bf4b8e1a1f755a9f3b998871ad583e20c0cc8 Mon Sep 17 00:00:00 2001
From: Michael Marshall <michael.marshall@ed.ac.uk>
Date: Fri, 25 Jan 2019 13:26:48 +0000
Subject: [PATCH] Added trajectory number to output file

---
 Hadrons/Modules/MDistil/Distil.hpp  |  1 +
 Hadrons/Modules/MDistil/LapEvec.hpp | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Hadrons/Modules/MDistil/Distil.hpp b/Hadrons/Modules/MDistil/Distil.hpp
index ec502544..a6e87d57 100644
--- a/Hadrons/Modules/MDistil/Distil.hpp
+++ b/Hadrons/Modules/MDistil/Distil.hpp
@@ -36,6 +36,7 @@
 
 /******************************************************************************
  This potentially belongs in CartesianCommunicator
+ Turns out I don't actually need this when running inside hadrons
  ******************************************************************************/
 
 BEGIN_MODULE_NAMESPACE(Grid)
diff --git a/Hadrons/Modules/MDistil/LapEvec.hpp b/Hadrons/Modules/MDistil/LapEvec.hpp
index 7496accf..1a0b2b00 100644
--- a/Hadrons/Modules/MDistil/LapEvec.hpp
+++ b/Hadrons/Modules/MDistil/LapEvec.hpp
@@ -315,6 +315,8 @@ void TLapEvec<FImpl>::execute(void)
   ////////////////////////////////////////////////////////////////////////
   
   std::string sEigenPackName(getName());
+  sEigenPackName.append("_");
+  sEigenPackName.append(std::to_string(vm().getTrajectory()));
   bool bReturnValue = true;
   auto & eig4d = envGet(DistilEP, getName() );
   envGetTmp(std::vector<DistilEP>, eig);   // Eigenpack for each timeslice
@@ -369,12 +371,14 @@ void TLapEvec<FImpl>::execute(void)
       // Now rotate the eigenvectors into our phase convention
       RotateEigen( eig[t].evec );
       
-      // Write the eigenvectors and eigenvalues to disk
-      //std::cout << GridLogMessage << "Writing eigenvalues/vectors to " << pszEigenPack << std::endl;
-      eig[t].record.operatorXml = DefaultOperatorXml;
-      eig[t].record.solverXml = DefaultsolverXml;
-      eig[t].write(sEigenPackName,false,t);
-      //std::cout << GridLogMessage << "Written eigenvectors" << std::endl;
+      if((1)) { // Debugging only
+        // Write the eigenvectors and eigenvalues to disk
+        //std::cout << GridLogMessage << "Writing eigenvalues/vectors to " << pszEigenPack << std::endl;
+        eig[t].record.operatorXml = DefaultOperatorXml;
+        eig[t].record.solverXml = DefaultsolverXml;
+        eig[t].write(sEigenPackName,false,t);
+        //std::cout << GridLogMessage << "Written eigenvectors" << std::endl;
+      }
     }
     for (int i=0;i<LPar.Nvec;i++){
       std::cout << "Inserting Timeslice " << t << " into vector " << i << std::endl;