Skip to content
Snippets Groups Projects
Commit d76440e3 authored by Walter Lampl's avatar Walter Lampl Committed by Marco Clemencic
Browse files

EventIDRage c'tor: Don't reset UNDEF values to 0

parent 5981808a
No related branches found
No related tags found
1 merge request!1347EventIDRage c'tor: Don't reset UNDEF values to 0
......@@ -25,7 +25,7 @@ if sys.version_info >= (3,): # pragma no cover
basestring = str
_log = logging.getLogger(__name__)
is_64bits = sys.maxsize > 2 ** 32
is_64bits = sys.maxsize > 2**32
class PropertySemantics(object):
......
......@@ -97,7 +97,7 @@ def test_int_ok():
@raises(ValueError)
def test_int_bad():
getSemanticsFor("int").store(2 ** 32)
getSemanticsFor("int").store(2**32)
@raises(ValueError)
......
......@@ -26,20 +26,7 @@ EventIDRange::EventIDRange()
, m_stop( EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM,
EventIDBase::UNDEFNUM, 0 ) {}
EventIDRange::EventIDRange( const EventIDBase& start, const EventIDBase& stop ) : m_start( start ), m_stop( stop ) {
// For pure time-stamp range, re-adjust start so that it covers O-INF in terms of run-lumi
if ( m_start.m_run_number == EventIDBase::UNDEFNUM ) {
m_start.m_run_number = 0;
m_start.m_event_number = 0;
m_start.m_lumi_block = 0;
}
// For pure run/lumi range, re-adjust start so that it covers 0-inf in terms of time-stamp
else if ( m_start.m_time_stamp == EventIDBase::UNDEFNUM ) {
m_start.m_time_stamp = 0;
m_start.m_time_stamp_ns_offset = 0;
}
}
EventIDRange::EventIDRange( const EventIDBase& start, const EventIDBase& stop ) : m_start( start ), m_stop( stop ) {}
EventIDRange& EventIDRange::operator=( const EventIDRange& r ) {
if ( this != &r ) {
......
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