Skip to content
Snippets Groups Projects
Commit 504113aa authored by Bertram Kopf's avatar Bertram Kopf
Browse files

start parameter for Pi0Omega fit changed

parent ab1098dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Examples/pbarpToOmegaPi/MOmegaPiApp.cc
+ 6
− 6
View file @ 504113aa
......@@ -98,8 +98,8 @@ int main(int __argc,char *__argv[]){
std::vector<std::string> fileNames;
std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_0600.dat");
// std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_1940.dat");
// std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_0600.dat");
std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_1940.dat");
fileNames.push_back(piomegaDatFile);
CBElsaReader eventReader(fileNames, 3, 0);
......@@ -134,8 +134,8 @@ int main(int __argc,char *__argv[]){
std::vector<std::string> fileNamesMc;
std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_0600.dat");
// std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_1940.dat");
// std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_0600.dat");
std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_1940.dat");
fileNamesMc.push_back(piomegaMcFile);
CBElsaReader eventReaderMc(fileNamesMc, 3, 0);
......@@ -143,9 +143,9 @@ int main(int __argc,char *__argv[]){
eventReaderMc.fillAll(piOmegaEventsMc);
piOmegaEventsMc.rewind();
boost::shared_ptr<const OmegaPiEventList> theOmegaPiEventPtr(new OmegaPiEventList(piOmegaEventsData, piOmegaEventsMc, 3));
boost::shared_ptr<const OmegaPiEventList> theOmegaPiEventPtr(new OmegaPiEventList(piOmegaEventsData, piOmegaEventsMc, 5));
boost::shared_ptr<pbarpStates> pbarpStatesPtr(new pbarpStates(3));
boost::shared_ptr<pbarpStates> pbarpStatesPtr(new pbarpStates(5));
boost::shared_ptr<pbarpToOmegaPi0States> pbarpToOmegaPi0StatesPtr(new pbarpToOmegaPi0States(pbarpStatesPtr));
boost::shared_ptr<OmegaPiLh> theOmegaLhPtr(new OmegaPiLh(theOmegaPiEventPtr, pbarpToOmegaPi0StatesPtr));
......
Examples/pbarpToOmegaPi/MOmegaPiApp.cc~
+ 15
− 7
View file @ 504113aa
......@@ -98,8 +98,8 @@ int main(int __argc,char *__argv[]){
std::vector<std::string> fileNames;
// std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_0600.dat");
std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_1940.dat");
std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_0600.dat");
// std::string piomegaDatFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/510_1940.dat");
fileNames.push_back(piomegaDatFile);
CBElsaReader eventReader(fileNames, 3, 0);
......@@ -134,8 +134,8 @@ int main(int __argc,char *__argv[]){
std::vector<std::string> fileNamesMc;
// std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_0600.dat");
std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_1940.dat");
std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_0600.dat");
// std::string piomegaMcFile(theSourcePath+"/Examples/pbarpToOmegaPi/data/mc510_1940.dat");
fileNamesMc.push_back(piomegaMcFile);
CBElsaReader eventReaderMc(fileNamesMc, 3, 0);
......@@ -143,9 +143,9 @@ int main(int __argc,char *__argv[]){
eventReaderMc.fillAll(piOmegaEventsMc);
piOmegaEventsMc.rewind();
boost::shared_ptr<const OmegaPiEventList> theOmegaPiEventPtr(new OmegaPiEventList(piOmegaEventsData, piOmegaEventsMc, 5));
boost::shared_ptr<const OmegaPiEventList> theOmegaPiEventPtr(new OmegaPiEventList(piOmegaEventsData, piOmegaEventsMc, 3));
boost::shared_ptr<pbarpStates> pbarpStatesPtr(new pbarpStates(5));
boost::shared_ptr<pbarpStates> pbarpStatesPtr(new pbarpStates(3));
boost::shared_ptr<pbarpToOmegaPi0States> pbarpToOmegaPi0StatesPtr(new pbarpToOmegaPi0States(pbarpStatesPtr));
boost::shared_ptr<OmegaPiLh> theOmegaLhPtr(new OmegaPiLh(theOmegaPiEventPtr, pbarpToOmegaPi0StatesPtr));
......@@ -172,6 +172,14 @@ int main(int __argc,char *__argv[]){
min = migrad2();
}
MnUserParameters finalUsrParameters=min.UserParameters();
const std::vector<double> finalParamVec=finalUsrParameters.Params();
OmegaPiData::fitParamVal finalFitParams;
mOmegaPiFcn.setFitParamVal(finalFitParams, finalParamVec);
OmegaPiHist theHistogrammer(theOmegaLhPtr, finalFitParams);
// // now fill the fir parameter
// OmegaPiData::fitParamVal theFitParameter;
......@@ -225,7 +233,7 @@ int main(int __argc,char *__argv[]){
// std::cout <<"\t" << tmpParam.first <<"\t" << tmpParam.second << std::endl;
// }
OmegaPiHist theHistogrammer(theOmegaPiEventPtr);
// OmegaPiHist theHistogrammer(theOmegaPiEventPtr);
......
Examples/pbarpToOmegaPi/MOmegaPiFcn.cc
+ 7
− 7
View file @ 504113aa
......@@ -69,34 +69,34 @@ void MOmegaPiFcn::setMnUsrParams(MnUserParameters& upar){
std::vector< boost::shared_ptr<const JPCLS> >::const_iterator itJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > JPCLSOmegaSinglet=_barpToOmegaPi0States->jpclsSinglet();
double counter=0.;
int counter=0;
for ( itJPCLS=JPCLSOmegaSinglet.begin(); itJPCLS!=JPCLSOmegaSinglet.end(); ++itJPCLS){
//now fill the fitParameterMap
std::string magStr=(*itJPCLS)->name()+"S"+"mag";
std::string phiStr=(*itJPCLS)->name()+"S"+"phi";
upar.Add(magStr, 0.5, .1, -1., 1.);
upar.Add(magStr, 0.5, .1, -10., 10.);
if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
counter++;
}
std::vector< boost::shared_ptr<const JPCLS> > JPCLSOmegaTriplet0=_barpToOmegaPi0States->jpclsTriplet0();
counter=0.;
counter=0;
for ( itJPCLS=JPCLSOmegaTriplet0.begin(); itJPCLS!=JPCLSOmegaTriplet0.end(); ++itJPCLS){
//now fill the fitParameterMap
std::string magStr=(*itJPCLS)->name()+"T0"+"mag";
std::string phiStr=(*itJPCLS)->name()+"T0"+"phi";
upar.Add(magStr, 0.5, .1, -1., 1.);
upar.Add(magStr, 0.5, .1, -10., 10.);
if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
counter++;
}
std::vector< boost::shared_ptr<const JPCLS> > JPCLSOmegaTriplet1=_barpToOmegaPi0States->jpclsTriplet1();
counter=0.;
counter=0;
for ( itJPCLS=JPCLSOmegaTriplet1.begin(); itJPCLS!=JPCLSOmegaTriplet1.end(); ++itJPCLS){
//now fill the fitParameterMap
std::string magStr=(*itJPCLS)->name()+"T1"+"mag";
std::string phiStr=(*itJPCLS)->name()+"T1"+"phi";
upar.Add(magStr, 0.5, .1, -1., 1.);
upar.Add(magStr, 0.5, .1, -10., 10.);
if (counter>0) upar.Add(phiStr, 0., .1, -M_PI, M_PI);
counter++;
}
......@@ -114,7 +114,7 @@ void MOmegaPiFcn::setFitParamVal(OmegaPiData::fitParamVal& theParamVal, const st
if (par.size()!= JPCLSOmegaSinglet.size()*2+JPCLSOmegaTriplet0.size()*2+JPCLSOmegaTriplet1.size()*2-3) ErrMsg(fatal) << "size of parameters wrong!!! par.size()=" << par.size() << "\tJPCLSOmegaSinglet.size()+JPCLSOmegaTriplet0.size()+JPCLSOmegaTriplet1.size()-3=" << JPCLSOmegaSinglet.size()*2+JPCLSOmegaTriplet0.size()*2+JPCLSOmegaTriplet1.size()*2-3 << endmsg;
double counter=0.;
int counter=0;
for ( itJPCLS=JPCLSOmegaSinglet.begin(); itJPCLS!=JPCLSOmegaSinglet.end(); ++itJPCLS){
//now fill the fitParameterMap
double mag=par[counter];
......
Examples/pbarpToOmegaPi/OmegaPiLh.cc
+ 1
− 0
View file @ 504113aa
......@@ -90,6 +90,7 @@ complex<double> OmegaPiLh::calcCoherentAmp(Spin lamgamma, Spin Minit, std::map<
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess >::iterator it;
for ( it=fitParm.begin(); it!=fitParm.end(); ++it){
boost::shared_ptr<const JPCLS> theJPCLS=it->first;
if (fabs(lamomega)>theJPCLS->J) continue;
double theMag=it->second.first;
double thePhi=it->second.second;
complex<double> expiphi(cos(thePhi), sin(thePhi));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment