From 7d7220cbd72278050a1cfda6a083a87b85fecbca Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 27 Jun 2017 14:38:45 +0100
Subject: [PATCH] scalar: lambda/4! convention

---
 lib/qcd/action/scalar/ScalarInteractionAction.h | 4 ++--
 tests/hmc/Test_hmc_ScalarActionNxN.cc           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/qcd/action/scalar/ScalarInteractionAction.h b/lib/qcd/action/scalar/ScalarInteractionAction.h
index 1ff8fd37..ac2d4fbb 100644
--- a/lib/qcd/action/scalar/ScalarInteractionAction.h
+++ b/lib/qcd/action/scalar/ScalarInteractionAction.h
@@ -81,7 +81,7 @@ namespace Grid {
       phiStencil.HaloExchange(p, compressor);
       Field action(p._grid), pshift(p._grid), phisquared(p._grid);
       phisquared = p*p;
-      action = (2.0*Ndim + mass_square)*phisquared + lambda*phisquared*phisquared;
+      action = (2.0*Ndim + mass_square)*phisquared + lambda/24.*phisquared*phisquared;
       for (int mu = 0; mu < Ndim; mu++) {
 	//  pshift = Cshift(p, mu, +1);  // not efficient, implement with stencils
 	parallel_for (int i = 0; i < p._grid->oSites(); i++) {
@@ -113,7 +113,7 @@ namespace Grid {
 
     virtual void deriv(const Field &p, Field &force) {
       assert(p._grid->Nd() == Ndim);
-      force = (2.0*Ndim + mass_square)*p + 2.0*lambda*p*p*p;
+      force = (2.0*Ndim + mass_square)*p + lambda/12.*p*p*p;
       // move this outside
       static Stencil phiStencil(p._grid, npoint, 0, directions, displacements);
       phiStencil.HaloExchange(p, compressor);
diff --git a/tests/hmc/Test_hmc_ScalarActionNxN.cc b/tests/hmc/Test_hmc_ScalarActionNxN.cc
index a7490f51..a4dad1a3 100644
--- a/tests/hmc/Test_hmc_ScalarActionNxN.cc
+++ b/tests/hmc/Test_hmc_ScalarActionNxN.cc
@@ -45,7 +45,7 @@ using namespace Grid;
 using namespace Grid::QCD;
 
 template <class Impl>
-class MagLogger : public HmcObservable<typename Impl::Field> {
+class MagMeas : public HmcObservable<typename Impl::Field> {
 public:
   typedef typename Impl::Field Field;
   typedef typename Impl::Simd::scalar_type Trace;
@@ -72,13 +72,13 @@ private:
 };
 
 template <class Impl>
-class MagMod: public ObservableModule<MagLogger<Impl>, NoParameters>{
-  typedef ObservableModule<MagLogger<Impl>, NoParameters> ObsBase;
+class MagMod: public ObservableModule<MagMeas<Impl>, NoParameters>{
+  typedef ObservableModule<MagMeas<Impl>, NoParameters> ObsBase;
   using ObsBase::ObsBase; // for constructors
   
   // acquire resource
   virtual void initialize(){
-    this->ObservablePtr.reset(new MagLogger<Impl>());
+    this->ObservablePtr.reset(new MagMeas<Impl>());
   }
 public:
   MagMod(): ObsBase(NoParameters()){}