Skip to content
Snippets Groups Projects
Commit cb1539e3 authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

D2PDMaker: Making setSignalState non-const.

Change the ISignalState::setSignalState and resetSignalState methods
to be (properly!) non-const.  SignalStateHelper now takes a non-const
pointer to the object.  (Temporarily?) introduce SignalStateConstHelper
that takes a const pointer and does a const_cast on it; this is marked
as not thread-safe.

Remove now-unused SignalStateCollHelper.
parent 33c32bd1
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
//============================================================================ //============================================================================
...@@ -781,7 +781,7 @@ StatusCode D2PDJetSelector::processObject( const Jet* jet, ...@@ -781,7 +781,7 @@ StatusCode D2PDJetSelector::processObject( const Jet* jet,
// Do selections for jets with a different SignalState // Do selections for jets with a different SignalState
//---------------------------------------------------------- //----------------------------------------------------------
P4SignalState::State originalSignalState = jet->signalState(); P4SignalState::State originalSignalState = jet->signalState();
SignalStateHelper sigstateH( jet, (P4SignalState::State)m_signalState ); SignalStateConstHelper sigstateH( jet, (P4SignalState::State)m_signalState );
ATH_MSG_DEBUG ( "Setting a new SignalState for this jet! Will apply the selections for the new SignalState!" ); ATH_MSG_DEBUG ( "Setting a new SignalState for this jet! Will apply the selections for the new SignalState!" );
// transverse energy selection // transverse energy selection
...@@ -846,7 +846,7 @@ StatusCode D2PDJetSelector::processObject( const Jet* jet, ...@@ -846,7 +846,7 @@ StatusCode D2PDJetSelector::processObject( const Jet* jet,
} }
// Now, revert the jet SignalState to the original one // Now, revert the jet SignalState to the original one
// done automatically when sigstateH go away. // done automatically when sigstateH go away.
SignalStateHelper sigstateH2( jet, originalSignalState ); SignalStateConstHelper sigstateH2( jet, originalSignalState );
ATH_MSG_DEBUG ( "Reverting the jet to the original SignalState!" ); ATH_MSG_DEBUG ( "Reverting the jet to the original SignalState!" );
if (isPassed) m_nJetsPassed++; if (isPassed) m_nJetsPassed++;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment