Added new correlator observables.

diff --git a/u1casc-ordinary/obs_corrphichimass.hpp b/u1casc-ordinary/obs_corrphichimass.hpp
new file mode 100644 (file)
index 0000000..45880c1
--- /dev/null
+++ b/u1casc-ordinary/obs_corrphichimass.hpp
@@ -0,0 +1,147 @@
+#ifndef OBS_CORRPHICHIMASS_HPP
+#define OBS_CORRPHICHIMASS_HPP
+
+#include "latlib/o815/o815.h"
+
+#include "latlib/writeout.h"
+
+#include "latlib/obstat.hpp"
+
+#include <iostream>
+#include <complex>
+
+#include <cmath>
+
+#define U1 0
+#define U2 1
+#define F1 2
+#define F2 3
+
+using namespace std;
+
+class obs_corrphichimass : public o815::obs {
+
+public:
+  obs_corrphichimass(o815 *_O815);
+  
+private:
+  void _start();
+  void _meas(bool loadedobs, const int& nthmeas);
+  void _finish();
+
+  void corrCompute();
+  static complex<double> effMass(vector < complex<double> > *preCalculated, vector< complex<double> > *excludedMeas, int nmeas, void *para);
+  static void preEffMass(vector< vector < complex<double> > > *allVals, vector < complex<double> > *preCalculated, void *para);
+
+  sim *Sim;
+  obstat< complex<double>, complex<double>  > oC;
+
+  int spatialV;
+
+  complex<double> *OM;
+};
+
+obs_corrphichimass::obs_corrphichimass(o815 *_O815) : o815::obs("corrphichimass", 
+                                                                 _O815->paraQ->getParaNames() + 
+                                                                 "tsep"
+                                                                 ":phichi_effmass:phichi_effmass_err", 
+                                                                 _O815, sizeof(complex<double>)*(_O815->comargs.lsize[1]/2+1) ) {
+  
+  OM  = (complex<double>*)(obsMem);
+  
+  Sim = (sim*)O815->Sim;
+  spatialV = O815->comargs.lsize[0] * O815->comargs.lsize[0] * O815->comargs.lsize[0];
+}
+
+void obs_corrphichimass::_start() {
+  //*out << "OBS_test: start" << endl;
+};
+
+void obs_corrphichimass::_meas(bool loadedobs, const int& nthmeas) {
+  if (!loadedobs)
+    corrCompute();
+
+  oC.addMeas( OM, O815->comargs.lsize[1]/2+1 );
+};
+
+void obs_corrphichimass::_finish() {
+  int compid_corr[O815->comargs.lsize[1]/2][4];
+  int compid_effmass[O815->comargs.lsize[1]/2-1][4];
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2; itsep++)
+    compid_corr[itsep][U1] = oC.computeEasy(itsep);
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2-1; itsep++) {
+    pair<int,int> effmasspass( itsep, O815->comargs.lsize[1]/2 );
+    compid_effmass[itsep][U1] = oC.computeJack(obs_corrphichimass::preEffMass, obs_corrphichimass::effMass, &effmasspass);
+  }
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2-1; itsep++) {
+    *out << O815->paraQ->getParaVals();
+    *out << "\t" << itsep;
+    
+    *out << "\t" << real( oC.getMean(compid_effmass[itsep][U1]) )
+        << "\t" << real( oC.getErr (compid_effmass[itsep][U1]) );
+    
+    *out << endl;
+  }
+
+  oC.reset();
+};
+
+void obs_corrphichimass::corrCompute()
+{
+  complex<double> phislice[O815->comargs.lsize[1]];
+  
+  OM[O815->comargs.lsize[1]/2] = 0;
+
+  for (int it = 0; it < O815->comargs.lsize[1]; it++) {
+    phislice[it] = 0;
+    
+    for (int ix = 0; ix < spatialV; ix++)
+      phislice[it] += Sim->phi[ 0*Sim->lsize4 + it*spatialV + ix ] * Sim->phi[ 1*Sim->lsize4 + it*spatialV + ix ];
+      //phislice[it] += conj(Sim->phi[ 0*Sim->lsize4 + it*spatialV + ix ]) * Sim->phi[ 1*Sim->lsize4 + it*spatialV + ix ];
+  
+    phislice[it] /= spatialV;
+
+    OM[O815->comargs.lsize[1]/2] += phislice[it];
+  }
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2; itsep++) {
+    OM[itsep] = 0;
+
+    for (int it = 0; it < O815->comargs.lsize[1]; it++)
+      OM[itsep] += phislice[ (it+itsep)%O815->comargs.lsize[1] ] * conj( phislice[it] );
+      
+    OM[itsep] /= O815->comargs.lsize[1];
+  }
+
+  OM[O815->comargs.lsize[1]/2] /= O815->comargs.lsize[1];
+}
+
+void obs_corrphichimass::preEffMass(vector< vector < complex<double> > > *allVals, vector < complex<double> > *preCalculated, void *para) {
+  pair<int,int> *myparas = (pair<int,int>*)para;
+  
+  preCalculated->push_back(0);
+  preCalculated->push_back(0);
+  preCalculated->push_back(0);
+
+  for(vector< vector< complex<double> > >::iterator valIt = allVals->begin(); valIt != allVals->end(); ++valIt) {
+    (*preCalculated)[0] += (*valIt)[myparas->first];
+    (*preCalculated)[1] += (*valIt)[myparas->first+1];
+    (*preCalculated)[2] += (*valIt)[myparas->second];
+  }
+}
+
+complex<double> obs_corrphichimass::effMass(vector < complex<double> > *preCalculated, vector< complex<double> > *excludedMeas, int nmeas, void *para) {
+  pair<int,int> *myparas = (pair<int,int>*)para;
+
+  double disconnected = norm( ( (*preCalculated)[2] - (*excludedMeas)[myparas->second] ) / (complex<double>)(nmeas-1) );
+  
+  return std::log( abs( 
+                      ( ( (*preCalculated)[0] - (*excludedMeas)[myparas->first] ) / (complex<double>)(nmeas-1) - disconnected ) / 
+                      ( ( (*preCalculated)[1] - (*excludedMeas)[myparas->first+1] ) / (complex<double>)(nmeas-1) - disconnected ) 
+                       ) );
+}
+
+#endif

diff --git a/u1casc-ordinary/obs_corrphiphimass.hpp b/u1casc-ordinary/obs_corrphiphimass.hpp
new file mode 100644 (file)
index 0000000..1a70e95
--- /dev/null
+++ b/u1casc-ordinary/obs_corrphiphimass.hpp
@@ -0,0 +1,164 @@
+#ifndef OBS_CORRPHIPHIMASS_HPP
+#define OBS_CORRPHIPHIMASS_HPP
+
+#include "latlib/o815/o815.h"
+
+#include "latlib/writeout.h"
+
+#include "latlib/obstat.hpp"
+
+#include <iostream>
+#include <complex>
+
+#include <cmath>
+
+#define U1 0
+#define U2 1
+#define F1 2
+#define F2 3
+
+using namespace std;
+
+class obs_corrphiphimass : public o815::obs {
+
+public:
+  obs_corrphiphimass(o815 *_O815);
+  
+private:
+  void _start();
+  void _meas(bool loadedobs, const int& nthmeas);
+  void _finish();
+
+  void corrCompute();
+  static complex<double> effMass(vector < complex<double> > *preCalculated, vector< complex<double> > *excludedMeas, int nmeas, void *para);
+  static void preEffMass(vector< vector < complex<double> > > *allVals, vector < complex<double> > *preCalculated, void *para);
+
+  sim *Sim;
+  obstat< complex<double>, complex<double>  > oC;
+
+  int spatialV;
+
+  complex<double> *OM[4];
+};
+
+obs_corrphiphimass::obs_corrphiphimass(o815 *_O815) : o815::obs("corr", 
+                                                                 _O815->paraQ->getParaNames() + 
+                                                                 "tsep"
+                                                                 ":u1_effmass:u1_effmass_err", 
+                                                                 _O815, 4*sizeof(complex<double>)*(_O815->comargs.lsize[1]/2+1) ) {
+
+  for (int ivar = 0; ivar<4; ivar++)
+    OM[ivar]  = (complex<double>*)( obsMem + ivar*sizeof(complex<double>)*( _O815->comargs.lsize[1]/2 + 1 ) );
+  
+  Sim = (sim*)O815->Sim;
+  spatialV = O815->comargs.lsize[0] * O815->comargs.lsize[0] * O815->comargs.lsize[0];
+}
+
+void obs_corrphiphimass::_start() {
+  //*out << "OBS_test: start" << endl;
+};
+
+void obs_corrphiphimass::_meas(bool loadedobs, const int& nthmeas) {
+  if (!loadedobs)
+    corrCompute();
+
+  oC.addMeas( OM[U1], O815->comargs.lsize[1]/2+1 );
+};
+
+void obs_corrphiphimass::_finish() {
+  int compid_corr[O815->comargs.lsize[1]/2][4];
+  int compid_effmass[O815->comargs.lsize[1]/2-1][4];
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2; itsep++)
+    compid_corr[itsep][U1] = oC.computeEasy(itsep);
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2-1; itsep++) {
+    pair<int,int> effmasspass( itsep, O815->comargs.lsize[1]/2 );
+    compid_effmass[itsep][U1] = oC.computeJack(obs_corrphiphimass::preEffMass, obs_corrphiphimass::effMass, &effmasspass);
+  }
+
+  for (int itsep = 0; itsep < O815->comargs.lsize[1]/2-1; itsep++) {
+    *out << O815->paraQ->getParaVals();
+    *out << "\t" << itsep;
+    
+    *out << "\t" << real( oC.getMean(compid_effmass[itsep][U1]) )
+        << "\t" << real( oC.getErr (compid_effmass[itsep][U1]) );
+    
+    *out << endl;
+  }
+
+  oC.reset();
+};
+
+void obs_corrphiphimass::corrCompute()
+{
+  complex<double> phislice[4][O815->comargs.lsize[1]];
+  
+  OM[U1][O815->comargs.lsize[1]/2] = 0;
+  OM[U2][O815->comargs.lsize[1]/2] = 0;
+  OM[F1][O815->comargs.lsize[1]/2] = 0;
+  OM[F2][O815->comargs.lsize[1]/2] = 0;
+
+  for (int it = 0; it < O815->comargs.lsize[1]; it++) {
+    phislice[U1][it] = 0;
+    phislice[U2][it] = 0;
+    phislice[F1][it] = 0;
+    phislice[F2][it] = 0;
+    
+    for (int ix = 0; ix < spatialV; ix++) {
+      phislice[U1][it] += conj(Sim->phi[ 0*Sim->lsize4 + it*spatialV + ix ]) * Sim->phi[ 0*Sim->lsize4 + it*spatialV + ix ];
+      phislice[U2][it] += conj(Sim->phi[ 1*Sim->lsize4 + it*spatialV + ix ]) * Sim->phi[ 1*Sim->lsize4 + it*spatialV + ix ];
+      phislice[F1][it] += Sim->phi[ 0*Sim->lsize4 + it*spatialV + ix ];
+      phislice[F2][it] += Sim->phi[ 1*Sim->lsize4 + it*spatialV + ix ];
+    }
+    phislice[U1][it] /= spatialV;
+    phislice[U2][it] /= spatialV;
+    phislice[F1][it] /= spatialV;
+    phislice[F2][it] /= spatialV;
+
+    OM[U1][O815->comargs.lsize[1]/2] += phislice[U1][it];
+    OM[U2][O815->comargs.lsize[1]/2] += phislice[U2][it];
+    OM[F1][O815->comargs.lsize[1]/2] += phislice[F1][it];
+    OM[F2][O815->comargs.lsize[1]/2] += phislice[F2][it];
+  }
+
+  for (int icorr = 0; icorr < 4; icorr++) {
+    for (int itsep = 0; itsep < O815->comargs.lsize[1]/2; itsep++) {
+      OM[icorr][itsep] = 0;
+
+      for (int it = 0; it < O815->comargs.lsize[1]; it++)
+       OM[icorr][itsep] += phislice[icorr][ (it+itsep)%O815->comargs.lsize[1] ] * conj( phislice[icorr][it] );
+      
+      OM[icorr][itsep] /= O815->comargs.lsize[1];
+    }
+
+    OM[icorr][O815->comargs.lsize[1]/2] /= O815->comargs.lsize[1];
+  }
+}
+
+void obs_corrphiphimass::preEffMass(vector< vector < complex<double> > > *allVals, vector < complex<double> > *preCalculated, void *para) {
+  pair<int,int> *myparas = (pair<int,int>*)para;
+  
+  preCalculated->push_back(0);
+  preCalculated->push_back(0);
+  preCalculated->push_back(0);
+
+  for(vector< vector< complex<double> > >::iterator valIt = allVals->begin(); valIt != allVals->end(); ++valIt) {
+    (*preCalculated)[0] += (*valIt)[myparas->first];
+    (*preCalculated)[1] += (*valIt)[myparas->first+1];
+    (*preCalculated)[2] += (*valIt)[myparas->second];
+  }
+}
+
+complex<double> obs_corrphiphimass::effMass(vector < complex<double> > *preCalculated, vector< complex<double> > *excludedMeas, int nmeas, void *para) {
+  pair<int,int> *myparas = (pair<int,int>*)para;
+
+  double disconnected = norm( ( (*preCalculated)[2] - (*excludedMeas)[myparas->second] ) / (complex<double>)(nmeas-1) );
+  
+  return std::log( abs( 
+                      ( ( (*preCalculated)[0] - (*excludedMeas)[myparas->first] ) / (complex<double>)(nmeas-1) - disconnected ) / 
+                      ( ( (*preCalculated)[1] - (*excludedMeas)[myparas->first+1] ) / (complex<double>)(nmeas-1) - disconnected ) 
+                       ) );
+}
+
+#endif

diff --git a/u1casc-ordinary/u1casc-ordinary.cpp b/u1casc-ordinary/u1casc-ordinary.cpp
index 63ef33b6dd09d53d4aa16409ce701f046600f00b..7aed52dcd042453eb87f33dde91697974513beff 100644 (file)
--- a/u1casc-ordinary/u1casc-ordinary.cpp
+++ b/u1casc-ordinary/u1casc-ordinary.cpp
@@ -13,6 +13,8 @@ sim *Sim;
 #include "obs_phi2.hpp"
 #include "obs_plaq.hpp"
 #include "obs_corr.hpp"
+#include "obs_corrphiphimass.hpp"
+#include "obs_corrphichimass.hpp"
 
 o815::comoption specOps[] = {
   { "kappaone", required_argument, NULL, 'r', "set inverse mass kappa_1", "min:max:inc" },
@@ -75,6 +77,14 @@ void parseLonelyArgs()
       *O815->out->log << "MASTER: registered observable: corr" << endl << flush;
       O815->observables.push_back(new obs_corr(O815));
     }
+    else if ( strcmp(*lonit, "corrphiphimass") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: corr_phiphimass" << endl << flush;
+      O815->observables.push_back(new obs_corrphiphimass(O815));
+    }
+    else if ( strcmp(*lonit, "corrphichimass") == 0 ) {
+      *O815->out->log << "MASTER: registered observable: corr_phichimass" << endl << flush;
+      O815->observables.push_back(new obs_corrphichimass(O815));
+    }
   }
 }