diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArAutoCorrSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArAutoCorrSubsetCnv_p1.cxx index 69e34cfea08d4f5b26af305e08b8980a9257481a..32fb4bc3f51652066c660ffd81157898f3565635 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArAutoCorrSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArAutoCorrSubsetCnv_p1.cxx @@ -254,11 +254,7 @@ LArAutoCorrSubsetCnv_p1::transToPers(const LArAutoCorrTransType* transObj, if (subsetIt->second[j].m_vAutoCorr.size() > 0) { // store the channel number in bit map - if (j < chansOffset || (j - chansOffset) > 31) { - log << MSG::ERROR - << "LArAutoCorrSubsetCnv_p1::transToPers - incorrect channel indexing: j, chansOffset: " << j << " " << chansOffset - << endmsg; - } + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); } else { diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p1.cxx index 8440b0a2bb65e893f3c2629fdf418c423157d596..a227cbefa526a741a2321a1666ca79428bb5da80 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p1.cxx @@ -239,9 +239,7 @@ LArCaliWaveSubsetCnv_p1::transToPers(const LArCWTransType* transObj, LArCWPersT if (subsetIt->second[j].size() > 0) { // channel exists - if (j < chansOffset || (j - chansOffset) > 31) // store the channel number in bit map - log << MSG::ERROR << "LArCWSubsetCnv_p1::tTP - incorrect ch. ind: j, chansOffset: " << j << " " << chansOffset << endmsg; - + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); //store the channel number in the bit map //std::cout<<"1"; diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p2.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p2.cxx index 12f7560bffde177a548913e5ed6ff3492423a748..f4146a5cc78f87c64cc20e6df32d6d66218113ab 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p2.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArCaliWaveSubsetCnv_p2.cxx @@ -255,9 +255,7 @@ LArCaliWaveSubsetCnv_p2::transToPers(const LArCWTransType* transObj, LArCaliWav if (subsetIt->second[j].size() > 0) { // channel exists - if (j < chansOffset || (j - chansOffset) > 31) // store the channel number in bit map - log << MSG::ERROR << "LArCWSubsetCnv_p2::tTP - incorrect ch. ind: j, chansOffset: " << j << " " << chansOffset << endmsg; - + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); //store the channel number in the bit map // std::cout<<"1"; diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArOFCSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArOFCSubsetCnv_p1.cxx index ec12a0d81f2c9138081ad172322bf0a63941ff57..7f705b0e0b06dd53ccda9772c28c37df3031cf5a 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArOFCSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArOFCSubsetCnv_p1.cxx @@ -296,11 +296,7 @@ LArOFCSubsetCnv_p1::transToPers(const LArOFCTransType* transObj, // subset with sparse data if ((*subsetIt).second[j].OFC_aSize() > 0) { // store the channel number in bit map - if (j < chansOffset || (j - chansOffset) > 31) { - log << MSG::ERROR - << "LArOFCSubsetCnv_p1::transToPers - incorrect channel indexing: j, chansOffset: " << j << " " << chansOffset - << endmsg; - } + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); } else { diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArPhysWaveSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArPhysWaveSubsetCnv_p1.cxx index 7953f85b86135234eb9aefb934f261d9e4787d11..aaaa72c50506d527e17c44b08c7ec74fd140044c 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArPhysWaveSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArPhysWaveSubsetCnv_p1.cxx @@ -244,9 +244,7 @@ LArPhysWaveSubsetCnv_p1::transToPers(const LArPWTransType* transObj, if (!subsetIt->second[j].isEmpty()) { // channel exists - if (j < chansOffset || (j - chansOffset) > 31) // store the channel number in bit map - log << MSG::ERROR << "LArCWSubsetCnv_p1::tTP - incorrect ch. ind: j, chansOffset: " << j << " " << chansOffset << endmsg; - + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); //store the channel number in the bit map //std::cout<<"1"; diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArRampSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArRampSubsetCnv_p1.cxx index b31fa61955094ee1eab08f26f4b0d4ddcad5714d..1943611f7a422cc9879681a71e2b402d584521a3 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArRampSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArRampSubsetCnv_p1.cxx @@ -271,11 +271,7 @@ LArRampSubsetCnv_p1::transToPers(const LArRampTransType* transObj, if (subsetIt->second[j].m_vRamp.size() > 0) { // store the channel number in bit map - if (j < chansOffset || (j - chansOffset) > 31) { - log << MSG::ERROR - << "LArRampSubsetCnv_p1::transToPers - incorrect channel indexing: j, chansOffset: " << j << " " << chansOffset - << endmsg; - } + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); } else { diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p1.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p1.cxx index 8031d1f477780c8d73f481c9ccd84b635e1c2ac9..99c87d33469f331c66381768b88d7565e6282c53 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p1.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p1.cxx @@ -303,11 +303,7 @@ LArShapeSubsetCnv_p1::transToPers(const LArShapeTransType1* transObj, if (subsetIt->second[j].m_vShape.size() > 0) { // store the channel number in bit map - if (j < chansOffset || (j - chansOffset) > 31) { - log << MSG::ERROR - << "LArShapeSubsetCnv_p1::transToPers - incorrect channel indexing: j, chansOffset: " << j << " " << chansOffset - << endmsg; - } + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); } else { diff --git a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p2.cxx b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p2.cxx index f4287b67afbbe547c4d79ede90af955b83c50359..ab75f55fa3f317722208901451d54ccba5e45040 100644 --- a/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p2.cxx +++ b/LArCalorimeter/LArCnv/LArCondTPCnv/src/LArShapeSubsetCnv_p2.cxx @@ -312,11 +312,7 @@ LArShapeSubsetCnv_p2::transToPers(const LArShapeTransType2* transObj, // subset with sparse data if ((*subsetIt).second[j].shapeSize() > 0) { // store the channel number in bit map - if (j < chansOffset || (j - chansOffset) > 31) { - log << MSG::ERROR - << "LArShapeSubsetCnv_p2::transToPers - incorrect channel indexing: j, chansOffset: " << j << " " << chansOffset - << endmsg; - } + assert (j >= chansOffset && (j - chansOffset) <= 31); chansSet |= (1 << (j - chansOffset)); } else {