From afbf7d4c37df8f134aa6bb191d1fd29d1709b16e Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 29 Dec 2016 22:43:38 +0100
Subject: [PATCH] QED Gimpl moved in Photon.h

---
 extras/Hadrons/Modules/MGauge/StochEm.hpp | 21 ---------------------
 extras/qed-fvol/qed-fvol.cc               | 22 ----------------------
 lib/qcd/action/gauge/Photon.h             | 22 +++++++++++++++++++++-
 3 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/extras/Hadrons/Modules/MGauge/StochEm.hpp b/extras/Hadrons/Modules/MGauge/StochEm.hpp
index 04a7c48c..50a77435 100644
--- a/extras/Hadrons/Modules/MGauge/StochEm.hpp
+++ b/extras/Hadrons/Modules/MGauge/StochEm.hpp
@@ -39,27 +39,6 @@ BEGIN_HADRONS_NAMESPACE
  ******************************************************************************/
 BEGIN_MODULE_NAMESPACE(MGauge)
 
-template <class S>
-class QedGimpl
-{
-public:
-    typedef S Simd;
-    
-    template <typename vtype>
-    using iImplGaugeLink  = iScalar<iScalar<iScalar<vtype>>>;
-    template <typename vtype>
-    using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>;
-    
-    typedef iImplGaugeLink<Simd> SiteGaugeLink;
-    typedef iImplGaugeField<Simd> SiteGaugeField;
-    
-    typedef Lattice<SiteGaugeLink> GaugeLinkField;
-    typedef Lattice<SiteGaugeField> GaugeField;
-};
-
-typedef QedGimpl<vComplex> QedGimplR;
-typedef Photon<QedGimplR>  PhotonR;
-
 class StochEmPar: Serializable
 {
 public:
diff --git a/extras/qed-fvol/qed-fvol.cc b/extras/qed-fvol/qed-fvol.cc
index 951c36ad..3ecac2fc 100644
--- a/extras/qed-fvol/qed-fvol.cc
+++ b/extras/qed-fvol/qed-fvol.cc
@@ -5,29 +5,7 @@ using namespace Grid;
 using namespace QCD;
 using namespace QedFVol;
 
-template <class S> 
-class QedGimpl 
-{
-public:
-  typedef S Simd;
-
-  template <typename vtype>
-  using iImplGaugeLink  = iScalar<iScalar<iScalar<vtype>>>;
-  template <typename vtype>
-  using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>;
-
-  typedef iImplGaugeLink<Simd> SiteGaugeLink;
-  typedef iImplGaugeField<Simd> SiteGaugeField;
-
-  typedef Lattice<SiteGaugeLink> GaugeLinkField; // bit ugly naming; polarised
-                                                 // gauge field, lorentz... all
-                                                 // ugly
-  typedef Lattice<SiteGaugeField> GaugeField;
-};
-
-typedef QedGimpl<vComplex>              QedGimplR;
 typedef PeriodicGaugeImpl<QedGimplR>    QedPeriodicGimplR;
-typedef Photon<QedGimplR>               PhotonR;
 typedef PhotonR::GaugeField             EmField;
 typedef PhotonR::GaugeLinkField         EmComp;
 
diff --git a/lib/qcd/action/gauge/Photon.h b/lib/qcd/action/gauge/Photon.h
index faa63b42..73405297 100644
--- a/lib/qcd/action/gauge/Photon.h
+++ b/lib/qcd/action/gauge/Photon.h
@@ -28,9 +28,27 @@
 #ifndef QCD_PHOTON_ACTION_H
 #define QCD_PHOTON_ACTION_H
 
-
 namespace Grid{
 namespace QCD{
+  template <class S>
+  class QedGimpl
+  {
+  public:
+    typedef S Simd;
+    
+    template <typename vtype>
+    using iImplGaugeLink  = iScalar<iScalar<iScalar<vtype>>>;
+    template <typename vtype>
+    using iImplGaugeField = iVector<iScalar<iScalar<vtype>>, Nd>;
+    
+    typedef iImplGaugeLink<Simd> SiteGaugeLink;
+    typedef iImplGaugeField<Simd> SiteGaugeField;
+    
+    typedef Lattice<SiteGaugeLink> GaugeLinkField;
+    typedef Lattice<SiteGaugeField> GaugeField;
+  };
+  
+  typedef QedGimpl<vComplex> QedGimplR;
   
   template<class Gimpl>
   class Photon
@@ -56,6 +74,8 @@ namespace QCD{
     ZmScheme zmScheme_;
   };
 
+  typedef Photon<QedGimplR>  PhotonR;
+  
   template<class Gimpl>
   Photon<Gimpl>::Photon(Gauge gauge, ZmScheme zmScheme)
   : gauge_(gauge), zmScheme_(zmScheme)