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
4610df4b
Commit
4610df4b
authored
10 years ago
by
Bertram Kopf
Browse files
Options
Downloads
Patches
Plain Diff
bug fix for coupled channel analyses in DynRegistry
parent
35f2aa60
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
PwaUtils/AbsDecay.hh
+1
-1
1 addition, 1 deletion
PwaUtils/AbsDecay.hh
PwaUtils/DynRegistry.cc
+13
-3
13 additions, 3 deletions
PwaUtils/DynRegistry.cc
PwaUtils/DynRegistry.hh
+2
-1
2 additions, 1 deletion
PwaUtils/DynRegistry.hh
with
16 additions
and
5 deletions
PwaUtils/AbsDecay.hh
+
1
−
1
View file @
4610df4b
...
@@ -115,7 +115,7 @@ public:
...
@@ -115,7 +115,7 @@ public:
double
massSumFsParticlesDec1
();
double
massSumFsParticlesDec1
();
double
massSumFsParticlesDec2
();
double
massSumFsParticlesDec2
();
int
orbMomMin
()
{
return
_Lmin
;}
int
orbMomMin
()
{
return
_Lmin
;}
ChannelID
channelId
()
{
return
_channelId
;}
protected
:
protected
:
virtual
void
extractLmin
();
virtual
void
extractLmin
();
...
...
This diff is collapsed.
Click to expand it.
PwaUtils/DynRegistry.cc
+
13
−
3
View file @
4610df4b
...
@@ -84,8 +84,18 @@ std::shared_ptr<AbsDynamics> DynRegistry::getDynamics(std::shared_ptr<AbsDecay>
...
@@ -84,8 +84,18 @@ std::shared_ptr<AbsDynamics> DynRegistry::getDynamics(std::shared_ptr<AbsDecay>
std
::
shared_ptr
<
AbsDynamics
>
result
;
std
::
shared_ptr
<
AbsDynamics
>
result
;
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>::
iterator
it
=
_dynMap
.
find
(
theName
);
ChannelID
currentChannelId
=
theDec
->
channelId
();
if
(
it
!=
_dynMap
.
end
()){
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>
currentDynMap
;
std
::
map
<
ChannelID
,
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>
>::
iterator
itChannelId
=
_dynMapChannel
.
find
(
currentChannelId
);
if
(
itChannelId
!=
_dynMapChannel
.
end
()){
currentDynMap
=
itChannelId
->
second
;
}
else
_dynMapChannel
[
currentChannelId
]
=
currentDynMap
;
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>::
iterator
it
=
currentDynMap
.
find
(
theName
);
if
(
it
!=
currentDynMap
.
end
()){
result
=
it
->
second
;
result
=
it
->
second
;
Info
<<
"Dynamics
\t
"
<<
theName
<<
"
\t
found!!!"
<<
endmsg
;
Info
<<
"Dynamics
\t
"
<<
theName
<<
"
\t
found!!!"
<<
endmsg
;
}
}
...
@@ -156,7 +166,7 @@ std::shared_ptr<AbsDynamics> DynRegistry::getDynamics(std::shared_ptr<AbsDecay>
...
@@ -156,7 +166,7 @@ std::shared_ptr<AbsDynamics> DynRegistry::getDynamics(std::shared_ptr<AbsDecay>
Info
<<
"add dynamics for "
<<
theName
<<
endmsg
;
Info
<<
"add dynamics for "
<<
theName
<<
endmsg
;
_dynMap
[
theName
]
=
result
;
_dynMap
Channel
[
currentChannelId
]
[
theName
]
=
result
;
_dynVec
.
push_back
(
result
);
_dynVec
.
push_back
(
result
);
}
}
...
...
This diff is collapsed.
Click to expand it.
PwaUtils/DynRegistry.hh
+
2
−
1
View file @
4610df4b
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#include
<cassert>
#include
<cassert>
#include
<memory>
#include
<memory>
#include
"PwaUtils/AbsChannelEnv.hh"
class
AbsDecay
;
class
AbsDecay
;
class
AbsDynamics
;
class
AbsDynamics
;
...
@@ -57,7 +58,7 @@ protected:
...
@@ -57,7 +58,7 @@ protected:
static
DynRegistry
*
_instance
;
static
DynRegistry
*
_instance
;
private
:
private
:
std
::
map
<
ChannelID
,
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>
>
_dynMapChannel
;
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>
_dynMap
;
std
::
map
<
std
::
string
,
std
::
shared_ptr
<
AbsDynamics
>
>
_dynMap
;
std
::
vector
<
std
::
shared_ptr
<
AbsDynamics
>
>
_dynVec
;
std
::
vector
<
std
::
shared_ptr
<
AbsDynamics
>
>
_dynVec
;
...
...
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