From 1982cc58dd5737e1649bfbcdc7d1c249544fa70f Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 21 Oct 2018 01:20:05 +0100 Subject: [PATCH] Hadrons: A2A vectors I/O filename fix --- Hadrons/A2AVectors.hpp | 4 ++-- Hadrons/Modules/MSolver/A2AVectors.hpp | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Hadrons/A2AVectors.hpp b/Hadrons/A2AVectors.hpp index ff32ff5e..f55eb6d7 100644 --- a/Hadrons/A2AVectors.hpp +++ b/Hadrons/A2AVectors.hpp @@ -263,7 +263,7 @@ void A2AVectorsIo::write(const std::string fileStem, std::vector &vec, Record record; GridBase *grid = vec[0]._grid; ScidacWriter binWriter(grid->IsBoss()); - std::string filename = vecFilename(fileStem, multiFile, trajectory); + std::string filename = vecFilename(fileStem, trajectory, multiFile); if (multiFile) { @@ -301,7 +301,7 @@ void A2AVectorsIo::read(std::vector &vec, const std::string fileStem, { Record record; ScidacReader binReader; - std::string filename = vecFilename(fileStem, multiFile, trajectory); + std::string filename = vecFilename(fileStem, trajectory, multiFile); if (multiFile) { diff --git a/Hadrons/Modules/MSolver/A2AVectors.hpp b/Hadrons/Modules/MSolver/A2AVectors.hpp index 47ae6aee..f9980ee3 100644 --- a/Hadrons/Modules/MSolver/A2AVectors.hpp +++ b/Hadrons/Modules/MSolver/A2AVectors.hpp @@ -242,8 +242,12 @@ void TA2AVectors::execute(void) // I/O if necessary if (!par().output.empty()) { - A2AVectorsIo::write(par().output + "_w", w, par().multiFile, vm().getTrajectory()); + startTimer("V I/O"); A2AVectorsIo::write(par().output + "_v", v, par().multiFile, vm().getTrajectory()); + stopTimer("V I/O"); + startTimer("W I/O"); + A2AVectorsIo::write(par().output + "_w", w, par().multiFile, vm().getTrajectory()); + stopTimer("W I/O"); } }