From eb0e836e1806fc401dd176c6ec82e1be75d02838 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Wed, 6 Jun 2018 17:01:45 +0200
Subject: [PATCH] Fix for Coverity Defects 115125, 115134, 115135
Remove logically dead-code in `LArEMECChargeCollection`.
Former-commit-id: f7ab082c842de3998c7e35d79735c620652d5095
---
.../LArG4EC/src/LArEMECChargeCollection.cc | 23 ++++---------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc b/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
index 53bd5aac99a7..a5c4d77c2c0d 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
@@ -431,15 +431,9 @@ void LArG4::EC::EnergyCalculator::LoadFieldMaps(const G4String fname){
for(G4int foldtype = 0; foldtype < foldtypemx; ++ foldtype) {
for(G4int wheeltype = 0; wheeltype < 2; ++ wheeltype) {
- //if(wheeltype == 0) ChCollWheelType = &ChCollInner;
- //if(wheeltype == 1) ChCollWheelType = &ChCollOuter;
- Wheel_Efield_Map *ChCollWheelType = (wheeltype == 0) ? &s_ChCollInner :
- ( (wheeltype == 1) ? &s_ChCollOuter : 0 );
+ Wheel_Efield_Map *ChCollWheelType = (wheeltype == 0) ? &s_ChCollInner : &s_ChCollOuter;
- //if(foldtype == 0 ) ChCollFoldType = &(ChCollWheelType->Fold1);
- //if(foldtype == 1 ) ChCollFoldType = &(ChCollWheelType->Fold0);
- Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) :
- ( ( foldtype == 1 ) ? &(ChCollWheelType->Fold0) : 0 );
+ Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) : &(ChCollWheelType->Fold0);
const G4int nlayer = ChCollWheelType->NumberOfRadialLayer; // should be the same for Fold0 and Fold1
@@ -508,15 +502,9 @@ void LArG4::EC::EnergyCalculator::LoadFieldMaps(const G4String fname){
for(G4int foldtype = 0; foldtype < foldtypemx; ++ foldtype) {
for(G4int wheeltype = 0; wheeltype < 2; ++ wheeltype){
- //if(wheeltype == 0) ChCollWheelType = &ChCollInner;
- //if(wheeltype == 1) ChCollWheelType = &ChCollOuter;
- Wheel_Efield_Map *ChCollWheelType = (wheeltype == 0) ? &s_ChCollInner :
- ( (wheeltype == 1) ? &s_ChCollOuter : 0 );
+ Wheel_Efield_Map *ChCollWheelType = (wheeltype == 0) ? &s_ChCollInner : &s_ChCollOuter;
- //if(foldtype == 0 ) ChCollFoldType = &(ChCollWheelType->Fold1);
- //if(foldtype == 1 ) ChCollFoldType = &(ChCollWheelType->Fold0);
- Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) :
- ( ( foldtype == 1 ) ? &(ChCollWheelType->Fold0) : 0 );
+ Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) : &(ChCollWheelType->Fold0);
const G4int nlayer = ChCollWheelType->NumberOfRadialLayer; // should be the same for Fold0 and Fold1
for(G4int i=0; i<nlayer; ++i){
@@ -589,8 +577,7 @@ void LArG4::EC::EnergyCalculator::PrepareFieldMap(Wheel_Efield_Map* ChCollWheelT
//if(foldtype == 0 ) ChCollFoldType = &(ChCollWheelType->Fold1); //normal fold
//if(foldtype == 1 ) ChCollFoldType = &(ChCollWheelType->Fold0); //very first fold
- Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) :
- ( ( foldtype == 1 ) ? &(ChCollWheelType->Fold0) : 0 );
+ Fold_Efield_Map *ChCollFoldType = ( foldtype == 0 ) ? &(ChCollWheelType->Fold1) : &(ChCollWheelType->Fold0);
for(G4int i=0; i<nlayer; ++i) {
if(foldtype == 0) { //normal fold
--
GitLab