diff --git a/Examples/JpsiToOmegaPhiGam/ConfigFiles/JpsiToOmegaPhiDefault.cfg b/Examples/JpsiToOmegaPhiGam/ConfigFiles/JpsiToOmegaPhiDefault.cfg index 1f6025648ac40c12a879e64075effe1c8c539cb9..2246fba5255afba99cae4bfb8187cece9c842729 100644 --- a/Examples/JpsiToOmegaPhiGam/ConfigFiles/JpsiToOmegaPhiDefault.cfg +++ b/Examples/JpsiToOmegaPhiGam/ConfigFiles/JpsiToOmegaPhiDefault.cfg @@ -9,7 +9,7 @@ noOfThreads = 32 #errLogMode = trace datFile = /data/liema/pascal/bes/marc/FS4Vectors-JpsiGamPhiOm_daten.dat -mcFile = /data/liema/pascal/bes/marc/FS4Vectors-JpsiGamPhiOm_daten.dat +mcFile = /data/liema/pascal/bes/marc/FS4Vectors-JpsiGamPhiOm1G.dat ratioMcToData = 10 useEventWeight = false diff --git a/Examples/JpsiToOmegaPhiGam/JpsiGamKsKlKK.root b/Examples/JpsiToOmegaPhiGam/JpsiGamKsKlKK.root deleted file mode 100644 index f226f824e0fef3dce3da1be0ad9a9f02fc068c3d..0000000000000000000000000000000000000000 Binary files a/Examples/JpsiToOmegaPhiGam/JpsiGamKsKlKK.root and /dev/null differ diff --git a/Examples/JpsiToOmegaPhiGam/JpsiGamPipPimPi0KK.root b/Examples/JpsiToOmegaPhiGam/JpsiGamPipPimPi0KK.root index db3b2dfdc1131b427c3a8641f8cdce5cb58620cd..33c4ff0a6b88d32079beab5499a2720fe5014c6b 100644 Binary files a/Examples/JpsiToOmegaPhiGam/JpsiGamPipPimPi0KK.root and b/Examples/JpsiToOmegaPhiGam/JpsiGamPipPimPi0KK.root differ diff --git a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.cc b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.cc index 4a3de2cfe59b96deb8c22b6f9c958097e088142b..e7522fe6fd86875b48600fbf74a76f3b031dfa09 100644 --- a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.cc +++ b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.cc @@ -41,7 +41,10 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<const EvtDataBase _phiPhi_OmegaPhiHeliFittedHist(0), _chiDataHist(0), _chiMcHist(0), - _chiFittedHist(0), + _chiFittedHist(0), + _lambdaDataHist(0), + _lambdaMcHist(0), + _lambdaFittedHist(0), _dataTuple(0), _mcTuple(0), _massIndepTuple(0), @@ -68,7 +71,8 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<const EvtDataBase plotCostPhiKp( _costKp_KpKmHeliDataHist, _phiKp_KpKmHeliDataHist, (*it), evtWeight ); plotCostGam( _costGamCmDataHist, (*it), evtWeight ); plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliDataHist, _phiPhi_OmegaPhiHeliDataHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], evtWeight); - plotChi(_chiDataHist, (*it), evtWeight ); + plotLambda(_lambdaDataHist, (*it), evtWeight); + plotChi(_chiDataHist, (*it), evtWeight ); fillTuple(_dataTuple, (*it), evtWeight); ++it; @@ -85,7 +89,8 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<const EvtDataBase plotCostPhiPip( _costPip_PipPimPi0HeliMcHist, _phiPip_PipPimPi0HeliMcHist, (*it), 1. ); plotCostPhiKp( _costKp_KpKmHeliMcHist, _phiKp_KpKmHeliMcHist,(*it), 1. ); plotCostGam( _costGamCmMcHist,(*it), 1. ); - plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliMcHist, _phiPhi_OmegaPhiHeliMcHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], 1.); + plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliMcHist, _phiPhi_OmegaPhiHeliMcHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], 1.); + plotLambda(_lambdaMcHist, (*it), 1.); plotChi(_chiMcHist, (*it), 1. ); // double evtWeight= _theJpsiGamPipPimPi0KKLh->calcEvtIntensity((*it), _fitParam); @@ -98,6 +103,7 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<const EvtDataBase plotCostPhiKp( _costKp_KpKmHeliFittedHist, _phiKp_KpKmHeliFittedHist,(*it), evtWeight ); plotCostGam( _costGamCmFittedHist,(*it), evtWeight ); plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliFittedHist, _phiPhi_OmegaPhiHeliFittedHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], evtWeight); + plotLambda(_lambdaFittedHist, (*it), evtWeight); plotChi(_chiFittedHist, (*it), evtWeight ); fillTuple(_mcTuple, (*it), evtWeight); @@ -129,6 +135,8 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<const EvtDataBase _costPhi_OmegaPhiHeliFittedHist->Scale(scaleFactor); _phiPhi_OmegaPhiHeliFittedHist->Scale(scaleFactor); _chiFittedHist->Scale(scaleFactor); + _lambdaFittedHist->Scale(scaleFactor); + } @@ -155,7 +163,10 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, _phiPhi_OmegaPhiHeliFittedHist(0), _chiDataHist(0), _chiMcHist(0), - _chiFittedHist(0), + _chiFittedHist(0), + _lambdaDataHist(0), + _lambdaMcHist(0), + _lambdaFittedHist(0), _dataTuple(0), _mcTuple(0), _massIndepTuple(0), @@ -181,7 +192,8 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, plotCostPhiPip( _costPip_PipPimPi0HeliDataHist, _phiPip_PipPimPi0HeliDataHist, (*it), evtWeight ); plotCostPhiKp( _costKp_KpKmHeliDataHist, _phiKp_KpKmHeliDataHist, (*it), evtWeight ); plotCostGam( _costGamCmDataHist, (*it), evtWeight ); - plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliDataHist, _phiPhi_OmegaPhiHeliDataHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], evtWeight); + plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliDataHist, _phiPhi_OmegaPhiHeliDataHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], evtWeight); + plotLambda(_lambdaDataHist, (*it), evtWeight); plotChi(_chiDataHist, (*it), evtWeight ); fillTuple(_dataTuple, (*it), evtWeight); @@ -200,6 +212,7 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, plotCostPhiKp( _costKp_KpKmHeliMcHist, _phiKp_KpKmHeliMcHist,(*it), 1. ); plotCostGam( _costGamCmMcHist,(*it), 1. ); plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliMcHist, _phiPhi_OmegaPhiHeliMcHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], 1.); + plotLambda(_lambdaMcHist, (*it), 1.); plotChi(_chiMcHist, (*it), 1. ); // double evtWeight= _theJpsiGamPipPimPi0KKLh->calcEvtIntensity((*it), _fitParam); @@ -212,6 +225,7 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, plotCostPhiKp( _costKp_KpKmHeliFittedHist, _phiKp_KpKmHeliFittedHist,(*it), evtWeight ); plotCostGam( _costGamCmFittedHist,(*it), evtWeight ); plotCostPhi_OmegaPhiHeli(_costPhi_OmegaPhiHeliFittedHist, _phiPhi_OmegaPhiHeliFittedHist, (*it)->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm], evtWeight); + plotLambda(_lambdaFittedHist, (*it), evtWeight); plotChi(_chiFittedHist, (*it), evtWeight ); fillTuple(_mcTuple, (*it), evtWeight); @@ -243,6 +257,7 @@ JpsiToOmegaPhiGamHist::JpsiToOmegaPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, _costGamCmFittedHist->Scale(scaleFactor); _costPhi_OmegaPhiHeliFittedHist->Scale(scaleFactor); _phiPhi_OmegaPhiHeliFittedHist->Scale(scaleFactor); + _lambdaFittedHist->Scale(scaleFactor); _chiFittedHist->Scale(scaleFactor); double integralFitted=(double) _costGamCmFittedHist->Integral(); @@ -323,6 +338,16 @@ void JpsiToOmegaPhiGamHist::initRootStuff() _chiMcHist= new TH1F("_chiMcHist", "#chi Mc", 90, 0., 90.); _chiFittedHist= new TH1F("_chiFittedHist", "#chi Fit", 90, 0., 90.); + nbins = 50; + xmin=0; + xmax=1; + _lambdaDataHist =new TH1F("lambdaDataHist", "#lambda", nbins, xmin, xmax); + _lambdaMcHist =new TH1F("lambdaMcHist", "#lambda", nbins, xmin, xmax); + _lambdaFittedHist =new TH1F("lambdaFittedHist", "#lambda", nbins, xmin, xmax); + + + + std::string tupleVariables = "mPipPimPi0KpKm:mPipPimPi0:mKpKm:PipPimPi0KpKmCostTheta:gamCosTheta:PipPimPi0CosTheta:KpKmCosTheta:PipCosTheta:KpCosTheta:decPlaneChi:testHeli:weight"; @@ -358,7 +383,7 @@ void JpsiToOmegaPhiGamHist::plotKpKm(TH1F* theHisto, EvtDataNew* theData, double } void JpsiToOmegaPhiGamHist::plotCostPhiPip(TH1F* theCostHisto, TH1F* thePhiHisto, EvtDataNew* theData, double weight){ - Vector4<double>& v4 = theData->FourVecsDec[enumJpsiGamX4V::V4_Pip_HeliPipPimPi0]; + Vector4<double>& v4 = theData->FourVecsDec[enumJpsiGamX4V::V4_omegaDecPlaneNormal_HeliPipPimPi0]; theCostHisto->Fill( v4.CosTheta(), weight ); thePhiHisto->Fill( v4.Phi(), weight ); } @@ -379,6 +404,12 @@ void JpsiToOmegaPhiGamHist::plotCostPhi_OmegaPhiHeli(TH1F* theCostHisto, TH1F* t thePhiHisto->Fill( the4Vec.Phi(), weight); } + +void JpsiToOmegaPhiGamHist::plotLambda(TH1F* theHisto, EvtDataNew* theData, double weight){ + double lambda =theData->KinematicVariables[enumJpsiGamXKin::OmegaDecLambda]; + theHisto->Fill( lambda ,weight); +} + void JpsiToOmegaPhiGamHist::plotChi(TH1F* theChiHisto, EvtDataNew* theData, double weight){ // Vector4<double>& V4_PipPimPi0KpKm_HeliPsi = theData->FourVecsDec[enumJpsiGamX4V::V4_PipPimPi0KpKm_HeliPsi] ; // Vector4<double>& V4_Pip_HeliPsi= theData->FourVecsDec[enumJpsiGamX4V::V4_Pip_HeliPsi] ; @@ -411,7 +442,8 @@ void JpsiToOmegaPhiGamHist::fillTuple( TNtuple* theTuple, EvtDataNew* theData, Vector4<double>& V4_PipPimPi0_HeliPipPimPi0KpKm= theData->FourVecsDec[enumJpsiGamX4V::V4_PipPimPi0_HeliPipPimPi0KpKm] ; Vector4<double>& V4_KpKm_HeliPipPimPi0KpKm= theData->FourVecsDec[enumJpsiGamX4V::V4_KpKm_HeliPipPimPi0KpKm] ; - Vector4<double>& V4_Pip_HeliPipPimPi0= theData->FourVecsDec[enumJpsiGamX4V::V4_Pip_HeliPipPimPi0] ; + // Vector4<double>& V4_Pip_HeliPipPimPi0= theData->FourVecsDec[enumJpsiGamX4V::V4_Pip_HeliPipPimPi0] ; + Vector4<double>& V4_omegaDecPlaneNormal_HeliPipPimPi0= theData->FourVecsDec[enumJpsiGamX4V::V4_omegaDecPlaneNormal_HeliPipPimPi0]; Vector4<double>& V4_Kp_HeliKpKm= theData->FourVecsDec[enumJpsiGamX4V::V4_Kp_HeliKpKm] ; //Vector4<double>& V4_Pip_HeliPsi= theData->FourVecsDec[enumJpsiGamX4V::V4_Pip_HeliPsi] ; @@ -443,7 +475,8 @@ void JpsiToOmegaPhiGamHist::fillTuple( TNtuple* theTuple, EvtDataNew* theData, V4_gamma_HeliPsi.CosTheta(), V4_PipPimPi0_HeliPipPimPi0KpKm.CosTheta(), V4_KpKm_HeliPipPimPi0KpKm.CosTheta(), - V4_Pip_HeliPipPimPi0.CosTheta(), + V4_omegaDecPlaneNormal_HeliPipPimPi0.CosTheta(), + // V4_Pip_HeliPipPimPi0.CosTheta(), V4_Kp_HeliKpKm.CosTheta(), thePhiPhiDecayPlaneAngle, testHeli, diff --git a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.hh b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.hh index f44ea88232d081e307e6094aaa08319fafd93a80..2f63f2879e2728673bdbafc484ff9d112b39ffb7 100644 --- a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.hh +++ b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamHist.hh @@ -101,6 +101,11 @@ private: TH1F* _chiDataHist; TH1F* _chiMcHist; TH1F* _chiFittedHist; + + TH1F* _lambdaDataHist; + TH1F* _lambdaMcHist; + TH1F* _lambdaFittedHist; + TNtuple* _dataTuple; TNtuple* _mcTuple; @@ -117,8 +122,9 @@ private: void plotCostPhiKp(TH1F* theCostHisto, TH1F* thePhiHisto, EvtDataNew* theData, double weight); void plotCostPhi_OmegaPhiHeli(TH1F* theCostHisto, TH1F* thePhiHisto, const Vector4<double>& the4Vec, double weight); void plotCostGam(TH1F* theCostHisto, EvtDataNew* theData, double weight); - void plotChi(TH1F* theChiHisto, EvtDataNew* theData, double weight); + void plotLambda(TH1F* theHisto, EvtDataNew* theData, double weight); + void fillTuple( TNtuple* theTuple, EvtDataNew* theData, double weight); diff --git a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.cc b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.cc index f4b937bdce7ad9681be359dcb86ce4801b713bec..dd98c9c1600a58a254a534f80060ae6778bbab32 100644 --- a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.cc +++ b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.cc @@ -54,29 +54,3 @@ void JpsiToOmegaPhiGamStates::print(std::ostream& os) const printDecayJPCLS(os, _JPCLS_PhiToKK ); } -void JpsiToOmegaPhiGamStates::fillJPCLS(boost::shared_ptr<jpcRes> motherRes, boost::shared_ptr<jpcRes> daughterRes1, boost::shared_ptr<jpcRes> daughterRes2, std::vector< boost::shared_ptr<const JPCLS> >& theJPCLSVec) -{ - // first: check C-parity - if ( motherRes->C != daughterRes1->C*daughterRes2->C){ - Warning << "C-Parity not valid for the reaction: JPC= " - << motherRes->J << " " << motherRes->P << " " << motherRes->C - << " --> " - << " JPC= " << daughterRes1->J << " " << daughterRes1->P << " " << daughterRes1->C - << " and " - << " JPC= " << daughterRes2->J << " " << daughterRes2->P << " " << daughterRes2->C - ; // << endmsg; - } - vector<LS> LSs=GetValidLS(motherRes->J, motherRes->P, daughterRes1->J, daughterRes1->P, daughterRes2->J, daughterRes2->P); - - int num_LS = (int) LSs.size(); - - for(int ls = 0; ls < num_LS; ls++){ - Spin L= LSs[ls].L; - Spin S= LSs[ls].S; - int LplusS(L+S); - if ( LplusS%2 ==0 ){ - boost::shared_ptr<const JPCLS> tmpJPCLS(new JPCLS(motherRes, L, S)); - theJPCLSVec.push_back(tmpJPCLS); - } - } -} diff --git a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.hh b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.hh index f1fa609c17da8ac259cc71bfff3e09d3bfd55953..74ed9ac93c8401294d733b0826f74dccb493144b 100644 --- a/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.hh +++ b/Examples/JpsiToOmegaPhiGam/JpsiToOmegaPhiGamStates.hh @@ -34,9 +34,6 @@ public: virtual void print(std::ostream& os) const; protected: - virtual void fillJPCLS(boost::shared_ptr<jpcRes>, boost::shared_ptr<jpcRes>, - boost::shared_ptr<jpcRes>, - std::vector< boost::shared_ptr<const JPCLS> >& ); private: boost::shared_ptr<jpcRes> _kJPC; diff --git a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamHist.o b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamHist.o index 00307f1514f152a9dbbd4d6123deb447d2efa9e1..5e91599a827cdbecf2231585eda9fa5b233246e0 100644 Binary files a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamHist.o and b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamHist.o differ diff --git a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamStates.o b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamStates.o index 21a6cb3a2e349c3fac625c95209f569a4a9c9b01..fc5aa9f23966b734ff1970fffadaba1de2910668 100644 Binary files a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamStates.o and b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/JpsiToOmegaPhiGamStates.o differ diff --git a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp index d6d83f8b93eb2874131a058efb7cc438138e1e9e..87fe7080ea0e814a1023eab4084a8a2d90cb2360 100755 Binary files a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp and b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp differ diff --git a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp.o b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp.o index 581d95895927210abbde16acfb6fdb35a82eeee6..635221a359d17daaa67d08606611ffb6c2865652 100644 Binary files a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp.o and b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/MJpsiToOmegaPhiGamApp.o differ diff --git a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/libJpsiToOmegaPhiGam.a b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/libJpsiToOmegaPhiGam.a index 80e49677e60aade252d7931c358918a8be42937c..16f2599f1b7b40a66825021f8e6325dd21767948 100644 Binary files a/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/libJpsiToOmegaPhiGam.a and b/Examples/JpsiToOmegaPhiGam/bin/gcc-4.4.6/release/link-static/libJpsiToOmegaPhiGam.a differ diff --git a/Examples/JpsiToOmegaPhiGam/qaSummary.dat b/Examples/JpsiToOmegaPhiGam/qaSummary.dat index 859d6457b449c8f0af61a0bdf19d22f9e1c37d9b..082ca6c949578e52a59d51607869be9a399c3187 100644 --- a/Examples/JpsiToOmegaPhiGam/qaSummary.dat +++ b/Examples/JpsiToOmegaPhiGam/qaSummary.dat @@ -1,5 +1,5 @@ -BIC 14611.8 -AICa 14586.3 -AICc 14586.3 -logLh 7289.15 +BIC 12195.7 +AICa 12170.2 +AICc 12170.2 +logLh 6081.08 free parameter 4