Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Pawian
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PWA
Pawian
Commits
0ae0af22
Commit
0ae0af22
authored
12 years ago
by
Bertram Kopf
Browse files
Options
Downloads
Patches
Plain Diff
minor changes in PsiProdBaseLhNew
parent
54ac3dd6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Examples/JpsiToPhiPhiGam/JpsiToPhiPhiGamHist.cc
+1
-1
1 addition, 1 deletion
Examples/JpsiToPhiPhiGam/JpsiToPhiPhiGamHist.cc
PwaUtils/PsiProdBaseLhNew.cc
+22
-42
22 additions, 42 deletions
PwaUtils/PsiProdBaseLhNew.cc
PwaUtils/PsiProdBaseLhNew.hh
+1
-1
1 addition, 1 deletion
PwaUtils/PsiProdBaseLhNew.hh
with
24 additions
and
44 deletions
Examples/JpsiToPhiPhiGam/JpsiToPhiPhiGamHist.cc
+
1
−
1
View file @
0ae0af22
...
...
@@ -245,7 +245,7 @@ JpsiToPhiPhiGamHist::JpsiToPhiPhiGamHist(boost::shared_ptr<AbsLhNew> theLh, fitP
_phiPhi_KpKmFittedHist
->
Scale
(
scaleFactor
);
_chiFittedHist
->
Scale
(
scaleFactor
);
double
integralFitted
=
(
double
)
_
PhiPhiMass
FittedHist
->
Integral
();
double
integralFitted
=
(
double
)
_
costGamCm
FittedHist
->
Integral
();
Info
<<
"No of fit events "
<<
integralFitted
;
// << endmsg;
}
...
...
This diff is collapsed.
Click to expand it.
PwaUtils/PsiProdBaseLhNew.cc
+
22
−
42
View file @
0ae0af22
...
...
@@ -74,60 +74,41 @@ double PsiProdBaseLhNew::calcEvtIntensity(EvtDataNew* theData, fitParamsNew& the
//calculate all amplitudes
std
::
map
<
std
::
string
,
std
::
vector
<
std
::
string
>
>::
const_iterator
itMap
;
for
(
itMap
=
_hypMap
.
begin
();
itMap
!=
_hypMap
.
end
();
++
itMap
){
// const std::vector<std::string> currentHypVecs=(*itMap);
std
::
vector
<
std
::
string
>::
const_iterator
itStr
;
for
(
itStr
=
itMap
->
second
.
begin
();
itStr
!=
itMap
->
second
.
end
();
++
itStr
){
boost
::
shared_ptr
<
AbsXdecAmp
>
currentDecAmp
=
_allAmpMap
[
*
itStr
];
std
::
map
<
boost
::
shared_ptr
<
const
JPClamlam
>
,
double
,
pawian
::
Collection
::
SharedPtrLess
>
PsiToXGamMag
=
theParamVal
.
MagLamLams
[
*
itStr
];
std
::
map
<
boost
::
shared_ptr
<
const
JPClamlam
>
,
double
,
pawian
::
Collection
::
SharedPtrLess
>
PsiToXGamPhi
=
theParamVal
.
PhiLamLams
[
*
itStr
];
std
::
map
<
Spin
,
std
::
map
<
Spin
,
double
>
>
MagProdMap
;
std
::
map
<
Spin
,
std
::
map
<
Spin
,
double
>
>
PhiProdMap
;
std
::
map
<
Spin
,
std
::
map
<
Spin
,
double
>
>
ParityProdMap
;
std
::
map
<
boost
::
shared_ptr
<
const
JPClamlam
>
,
double
,
pawian
::
Collection
::
SharedPtrLess
>::
iterator
itMag
;
for
(
itMag
=
PsiToXGamMag
.
begin
();
itMag
!=
PsiToXGamMag
.
end
();
++
itMag
){
boost
::
shared_ptr
<
const
JPClamlam
>
currentJPClamlam
=
itMag
->
first
;
MagProdMap
[
currentJPClamlam
->
lam1
][
currentJPClamlam
->
lam2
]
=
itMag
->
second
;
ParityProdMap
[
currentJPClamlam
->
lam1
][
currentJPClamlam
->
lam2
]
=
1.
;
PhiProdMap
[
currentJPClamlam
->
lam1
][
currentJPClamlam
->
lam2
]
=
PsiToXGamPhi
[
currentJPClamlam
];
MagProdMap
[
-
currentJPClamlam
->
lam1
][
-
currentJPClamlam
->
lam2
]
=
itMag
->
second
;
ParityProdMap
[
-
currentJPClamlam
->
lam1
][
-
currentJPClamlam
->
lam2
]
=
currentJPClamlam
->
parityFactor
;
PhiProdMap
[
-
currentJPClamlam
->
lam1
][
-
currentJPClamlam
->
lam2
]
=
PsiToXGamPhi
[
currentJPClamlam
];
}
std
::
map
<
Spin
,
complex
<
double
>
>
JpGpTmpMap
;
std
::
map
<
Spin
,
complex
<
double
>
>
JpGmTmpMap
;
std
::
map
<
Spin
,
complex
<
double
>
>
JmGpTmpMap
;
std
::
map
<
Spin
,
complex
<
double
>
>
JmGmTmpMap
;
std
::
map
<
Spin
,
complex
<
double
>
>
TmpDecAmp
;
boost
::
shared_ptr
<
AbsXdecAmp
>
currentDecAmp
=
_allAmpMap
[
*
itStr
];
const
Spin
J_X
=
currentDecAmp
->
spinX
();
for
(
Spin
helX
=-
J_X
;
helX
<=
J_X
;
helX
++
){
// Info << "helX:\t" << helX;
JpGpTmpMap
[
helX
]
=
ParityProdMap
[
helX
][
1
]
*
psiToXGammaAmp
(
1
,
J_X
,
helX
,
1
,
theData
,
MagProdMap
[
helX
][
1
],
PhiProdMap
[
helX
][
1
]);
JmGpTmpMap
[
helX
]
=
ParityProdMap
[
helX
][
1
]
*
psiToXGammaAmp
(
-
1
,
J_X
,
helX
,
1
,
theData
,
MagProdMap
[
helX
][
1
],
PhiProdMap
[
helX
][
1
]);
Spin
helX
=
currentJPClamlam
->
lam1
;
complex
<
double
>
JpGpTmp
=
psiToXGammaAmp
(
1
,
helX
,
1
,
theData
,
itMag
->
second
,
PsiToXGamPhi
[
currentJPClamlam
]);
complex
<
double
>
JmGpTmp
=
psiToXGammaAmp
(
-
1
,
helX
,
1
,
theData
,
itMag
->
second
,
PsiToXGamPhi
[
currentJPClamlam
]);
complex
<
double
>
JpGmTmp
=
currentJPClamlam
->
parityFactor
*
psiToXGammaAmp
(
1
,
-
helX
,
-
1
,
theData
,
itMag
->
second
,
PsiToXGamPhi
[
currentJPClamlam
]);
complex
<
double
>
JmGmTmp
=
currentJPClamlam
->
parityFactor
*
psiToXGammaAmp
(
-
1
,
-
helX
,
-
1
,
theData
,
itMag
->
second
,
PsiToXGamPhi
[
currentJPClamlam
]);
JpGmTmpMap
[
helX
]
=
ParityProdMap
[
helX
][
-
1
]
*
psiToXGammaAmp
(
1
,
J_X
,
helX
,
-
1
,
theData
,
MagProdMap
[
helX
][
-
1
],
PhiProdMap
[
helX
][
-
1
]);
JmGmTmpMap
[
helX
]
=
ParityProdMap
[
helX
][
-
1
]
*
psiToXGammaAmp
(
-
1
,
J_X
,
helX
,
-
1
,
theData
,
MagProdMap
[
helX
][
-
1
],
PhiProdMap
[
helX
][
-
1
]);
complex
<
double
>
TmpDecAmpPos
=
currentDecAmp
->
XdecAmp
(
helX
,
theData
,
theParamVal
);
complex
<
double
>
TmpDecAmpNeg
=
TmpDecAmpPos
;
if
(
helX
>
0
)
TmpDecAmpNeg
=
currentDecAmp
->
XdecAmp
(
-
helX
,
theData
,
theParamVal
);
TmpDecAmp
[
helX
]
=
currentDecAmp
->
XdecAmp
(
helX
,
theData
,
theParamVal
);
JmpGmp
+=
JpGpTmp
*
TmpDecAmpPos
;
JmpGmm
+=
JpGmTmp
*
TmpDecAmpNeg
;
JmmGmp
+=
JmGpTmp
*
TmpDecAmpPos
;
JmmGmm
+=
JmGmTmp
*
TmpDecAmpNeg
;
// std::cout << "\nJpGpTmpMap[" << helX << "]=\t" << JpGpTmpMap[helX] << std::endl;
// std::cout << "JmGpTmpMap[" << helX << "]=\t" << JmGpTmpMap[helX] << std::endl;
// std::cout << "JpGmTmpMap[" << helX << "]=\t" << JpGmTmpMap[helX] << std::endl;
// std::cout << "JmGmTmpMap[" << helX << "]=\t" << JmGmTmpMap[helX] << "\n" <<std::endl;
}
for
(
Spin
helX
=-
J_X
;
helX
<=
J_X
;
helX
++
){
JmpGmp
+=
JpGpTmpMap
[
helX
]
*
TmpDecAmp
[
helX
];
JmpGmm
+=
JpGmTmpMap
[
helX
]
*
TmpDecAmp
[
helX
];
JmmGmp
+=
JmGpTmpMap
[
helX
]
*
TmpDecAmp
[
helX
];
JmmGmm
+=
JmGmTmpMap
[
helX
]
*
TmpDecAmp
[
helX
];
}
}
}
...
...
@@ -144,11 +125,10 @@ double PsiProdBaseLhNew::calcEvtIntensity(EvtDataNew* theData, fitParamsNew& the
}
complex
<
double
>
PsiProdBaseLhNew
::
psiToXGammaAmp
(
Spin
Minit
,
Spin
jX
,
Spin
lamX
,
Spin
lamGamma
,
EvtDataNew
*
theData
,
complex
<
double
>
PsiProdBaseLhNew
::
psiToXGammaAmp
(
Spin
Minit
,
Spin
lamX
,
Spin
lamGamma
,
EvtDataNew
*
theData
,
double
PsiToXGamMag
,
double
PsiToXGamPhi
){
complex
<
double
>
result
(
0.
,
0.
);
Spin
lambda
=
lamX
-
lamGamma
;
if
(
fabs
(
lambda
)
>
1
)
return
result
;
complex
<
double
>
expiphiPsi
(
cos
(
PsiToXGamPhi
),
sin
(
PsiToXGamPhi
));
result
=
PsiToXGamMag
*
expiphiPsi
*
conj
(
theData
->
WignerDsProd
[
enumProdDfunc
::
Psi
][
1
][
Minit
][
lambda
]
);
...
...
This diff is collapsed.
Click to expand it.
PwaUtils/PsiProdBaseLhNew.hh
+
1
−
1
View file @
0ae0af22
...
...
@@ -64,7 +64,7 @@ protected:
std
::
map
<
std
::
string
,
boost
::
shared_ptr
<
AbsXdecAmp
>
>
_allAmpMap
;
virtual
complex
<
double
>
psiToXGammaAmp
(
Spin
Minit
,
Spin
jX
,
Spin
lamX
,
Spin
lamGamma
,
virtual
complex
<
double
>
psiToXGammaAmp
(
Spin
Minit
,
Spin
lamX
,
Spin
lamGamma
,
EvtDataNew
*
theData
,
double
PsiToXGamMag
,
double
PsiToXGamPhi
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment