From 6aa1b9c8efc5704ddd664887406ec9cdf33441f2 Mon Sep 17 00:00:00 2001
From: Bertram Kopf <bertram@pc14.ep1.rub.de>
Date: Thu, 23 Jun 2016 15:51:09 +0200
Subject: [PATCH] few modificatione in MatrixPiPiSWaveSimple4piPhp
---
Examples/Tutorial/LineShapes/Jamfile | 2 +-
.../TMatrixPiPiSWaveSimple4piPhp.cc | 22 +++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Examples/Tutorial/LineShapes/Jamfile b/Examples/Tutorial/LineShapes/Jamfile
index a09d3b8f..9a9a44de 100644
--- a/Examples/Tutorial/LineShapes/Jamfile
+++ b/Examples/Tutorial/LineShapes/Jamfile
@@ -1,7 +1,7 @@
alias install : install-bin install-lib ;
explicit install ;
-install install-bin : BwShapeApp FlatteShapeApp TwoPolesApp TMatrixGeneralApp
+install install-bin : BwShapeApp FlatteShapeApp TwoPolesApp TMatrixGeneralApp TMatrixPiPiSWaveSimple4piPhpApp
: <location>$(TOP)/bin
<install-dependencies>on
<install-type>EXE
diff --git a/Examples/Tutorial/LineShapes/TMatrixPiPiSWaveSimple4piPhp.cc b/Examples/Tutorial/LineShapes/TMatrixPiPiSWaveSimple4piPhp.cc
index e544fe2d..6c40230b 100644
--- a/Examples/Tutorial/LineShapes/TMatrixPiPiSWaveSimple4piPhp.cc
+++ b/Examples/Tutorial/LineShapes/TMatrixPiPiSWaveSimple4piPhp.cc
@@ -134,28 +134,28 @@ MatrixPiPiSWaveSimple4piPhp::MatrixPiPiSWaveSimple4piPhp(int numStepsForSheetSca
<< "\nenergyPlaneBorders 2:" << energyPlaneBorders[2]
<< "\nenergyPlaneBorders 3:" << energyPlaneBorders[3]
<< endmsg;
+ std::vector<std::shared_ptr<AbsPhaseSpace> > phpVecs=_tMatr->kMatrix()->phaseSpaceVec();
for (double mass=_massMin+_stepSize/0.5; mass<_massMax; mass+=_stepSize){
Vector4<double> mass4Vec(mass, 0.,0.,0.);
_tMatr->evalMatrix(mass);
-
for(unsigned int i=0; i<_gFactorNames.size(); ++i){
- // complex<double> currentRho=_phpVecs.at(i)->factor(mass);
+ complex<double> currentRho=phpVecs.at(i)->factor(mass);
- // _AmpRealH1Vec.at(i)->Fill(mass, sqrt(currentRho.real())*(*_tMatr)(i,i).real());
- // _AmpImagH1Vec.at(i)->Fill(mass, sqrt(currentRho.real())*(*_tMatr)(i,i).imag());
+ _AmpRealH1Vec.at(i)->Fill(mass, sqrt(currentRho.real())*(*_tMatr)(i,i).real());
+ _AmpImagH1Vec.at(i)->Fill(mass, sqrt(currentRho.real())*(*_tMatr)(i,i).imag());
- // _ArgandH2Vec.at(i)->Fill( currentRho.real()*(*_tMatr)(i,i).real(), currentRho.real()*(*_tMatr)(i,i).imag());
+ _ArgandH2Vec.at(i)->Fill( currentRho.real()*(*_tMatr)(i,i).real(), currentRho.real()*(*_tMatr)(i,i).imag());
double currentphase=360.*atan2((*_tMatr)(i,i).imag(),(*_tMatr)(i,i).real()) / 3.1415;
_PhaseH2Vec.at(i)->Fill(mass, currentphase);
- // double sqrtFactor=(*_tMatr)(i,i).real()*(*_tMatr)(i,i).real()+((*_tMatr)(i,i).imag()-0.5)*((*_tMatr)(i,i).imag()-0.5);
- // double currentElasticity=2.*sqrt(sqrtFactor);
- // complex<double> S00_rel=complex<double>(1.,0.)+2.*complex<double>(0.,1.)*currentRho.real()*(*_tMatr)(i,i);
- // _ElasticityH1Vec.at(i)->Fill(mass, sqrt(norm(S00_rel)));
+ double sqrtFactor=(*_tMatr)(i,i).real()*(*_tMatr)(i,i).real()+((*_tMatr)(i,i).imag()-0.5)*((*_tMatr)(i,i).imag()-0.5);
+ double currentElasticity=2.*sqrt(sqrtFactor);
+ complex<double> S00_rel=complex<double>(1.,0.)+2.*complex<double>(0.,1.)*currentRho.real()*(*_tMatr)(i,i);
+ _ElasticityH1Vec.at(i)->Fill(mass, sqrt(norm(S00_rel)));
- // _SqrT11H1Vec.at(i)->Fill(mass,currentRho.real()*norm((*_tMatr)(i,i)));
+ _SqrT11H1Vec.at(i)->Fill(mass,currentRho.real()*norm((*_tMatr)(i,i)));
- // _phpH1Vec.at(i)->Fill(mass, sqrt(norm(currentRho)));
+ _phpH1Vec.at(i)->Fill(mass, sqrt(norm(currentRho)));
}
}
--
GitLab