Commit 08335ba1 authored by Eduardo Rodrigues's avatar Eduardo Rodrigues
Browse files

Patched back MR LHCb/MR!430 in Event/MCEvent, 'tagged' as v3r4p1.

parent 010ceeff
################################################################################
# Package: MCEvent
################################################################################
gaudi_subdir(MCEvent v3r4)
gaudi_subdir(MCEvent v3r4p1)
gaudi_depends_on_subdirs(Event/EventBase
GaudiObjDesc
......
......@@ -2,7 +2,7 @@
# Maintainer : Marco Cattaneo
#
package MCEvent
version v3r4
version v3r4p1
branches cmt doc src xml Event dict
# Used packages.
......
......@@ -3,6 +3,30 @@
! Purpose : LHCb Event model. MC truth classes (Gauss and Boole output)
!-----------------------------------------------------------------------------
! 2016-12-15 - Eduardo Rodrigues
- Patched back from the GitLab merge request LHCb/MR!430
directly into the code, since simpler than cherry-pick'ing and solving conflicts.
Vanya's original commit is:
"
! 2016-11-17 - Vanya Belyaev
- MCParticle.xml
add a regular copoy consructor (no key copying)
remove "quasi-copy-constructor"
fix clone/cloneWithKey accordingly
fix bug: weird "quasi copy-constrcutor" is not copying m_flags field.
as a result "fromSignal" information is lost for all MC tapes..
now it is fixed..
Btw - *WHY* we need this strange "quasi-copy" ?
Could it be replaced with normal Copy Constructor (as e.g. fro LHCb::Particle)
(of course LHCb::MCParticle::clone and LHCb::MCParticle::cloneWithKey
in this case need to be fixed also, but I think it is more correct, instead of
using weird "quasi-copy constructor".
"
!========================= MCEvent v3r4 2016-01-27 =========================
! 2015-11-26 - Marco Clemencic
- Removed (u)longlong typedef (see GAUDI-1125).
......
......@@ -27,10 +27,10 @@
init="0.0, 0.0, 0.0, -1*Gaudi::Units::GeV"
/>
<constructor
desc = "Copy Constructor"
argList = "const LHCb::MCParticle* right"
initList = "KeyedObject&lt;int&gt;(), m_momentum(right->momentum()), m_particleID(right->particleID()), m_originVertex(right->originVertex()), m_endVertices(right->endVertices())"
> <code/> </constructor>
desc = "Copy Constructor[Attention: the key is NOT copied!]"
argList = "const LHCb::MCParticle&amp; right"
initList = "KeyedObject&lt;int&gt;(), m_momentum(right.m_momentum), m_particleID(right.m_particleID),m_flags(right.m_flags),m_originVertex(right.m_originVertex), m_endVertices(right.m_endVertices)"
> <code/> </constructor>
<method
name="clone"
......@@ -39,7 +39,7 @@
const="TRUE"
>
<code>
return new LHCb::MCParticle(this);
return new LHCb::MCParticle(*this);
</code>
</method>
......@@ -50,7 +50,7 @@
const="TRUE"
>
<code>
LHCb::MCParticle *clone = new LHCb::MCParticle(this);
LHCb::MCParticle *clone = new LHCb::MCParticle(*this);
clone -> setKey(this->key());
return clone;
</code>
......
Supports Markdown
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