diff --git a/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_back.cxx b/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_back.cxx index 76b5db9f36b290a02f7cf7122c903ed49720779a..3927c83ca633db52ddca2818cb3d445a6233e6f7 100755 --- a/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_back.cxx +++ b/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_back.cxx @@ -63,7 +63,7 @@ StatusCode CaloSwDeadOTX_back::initialize() ATH_MSG_DEBUG( " --------------->>>>> CaloSwDeadOTX_back :: affectedTool successfully retrieved" << endmsg); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } void CaloSwDeadOTX_back::makeTheCorrection diff --git a/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_ps.cxx b/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_ps.cxx index f1c3625009b7ccc41475052a52bba27efa861c96..7f04ef73729dc65390a50ea89b8a03ab8bbbf111 100755 --- a/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_ps.cxx +++ b/Calorimeter/CaloClusterCorrection/src/CaloSwDeadOTX_ps.cxx @@ -62,7 +62,7 @@ StatusCode CaloSwDeadOTX_ps::initialize() ATH_MSG_DEBUG( " --------------->>>>> CaloSwDeadOTX_ps :: affectedTool successfully retrieved" << endmsg); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } void CaloSwDeadOTX_ps::makeTheCorrection diff --git a/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx b/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx index c3ec2eecc3fef7addbc6774c5a094b6d23b616b1..7b855389c18c768b69190214b58c17c1c5fc19cb 100644 --- a/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx +++ b/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx @@ -410,7 +410,7 @@ bool CaloLocalHadCoeff::getInterpArrays(const int n_area, const std::vector<int> float xa; int ibin, i; - unsigned int i_len;; + unsigned int i_len; std::vector<int> vTmp; std::vector<int> vIdx(area->getNdim()); std::vector<std::vector<int> > vpW; diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx index ad8df477d1de7237ffa6fa79b84589b0517ffaf9..1cd468518c7dc89e0d54f3c10c77d9c285ad3cc0 100644 --- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx +++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx @@ -780,7 +780,7 @@ if (!selObj.select(hit)) continue; double ecal[4]={0.,0.,0.,0.}; double eAct[4]={0.,0.,0.,0.}; double eInact[4]={0.,0.,0.,0.}; - double eDead[4]={0.,0.,0.,0.};; + double eDead[4]={0.,0.,0.,0.}; double edead_1_0 =0; double edead_1_1_0=0; double edead_1_1_1=0; diff --git a/Calorimeter/CaloMonitoring/src/CaloCellVecMon.cxx b/Calorimeter/CaloMonitoring/src/CaloCellVecMon.cxx index e7c783f91a07f41117a5f04f926fb4bc47803b2b..8e9ca89ddba20bd05f9b2bc66d25afed89bdad36 100755 --- a/Calorimeter/CaloMonitoring/src/CaloCellVecMon.cxx +++ b/Calorimeter/CaloMonitoring/src/CaloCellVecMon.cxx @@ -2856,21 +2856,21 @@ void CaloCellVecMon::fillSporHists(const CaloCell* cell ){ } if(caloDDEl->is_lar_em_barrel() && posneg != 0) { part_name = "EMBA"; - sample_s = m_em_id->sampling(id_s);; + sample_s = m_em_id->sampling(id_s); name_flag=2; m_badCell_flag = m_badCell_flag_emba; tmpBadCell = m_badCell_EMBA; } if(caloDDEl->is_lar_em_endcap() && posneg == 0) { part_name = "EMECC"; - sample_s = m_em_id->sampling(id_s);; + sample_s = m_em_id->sampling(id_s); name_flag=3; m_badCell_flag = m_badCell_flag_emecc; tmpBadCell = m_badCell_EMECC; } if(caloDDEl->is_lar_em_endcap() && posneg != 0) { part_name = "EMECA"; - sample_s = m_em_id->sampling(id_s);; + sample_s = m_em_id->sampling(id_s); name_flag=4; m_badCell_flag = m_badCell_flag_emeca; tmpBadCell = m_badCell_EMECA; @@ -2891,14 +2891,14 @@ void CaloCellVecMon::fillSporHists(const CaloCell* cell ){ } if(caloDDEl->is_lar_fcal() && posneg == 0) { part_name = "FCALC"; - sample_s = m_calo_id->sampling(id_s);; + sample_s = m_calo_id->sampling(id_s); name_flag=7; m_badCell_flag = m_badCell_flag_fcalc; tmpBadCell = m_badCell_FCALC; } if(caloDDEl->is_lar_fcal() && posneg != 0) { part_name = "FCALA"; - sample_s = m_calo_id->sampling(id_s);; + sample_s = m_calo_id->sampling(id_s); name_flag=8; m_badCell_flag = m_badCell_flag_fcala; tmpBadCell = m_badCell_FCALA; diff --git a/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx b/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx index 7442a762b9d7f5d008a95e20a9d94cd19c8436e9..49f1ca7609a36eedbb48d9af7048e73dd8d3655b 100644 --- a/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx +++ b/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx @@ -341,7 +341,7 @@ CaloNoiseToolDB::updateCache() } } for (int igain=0;igain<ngain;igain++) { - CaloGain::CaloGain caloGain=CaloGain::INVALIDGAIN;; + CaloGain::CaloGain caloGain=CaloGain::INVALIDGAIN; if (!isTile) caloGain = static_cast<CaloGain::CaloGain> (igain); else { if (igain==0) caloGain=CaloGain::TILELOWLOW; diff --git a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx index dc6003f81fad83c7db6a3fa3e4b9a057bf5d9343..4ea82044f56d1c7ccfbb9f619e3c751385a56fd3 100644 --- a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx +++ b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx @@ -507,7 +507,7 @@ void set_zero_moments(CaloCluster *theCluster) { theCluster->insertMoment(CaloCluster::ENG_RECO_EMB0, 0.0); theCluster->insertMoment(CaloCluster::ENG_RECO_EME0, 0.0); theCluster->insertMoment(CaloCluster::ENG_RECO_TILEG3, 0.0); - theCluster->insertMoment(CaloCluster::ENG_RECO_DEAD_TOT, 0.0);; + theCluster->insertMoment(CaloCluster::ENG_RECO_DEAD_TOT, 0.0); for(size_t i_dm=0; i_dm < DeadMaterialCorrectionTool2::sDM; i_dm++) { CaloCluster::MomentType m_type = (CaloCluster::MomentType) (int(CaloCluster::ENG_RECO_DEAD_EMB0)+i_dm); theCluster->insertMoment(m_type, 0.0); diff --git a/Control/CxxUtils/Root/StringUtils.cxx b/Control/CxxUtils/Root/StringUtils.cxx index 7925c0f6c32fde54d3a04f507bced74707eca598..d23fec7f904ccfa3f6a04ccd75500804082a5e6b 100644 --- a/Control/CxxUtils/Root/StringUtils.cxx +++ b/Control/CxxUtils/Root/StringUtils.cxx @@ -587,7 +587,7 @@ namespace CxxUtils { } if(inputFormat == StringUtils::UNICODE){ // if the input is unicode, we need to take care of superscript and subscript; - std::string scriptreplaced;; + std::string scriptreplaced; scriptreplaced.reserve(2*input.size()); size_t pos = 0; while(pos < input.size()){ diff --git a/Control/SGComps/src/ProxyProviderSvc.cxx b/Control/SGComps/src/ProxyProviderSvc.cxx index 22cb5fe8c2188bdb44cdfbffbf4320a08603262b..90030813ef7ba906f3a1e168744f43f99afe654d 100644 --- a/Control/SGComps/src/ProxyProviderSvc.cxx +++ b/Control/SGComps/src/ProxyProviderSvc.cxx @@ -46,7 +46,7 @@ ProxyProviderSvc::initialize() if (!(service("EventPersistencySvc", m_pDataLoader, CREATEIF)).isSuccess()) { m_pDataLoader = 0; ATH_MSG_ERROR("Could not get pointer to Persistency Service"); - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } else { #ifdef DEBUGPPS ATH_MSG_VERBOSE("Got pointer to Persistency Service " << m_pDataLoader); diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h index cadf580bc47ae0d73e3a37a5fd2138b1621109d6..4ef6a3b26d6b75bfa26806486740d5719d497dd5 100644 --- a/Control/StoreGate/StoreGate/StoreGateSvc.h +++ b/Control/StoreGate/StoreGate/StoreGateSvc.h @@ -791,7 +791,7 @@ public: * *@code * m_sg->remap (ClassID_traits<T>::ID(), "A", "C", 0); - * m_sg->remap (ClassID_traits<T>::ID(), "B", "C", a.size());; + * m_sg->remap (ClassID_traits<T>::ID(), "B", "C", a.size()); @endcode */ template <class TKEY> diff --git a/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h index b5ddfa43ae4e86d95358152325ee2af1061e282d..7be9630ac746225e33363fa0c9287936fb6f0b7e 100644 --- a/Control/StoreGate/StoreGate/tools/SGImplSvc.h +++ b/Control/StoreGate/StoreGate/tools/SGImplSvc.h @@ -761,7 +761,7 @@ public: * *@code * m_sg->remap (ClassID_traits<T>::ID(), "A", "C", 0); - * m_sg->remap (ClassID_traits<T>::ID(), "B", "C", a.size());; + * m_sg->remap (ClassID_traits<T>::ID(), "B", "C", a.size()); @endcode */ template <class TKEY> diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx index fc3c7481b537be0fe0de73ea55968796cb0fd76b..a596d964048c2d5170cdbaf1f354b4cb7e36c44a 100644 --- a/Control/StoreGate/src/SGImplSvc.cxx +++ b/Control/StoreGate/src/SGImplSvc.cxx @@ -181,13 +181,13 @@ StatusCode SGImplSvc::initialize() { m_pDataLoader = 0; error() << "Could not get pointer to Persistency Service" << endmsg; - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } if (!(service("ClassIDSvc", m_pCLIDSvc, CREATEIF)).isSuccess()) { error() << "Could not get pointer to ClassID Service" << endmsg; - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } if (!m_pPPSHandle.empty()) { diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx index e9c193b3095ae81a89688071a8d90043b3950c85..fb25403aec48117592be46c9753ee22b8942f289 100644 --- a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx +++ b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx @@ -2366,7 +2366,7 @@ namespace dqutils { TH1F* h1tmpf(0); TH1F* h1num(0); TH1F* h1den(0); - TGraphAsymmErrors* h1tmpfg = new TGraphAsymmErrors();; + TGraphAsymmErrors* h1tmpfg = new TGraphAsymmErrors(); TString stmp = seff + seffg; h1num = 0; mf.get(sdir + "NumDenom/" + snum, h1num); diff --git a/DataQuality/DataQualityUtils/src/StatusFlagCOOLBase.cxx b/DataQuality/DataQualityUtils/src/StatusFlagCOOLBase.cxx index 3a0d07dbc48091064db763127541bd4691b3fe38..773131386014bdfe89b8813756844eae958774e6 100644 --- a/DataQuality/DataQualityUtils/src/StatusFlagCOOLBase.cxx +++ b/DataQuality/DataQualityUtils/src/StatusFlagCOOLBase.cxx @@ -141,7 +141,7 @@ dump(cool::ChannelSelection selection, std::string tag_name) { cool::IObjectIteratorPtr objects = m_coolFolder->browseObjects(m_since, m_until-1, selection, tag_name); while (objects->goToNext()) { const cool::IObject& element = objects->currentRef(); - std::cout << element << std::endl;; + std::cout << element << std::endl; } } catch (cool::Exception& e) { diff --git a/DataQuality/dqm_algorithms/src/OccupancyHoleFinder.cxx b/DataQuality/dqm_algorithms/src/OccupancyHoleFinder.cxx index a5c7c570e2a2e247c9adee5371373e5d0dc28884..0c453d9960185024cd072d847c29460b29565bfd 100644 --- a/DataQuality/dqm_algorithms/src/OccupancyHoleFinder.cxx +++ b/DataQuality/dqm_algorithms/src/OccupancyHoleFinder.cxx @@ -136,7 +136,7 @@ dqm_algorithms::OccupancyHoleFinder::execute( const std::string & name, std::string chamber_name = getChamberName(histo, (*itr).first); if(writes>100) break; if( (int) lbns.size() == active_lbns ){ - // out << "Completely dead chamber " << chamber_name << std::endl;; + // out << "Completely dead chamber " << chamber_name << std::endl; tags[TString::Format("Dead %s", chamber_name.c_str()).Data()] = -1; writes++; } diff --git a/Database/APR/CollectionUtilities/src/CollAppendBase.cpp b/Database/APR/CollectionUtilities/src/CollAppendBase.cpp index 1e246fafe47d0dd9623ca593fa6aef80137e0720..3960d8c9f0ac26d57394c1e4aff1102425e665fd 100644 --- a/Database/APR/CollectionUtilities/src/CollAppendBase.cpp +++ b/Database/APR/CollectionUtilities/src/CollAppendBase.cpp @@ -97,19 +97,19 @@ CollAppendBase::execute( std::vector<std::string> argv_v ) catch( pool::Exception& poolException ) { if( m_committed ) cout << "At least one COMMIT has occurred" << endl; - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; return 1; } catch( std::exception& exception ) { if( m_committed ) cout << "At least one COMMIT has occurred" << endl; - std::cerr << "std::exception: " << exception.what() << std::endl;; + std::cerr << "std::exception: " << exception.what() << std::endl; return 1; } catch( ... ) { if( m_committed ) cout << "At least one COMMIT has occurred" << endl; - std::cerr << "Unknown exception caught in main()." << std::endl;; + std::cerr << "Unknown exception caught in main()." << std::endl; return 1; } } diff --git a/Database/APR/CollectionUtilities/src/CollSplitByGUIDBase.cpp b/Database/APR/CollectionUtilities/src/CollSplitByGUIDBase.cpp index 2cf0c4347cd313cf4e7408972f03166c4da21b38..d99f8ebb092528dfaa5fcd9338d62fe0012fd93e 100644 --- a/Database/APR/CollectionUtilities/src/CollSplitByGUIDBase.cpp +++ b/Database/APR/CollectionUtilities/src/CollSplitByGUIDBase.cpp @@ -93,17 +93,17 @@ CollSplitByGUIDBase::execute( std::vector<std::string> argv_v ) } catch( pool::Exception& poolException ) { - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; return 1; } catch( std::exception& exception ) { - std::cerr << "std::exception: " << exception.what() << std::endl;; + std::cerr << "std::exception: " << exception.what() << std::endl; return 1; } catch( ... ) { - std::cerr << "Unknown exception caught in main()." << std::endl;; + std::cerr << "Unknown exception caught in main()." << std::endl; return 1; } } diff --git a/Database/APR/CollectionUtilities/src/CollectionMetadataParser.cpp b/Database/APR/CollectionUtilities/src/CollectionMetadataParser.cpp index 19d450c9e1a3ee2cd97b0fc2d73e5bcfb7f1dc2c..05467418370b3093095168d709d0192ca71eecae 100644 --- a/Database/APR/CollectionUtilities/src/CollectionMetadataParser.cpp +++ b/Database/APR/CollectionUtilities/src/CollectionMetadataParser.cpp @@ -93,7 +93,7 @@ bool CollectionMetadataParser::init(pool::ICollectionMetadata& cmd) bool CollectionMetadataParser::hasSelfData() const { - std::vector<ProvNode> Level = getParents(ProvNode(SELFIE));; + std::vector<ProvNode> Level = getParents(ProvNode(SELFIE)); std::vector<ProvNode>::const_iterator self_it= std::find(Level.begin(),Level.end(),SELFIE); return (self_it != Level.end()); } @@ -157,7 +157,7 @@ std::map<ProvNode, std::vector<ProvNode> > CollectionMetadataParser::getTree() c void CollectionMetadataParser::buildTree() { - std::vector<ProvNode> currentLevel = getParents(ProvNode(SELFIE));; + std::vector<ProvNode> currentLevel = getParents(ProvNode(SELFIE)); std::vector<ProvNode> nextLevel; m_numLevels = 0; std::vector<ProvNode> selfvec; selfvec.push_back(ProvNode(SELFIE)); diff --git a/Database/APR/CollectionUtilities/utilities/CollListAttrib.cpp b/Database/APR/CollectionUtilities/utilities/CollListAttrib.cpp index 3314b38b500826da8ba9d667be7980680caeb5b4..860686d749f3a941efd4bc3ae44c4a5df74bdf3e 100644 --- a/Database/APR/CollectionUtilities/utilities/CollListAttrib.cpp +++ b/Database/APR/CollectionUtilities/utilities/CollListAttrib.cpp @@ -102,7 +102,7 @@ int main(int argc, const char *argv[]) collection = collectionService.handle( srcinfo.name(i), srcinfo.type(i), srcinfo.connect(), readOnly ); } catch ( pool::Exception& poolException ) { - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; cout << "Unable to open collection " << srcinfo.name(i) << endl; cout << "---> STOPPING HERE" << endl; return 5; @@ -202,17 +202,17 @@ int main(int argc, const char *argv[]) } catch( pool::Exception& poolException ) { - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; return 1; } catch( std::exception& exception ) { - std::cerr << "std::exception: " << exception.what() << std::endl;; + std::cerr << "std::exception: " << exception.what() << std::endl; return 1; } catch( ... ) { - std::cerr << "Unknown exception caught in main()." << std::endl;; + std::cerr << "Unknown exception caught in main()." << std::endl; return 1; } } diff --git a/Database/APR/CollectionUtilities/utilities/CollListToken.cpp b/Database/APR/CollectionUtilities/utilities/CollListToken.cpp index b3266b2511a67fcbc80840ed7bac1a8717054d30..494b7113e19dc78e1a1ec1b4f6e60b36d3018f06 100644 --- a/Database/APR/CollectionUtilities/utilities/CollListToken.cpp +++ b/Database/APR/CollectionUtilities/utilities/CollListToken.cpp @@ -145,17 +145,17 @@ int main(int argc, const char *argv[]) } catch( pool::Exception& poolException ) { - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; return 1; } catch( std::exception& exception ) { - std::cerr << "std::exception: " << exception.what() << std::endl;; + std::cerr << "std::exception: " << exception.what() << std::endl; return 1; } catch( ... ) { - std::cerr << "Unknown exception caught in main()." << std::endl;; + std::cerr << "Unknown exception caught in main()." << std::endl; return 1; } } diff --git a/Database/APR/CollectionUtilities/utilities/CollQuery.cpp b/Database/APR/CollectionUtilities/utilities/CollQuery.cpp index 4284cf50200e2532670b9fdfc8fd8dffc30f4cb6..a82b7b49973dd02ec2d85cf62aad63d32c4d93cc 100644 --- a/Database/APR/CollectionUtilities/utilities/CollQuery.cpp +++ b/Database/APR/CollectionUtilities/utilities/CollQuery.cpp @@ -560,17 +560,17 @@ int main(int argc, const char *argv[]) } catch( pool::Exception& poolException ) { - std::cerr << "pool::Exception: " << poolException.what() << std::endl;; + std::cerr << "pool::Exception: " << poolException.what() << std::endl; return 1; } catch( std::exception& exception ) { - std::cerr << "std::exception: " << exception.what() << std::endl;; + std::cerr << "std::exception: " << exception.what() << std::endl; return 1; } catch( ... ) { - std::cerr << "Unknown exception caught in main()." << std::endl;; + std::cerr << "Unknown exception caught in main()." << std::endl; return 1; } } diff --git a/Database/APR/StorageSvc/src/DbReflex.cpp b/Database/APR/StorageSvc/src/DbReflex.cpp index 2f432e353a42c1b0d548613a3883497efc9fd1c0..c2eefcdc07074e18cecb72d8e81c768d4e012ba2 100644 --- a/Database/APR/StorageSvc/src/DbReflex.cpp +++ b/Database/APR/StorageSvc/src/DbReflex.cpp @@ -73,7 +73,7 @@ Guid DbReflex::guid(const TypeH& type) /* if( idstr.empty() ) { cout << "!! WARNING, type " << type.Name() << " does not have property ClassID" << endl - << "===========" << endl;; + << "===========" << endl; } cout << "GUID: Class " << type.Name() << " has GUID= " << idstr << endl; */ diff --git a/Database/AthenaPOOL/RootConversions/src/TConvertingBranchElement.cxx b/Database/AthenaPOOL/RootConversions/src/TConvertingBranchElement.cxx index cfc3dc5af5f6da244c6098e77f4dff96e780964f..753df227d8795bbf2345edf58fc4c7c2c29de536 100755 --- a/Database/AthenaPOOL/RootConversions/src/TConvertingBranchElement.cxx +++ b/Database/AthenaPOOL/RootConversions/src/TConvertingBranchElement.cxx @@ -1275,7 +1275,7 @@ Int_t TConvertingBranchElement::ReadSubBranches(Long64_t entry, void TConvertingBranchElement::Streamer(TBuffer& R__b) { TObjArray brsave; - Int_t type_save = 0;; + Int_t type_save = 0; if (!R__b.IsReading()) { if (fConvOrigType == -1) diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/UbeamHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/UbeamHandler.cxx index 62f9d86240a470c0aaaed65a926590d94d259d40..da2ba76f5fb88fdab326e2b1df7aa4c7e1d6a2a2 100644 --- a/DetectorDescription/AGDD/AGDDHandlers/src/UbeamHandler.cxx +++ b/DetectorDescription/AGDD/AGDDHandlers/src/UbeamHandler.cxx @@ -22,7 +22,7 @@ void UbeamHandler::ElementHandle() double w=getAttributeAsDouble("width",res); double sw=getAttributeAsDouble("small_width",res); double h=getAttributeAsDouble("heigth",res); - double sh=getAttributeAsDouble("small_heigth",res);; + double sh=getAttributeAsDouble("small_heigth",res); AGDDUbeam *b=new AGDDUbeam(name); b->SetMaterial(material); diff --git a/DetectorDescription/GeoModel/GeoModelKernel/src/GeoPgon.cxx b/DetectorDescription/GeoModel/GeoModelKernel/src/GeoPgon.cxx index 62b8d283de4f69a800b9751642dbd0ab06931e26..63d07db06c21560053fc2478f5a4d583535d8ccc 100755 --- a/DetectorDescription/GeoModel/GeoModelKernel/src/GeoPgon.cxx +++ b/DetectorDescription/GeoModel/GeoModelKernel/src/GeoPgon.cxx @@ -31,8 +31,8 @@ double GeoPgon::volume () const double sinAlpha = sin(alpha); for (size_t s = 0; s < getNPlanes () - 1; s++) { - double z2 = getZPlane (s);; - double z1 = getZPlane (s + 1);; + double z2 = getZPlane (s); + double z1 = getZPlane (s + 1); double fRmin1 = getRMinPlane (s + 1); double fRmin2 = getRMinPlane (s); double fRmax1 = getRMaxPlane (s + 1); diff --git a/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx b/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx index 7377f6c37acdbd3a99819b1c123b1814458d66f9..a0042e40fbfe3e34dcd503e2afeebf807d57f103 100644 --- a/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx +++ b/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx @@ -28,7 +28,7 @@ TextFileDBReader::readFile(const std::string & readFile) std::ifstream ifile; ifile.open(readFile.c_str()); if (!ifile) { - //std::cout << "Error opening file: " << readFile << std::endl;; + //std::cout << "Error opening file: " << readFile << std::endl; return false; } diff --git a/Event/EventOverlay/OverlayCommonAlgs/src/G4HitMerger.cxx b/Event/EventOverlay/OverlayCommonAlgs/src/G4HitMerger.cxx index 10012ead8fb3604a73115d876125e266c384a844..094de0e38f32218784ae3238e14105662fcd3ad2 100644 --- a/Event/EventOverlay/OverlayCommonAlgs/src/G4HitMerger.cxx +++ b/Event/EventOverlay/OverlayCommonAlgs/src/G4HitMerger.cxx @@ -124,7 +124,7 @@ StatusCode G4HitMerger::execute() // StatusCode sc(StatusCode::FAILURE); // if (! (sc = m_mergeSvc->retrieveSubEvtsData(truthCollKey, truthList)).isSuccess() ) { // msglog<<MSG::ERROR<< "execute: Can not find TimedTruthList with key "<< truthCollKey << endmsg; - // return StatusCode::RECOVERABLE;; + // return StatusCode::RECOVERABLE; // } // int nInputMcEventColls(truthList.size()); // //and check it is not empty diff --git a/Event/EventPrimitives/EventPrimitives/AmgMatrixPlugin.h b/Event/EventPrimitives/EventPrimitives/AmgMatrixPlugin.h index 114f10409f703f57a17314e38ea801038cb5240c..50429e3b978b8ecdac4209290c75829ce38d80d9 100644 --- a/Event/EventPrimitives/EventPrimitives/AmgMatrixPlugin.h +++ b/Event/EventPrimitives/EventPrimitives/AmgMatrixPlugin.h @@ -30,7 +30,7 @@ /**pseudorapidity method */ inline Scalar eta() const { EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(Matrix, 3) - double m = std::sqrt((*this).x() * (*this).x() + (*this).y() * (*this).y() + (*this).z() * (*this).z());; + double m = std::sqrt((*this).x() * (*this).x() + (*this).y() * (*this).y() + (*this).z() * (*this).z()); return 0.5*std::log((m+(*this).z())/(m-(*this).z())); } diff --git a/Event/EventTPCnv/src/EventInfoCnv_p3.cxx b/Event/EventTPCnv/src/EventInfoCnv_p3.cxx index 4670b25d0278048885654451d2af08a7eb79fd18..5fd30710836f87498d2fc91edcdb9f52a3363059 100644 --- a/Event/EventTPCnv/src/EventInfoCnv_p3.cxx +++ b/Event/EventTPCnv/src/EventInfoCnv_p3.cxx @@ -38,7 +38,7 @@ void EventInfoCnv_p3::persToTrans(const EventInfo_p3* pers, EventInfo* trans, Ms EventType *et = new EventType(); typeConv.persToTrans(i, et, (vers>>6)&0x003f, bugcompat ); - trans->setEventType (et);; + trans->setEventType (et); if ((vers>>12)&0x003f){ // if there is trigger info TriggerInfo *ti = new TriggerInfo(); diff --git a/Event/xAOD/xAODEgamma/Root/ElectronAccessors_v1.cxx b/Event/xAOD/xAODEgamma/Root/ElectronAccessors_v1.cxx index ea961ec37abad7b25a87ff31f4f1ab4d6438155d..c3a325786fb7c50ca75910069f375f75b8e18f82 100644 --- a/Event/xAOD/xAODEgamma/Root/ElectronAccessors_v1.cxx +++ b/Event/xAOD/xAODEgamma/Root/ElectronAccessors_v1.cxx @@ -37,7 +37,7 @@ namespace xAOD { DEFINE_ACCESSOR( float,deltaPhiRescaled0); DEFINE_ACCESSOR( float,deltaPhiRescaled1); DEFINE_ACCESSOR( float,deltaPhiRescaled2); - DEFINE_ACCESSOR( float,deltaPhiRescaled3);; + DEFINE_ACCESSOR( float,deltaPhiRescaled3); default: std::cerr << "xAOD::Electron ERROR Unknown float TrackCaloMatchType (" << type << ") requested" << std::endl; diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/ALFA_EventTPCnv/ALFA_LocRecEvent_p1.h b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/ALFA_EventTPCnv/ALFA_LocRecEvent_p1.h index 9b4313d25d55761e700281850f9f1d7c82eea5e3..8369df967c51e564e8d8370dd4e9cf38c0c588fc 100644 --- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/ALFA_EventTPCnv/ALFA_LocRecEvent_p1.h +++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/ALFA_EventTPCnv/ALFA_LocRecEvent_p1.h @@ -21,7 +21,7 @@ class ALFA_LocRecEvent_p1 m_fOverU=-9999.0; m_fOverV=-9999.0; m_iNumU=-1; - m_iNumV=-1;; + m_iNumV=-1; }; friend class ALFA_LocRecEventCnv_p1; diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx index 21b1a8d1193ac74e10062f308cb841d969d8dabb..b479ebedb1caf2f980338e23842118682749a31f 100644 --- a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx +++ b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx @@ -826,7 +826,7 @@ void ZDCPulseAnalyzer::DoFitCombined() theFitter->SetParameter(ipar + 1, s_combinedFitFunc->GetParName(ipar), s_combinedFitFunc->GetParameter(ipar), 0.01, parLimitLow, parLimitHigh); - // arglist[0] = ipar + 2;; + // arglist[0] = ipar + 2; // arglist[1] = s_combinedFitFunc->GetParameter(ipar); // theFitter->ExecuteCommand("SET PAR ", arglist, 2); diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.cxx index b251b010fca1659a15781007fa7362a3da279f38..571a653545e6bfba9dc8bf3b277f9c0bcf4936ed 100644 --- a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.cxx +++ b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.cxx @@ -445,7 +445,7 @@ void ZDCNLCalibration::TestCalibration(int side, std::string name) for (size_t power = 0; power < calib.weights[module].size(); power++) { calibAmpModule[module] += calib.weights[module][power]*ampPow; - ampPow *= amp;; + ampPow *= amp; } double energy = calibAmpModule[module]; diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.h b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.h index 6628fc7792dbfe62509db03e4fb033fb962d9a29..cc0230ff3c2ca8fd4171c525dce47ebb748f0a17 100644 --- a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.h +++ b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCNLCalibration.h @@ -214,7 +214,7 @@ private: for (size_t power = 0; power < calib.weights[module].size(); power++) { energy += calib.weights[module][power]*ampPow; - ampPow *= amp;; + ampPow *= amp; } } diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx index 44e4721ac414d5f639788aa281d676b51893349e..436131d8d62388b7d91a829053db84bff6695383 100644 --- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx +++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx @@ -963,7 +963,7 @@ StatusCode ZdcByteStreamReadV1V2Tool::processPpmStandardR3V1_() { m_subBlockHeader.module(), lut.first, lut.second, - m_ppFadcs[lut.first]));; + m_ppFadcs[lut.first])); } return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/BeamSpotPdf.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/BeamSpotPdf.cxx index 4eaceda3f36ac7072d1a377671381592f85e7fa1..60921d8c2424d2119230ad5ff90930ae352c6b7a 100644 --- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/BeamSpotPdf.cxx +++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/BeamSpotPdf.cxx @@ -188,7 +188,7 @@ Int_t BeamSpotPdf::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars return 0.5*pi*sqrt(wxx)*sqrt(wzz)* (TMath::Erf((m_mx-m_x.min(rangeName))/sqrt(2*wxx))-TMath::Erf((m_mx-m_x.max(rangeName))/sqrt(2*wxx))) *(TMath::Erf((m_mz-m_z.min(rangeName))/sqrt(2*wzz))-TMath::Erf((m_mz-m_z.max(rangeName))/sqrt(2*wzz))) - *exp(-0.5*dy*dy/(wyy));; + *exp(-0.5*dy*dy/(wyy)); } if (code==4){ //integrating over y,z @@ -196,7 +196,7 @@ Int_t BeamSpotPdf::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars return 0.5*pi*sqrt(wyy)*sqrt(wzz)* (TMath::Erf((m_my-m_y.min(rangeName))/sqrt(2*wyy))-TMath::Erf((m_my-m_y.max(rangeName))/sqrt(2*wyy))) *(TMath::Erf((m_mz-m_z.min(rangeName))/sqrt(2*wzz))-TMath::Erf((m_mz-m_z.max(rangeName))/sqrt(2*wzz))) - *exp(-0.5*dx*dx/(wxx));; + *exp(-0.5*dx*dx/(wxx)); } return 0 ; diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx index 67c1f76b47cb230fc4d95895b72236398cd87350..500cd87d0dc33d9033ea15c703920200c60a0c9f 100644 --- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx +++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotVertex.cxx @@ -1381,11 +1381,11 @@ std::map<std::string,double> InDetBeamSpotVertex::getParamMap() const { paramMap["tiltY"] = (m_getLLres ? m_pLL(4) : m_p(4)); paramMap["k"] = (m_getLLres ? m_pLL(8) : 0.); paramMap["posX"] = (m_getLLres ? m_pLL(1) + m_pLL(3)*z : m_p(1) + m_p(2)*z); - paramMap["posY"] = (m_getLLres ? m_pLL(2) + m_pLL(4)*z : m_p(3) + m_p(4)*z);; + paramMap["posY"] = (m_getLLres ? m_pLL(2) + m_pLL(4)*z : m_p(3) + m_p(4)*z); paramMap["posZ"] = (m_getLLres ? m_pLL(9) : m_zSolved); paramMap["sigmaX"] = (m_getLLres ? m_pLL(5) : m_def_sx); paramMap["sigmaY"] = (m_getLLres ? m_pLL(6) : m_def_sy); - paramMap["sigmaZ"] = (m_getLLres ? m_pLL(10) : m_def_sz);; + paramMap["sigmaZ"] = (m_getLLres ? m_pLL(10) : m_def_sz); paramMap["rhoXY"] = (m_getLLres ? m_pLL(7) : 0.); paramMap["nUsed"] = m_nUsed; diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteSvc.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteSvc.cxx index 35b3a7587f491645eb611bc4ac3a71d0e52ff9b0..2f7d38e0dd8c88f2866471ae19aa24f77971da29 100644 --- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteSvc.cxx +++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteSvc.cxx @@ -584,7 +584,7 @@ StatusCode SCTCalibWriteSvc::wrapUpDeadStrips(){ /////////////////////////////////////////////////////////////////////////////////////// StatusCode SCTCalibWriteSvc::wrapUpDeadChips(){ - if (recordAndStream(m_attrListColl_deadChip,s_deadChipFolderName,m_deadChipRecorded).isFailure()) return StatusCode::FAILURE;; + if (recordAndStream(m_attrListColl_deadChip,s_deadChipFolderName,m_deadChipRecorded).isFailure()) return StatusCode::FAILURE; if (registerCondObjectsWithErrMsg(s_deadChipFolderName, m_tagID4DeadChips).isFailure()) return StatusCode::FAILURE; return StatusCode::SUCCESS; } @@ -612,7 +612,7 @@ StatusCode SCTCalibWriteSvc::wrapUpRawOccupancy(){ /////////////////////////////////////////////////////////////////////////////////////// StatusCode SCTCalibWriteSvc::wrapUpBSErrors(){ - if (recordAndStream(m_attrListColl_BSErr, s_BSErrFolderName,m_BSErrRecorded).isFailure()) return StatusCode::FAILURE;; + if (recordAndStream(m_attrListColl_BSErr, s_BSErrFolderName,m_BSErrRecorded).isFailure()) return StatusCode::FAILURE; if (registerCondObjectsWithErrMsg(s_BSErrFolderName, m_tagID4BSErrors).isFailure()) return StatusCode::FAILURE; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhadd.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhadd.cpp index 7a1a510172cc5f0b6dbce52b1d5c6314447ed222..fd24d935c8ba7e90c13a3ff961437c37b78d71be 100644 --- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhadd.cpp +++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhadd.cpp @@ -1214,8 +1214,8 @@ int main(int argc, char *argv[]){ int npointsX = reshist1->GetNbinsX(); int npointsY = treshist1->GetNbinsY(); - TH1D** hslizesX = new TH1D*[npointsX];; - TH1D** hslizesY = new TH1D*[npointsY];; + TH1D** hslizesX = new TH1D*[npointsX]; + TH1D** hslizesY = new TH1D*[npointsY]; TVectorD tbins(npointsX); TVectorD rbins(npointsY); @@ -1451,8 +1451,8 @@ int main(int argc, char *argv[]){ - TH1D** hslizesArX = new TH1D*[npointsX];; - TH1D** hslizesArY = new TH1D*[npointsY];; + TH1D** hslizesArX = new TH1D*[npointsX]; + TH1D** hslizesArY = new TH1D*[npointsY]; TVectorD tbinsAr(npointsX); TVectorD rbinsAr(npointsY); for (int i=0;i<npointsX;i++) { diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhaddArray.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhaddArray.cpp index 47bfbcbb1b38b1d8487081658799ccb91450083e..e54d44bd4bb7f635647c312aea06372f2fb6fc6c 100644 --- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhaddArray.cpp +++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/bhaddArray.cpp @@ -906,8 +906,8 @@ int main(int argc, char *argv[]){ int npointsX = reshist1->GetNbinsX(); int npointsY = treshist1->GetNbinsY(); - TH1D** hslizesX = new TH1D*[npointsX];; - TH1D** hslizesY = new TH1D*[npointsY];; + TH1D** hslizesX = new TH1D*[npointsX]; + TH1D** hslizesY = new TH1D*[npointsY]; TVectorD tbins(npointsX); TVectorD rbins(npointsY); diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx index bc7df9805deada43787507dd08c3902ca2af83fc..4728142da481a6a3cd56b46f45b613d1c006a7b0 100644 --- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx +++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx @@ -1048,7 +1048,7 @@ TDirectory* Calibrator::Calibrate(TDirectory* dir, string key, string opt, calda //add the short straw correction here. In this way, the shift is only done when contants at STRAW level come from level above. if ((level == 6 && useshortstw) && fabs(data[key].det)<2 && (data[key].lay==0 && data[key].stl<9) ) data[key].t0=caldata_above->t0-0.75; data[key].t0err=caldata_above->t0err; - data[key].t0off=data[key].t0-caldata_above->t0 + data[key].rtt0;; + data[key].t0off=data[key].t0-caldata_above->t0 + data[key].rtt0; data[key].t0fittype = 4; // if (prnt) printf("T0 /\\ %7i %05.2f%+05.2f%+05.2f=%05.2f", data[key].ntres, caldata_above->t0, 0.0, 0.0, data[key].t0); if (prnt) printf("T0 /\\ %7i %05.2f%+05.2f%+05.2f=%05.2f", data[key].ntres, caldata_above->t0, caldata_above->oldt02, data[key].oldt02 , data[key].t0); diff --git a/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/src/CoolCoralClient.cpp b/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/src/CoolCoralClient.cpp index d1396ac4230c9af31e1844713a073233f36eb81e..51f3093a190f4bde878403e4fed81c7adccb3ab0 100644 --- a/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/src/CoolCoralClient.cpp +++ b/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/src/CoolCoralClient.cpp @@ -6818,7 +6818,7 @@ void COOLCORALClient::GetLastValues(Detector_t& detector){ rod.RODDetID = row2[4].data<int>(); rod.RODVMEslot = row2[5].data<int>(); rod.RODhalf = row2[6].data<int>(); - rod.EdgeSelect0 = row2[7].data<int>();; + rod.EdgeSelect0 = row2[7].data<int>(); rod.EdgeSelect1 = row2[8].data<int>(); rod.EdgeSelect2 = row2[9].data<int>(); rod.EdgeSelect3 = row2[10].data<int>(); @@ -8130,7 +8130,7 @@ Detector_t COOLCORALClient::GetHistValues(const std::string& tag,long long tstam rod.RODDetID = row2[4].data<int>(); rod.RODVMEslot = row2[5].data<int>(); rod.RODhalf = row2[6].data<int>(); - rod.EdgeSelect0 = row2[7].data<int>();; + rod.EdgeSelect0 = row2[7].data<int>(); rod.EdgeSelect1 = row2[8].data<int>(); rod.EdgeSelect2 = row2[9].data<int>(); rod.EdgeSelect3 = row2[10].data<int>(); @@ -9264,7 +9264,7 @@ COOLCORALClient::CompHistValues(const std::string& tag1,long long tstamp1, const rod1.RODDetID = row2a[4].data<int>(); rod1.RODVMEslot = row2a[5].data<int>(); rod1.RODhalf = row2a[6].data<int>(); - rod1.EdgeSelect0 = row2a[7].data<int>();; + rod1.EdgeSelect0 = row2a[7].data<int>(); rod1.EdgeSelect1 = row2a[8].data<int>(); rod1.EdgeSelect2 = row2a[9].data<int>(); rod1.EdgeSelect3 = row2a[10].data<int>(); @@ -9297,7 +9297,7 @@ COOLCORALClient::CompHistValues(const std::string& tag1,long long tstamp1, const rod2.RODDetID = row2b[4].data<int>(); rod2.RODVMEslot = row2b[5].data<int>(); rod2.RODhalf = row2b[6].data<int>(); - rod2.EdgeSelect0 = row2b[7].data<int>();; + rod2.EdgeSelect0 = row2b[7].data<int>(); rod2.EdgeSelect1 = row2b[8].data<int>(); rod2.EdgeSelect2 = row2b[9].data<int>(); rod2.EdgeSelect3 = row2b[10].data<int>(); diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ConditionsSummarySvc.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ConditionsSummarySvc.cxx index 0d80765a3b796afb7e3b7ce9a450a43a5590d016..bac05a75678876834fc741c6590795667497507f 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ConditionsSummarySvc.cxx +++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ConditionsSummarySvc.cxx @@ -135,7 +135,7 @@ SCT_ConditionsSummarySvc::isGood(const IdentifierHash & /*elementHash*/, const I SvcVector_t::const_iterator svc(m_svcHandles.begin()); SvcVector_t::const_iterator lastSvc(m_svcHandles.end()); for (;svc not_eq lastSvc;++svc){ - if ((*svc)->canReportAbout(InDetConditions::SCT_STRIP) and (not (*svc)->isGood(elementId))) return false;; + if ((*svc)->canReportAbout(InDetConditions::SCT_STRIP) and (not (*svc)->isGood(elementId))) return false; } } return true; diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_FlaggedConditionSvc.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_FlaggedConditionSvc.cxx index 481512e55c113ea2d870562ee1763dc348aa077b..d942a8997603904eaf2b4a941c0186782ba74f02 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_FlaggedConditionSvc.cxx +++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_FlaggedConditionSvc.cxx @@ -89,7 +89,7 @@ bool SCT_FlaggedConditionSvc::isGood(const Identifier& elementId, InDetCondition // Is this element good (by IdentifierHash)? bool SCT_FlaggedConditionSvc::isGood(const IdentifierHash& hashId){ - return (m_badIds.find(hashId) == m_badIds.end());; + return (m_badIds.find(hashId) == m_badIds.end()); } // Flag a wafer as bad (by IdentifierHash) with a reason diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawNeighbourSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawNeighbourSvc.cxx index 13b3bfeb9e654be732c656b15392e3491961cff2..6ce8528eac5390bd9b2ce34650f249c329a17ab5 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawNeighbourSvc.cxx +++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawNeighbourSvc.cxx @@ -193,7 +193,7 @@ StatusCode TRT_StrawNeighbourSvc::initialize() dummy1.clear(); - dummy12.clear();; + dummy12.clear(); while(layer == 0) { const IRDBRecord* RDBVars__TRTElec = (*RDB_TRTElec)[straw]; layer = RDBVars__TRTElec->getInt("LAYER"); @@ -219,7 +219,7 @@ StatusCode TRT_StrawNeighbourSvc::initialize() dummy2.clear(); - dummy22.clear();; + dummy22.clear(); previous_pad=1; while(layer == 1) { const IRDBRecord* RDBVars__TRTElec = (*RDB_TRTElec)[straw]; @@ -247,7 +247,7 @@ StatusCode TRT_StrawNeighbourSvc::initialize() dummy3.clear(); - dummy32.clear();; + dummy32.clear(); previous_pad=1; while(layer == 2) { if (straw>1641) break;// return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx index 419410bd5df303e08c1bdc6777ec1accfb1f8711..ad75baff24c731274ca324245c882969211e76d3 100644 --- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx +++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx @@ -110,7 +110,7 @@ StatusCode InDetDD::BLM_Builder::build(GeoVPhysVol* pv) // ATH_MSG_INFO("BLMBuilder building..."); //commented out by D.Dobos on request by M.Elsing const StoredMaterialManager * materialManager; - const AbsMaterialManager * mat_mgr = 0;; + const AbsMaterialManager * mat_mgr = 0; if (StatusCode::SUCCESS == detStore()->retrieve(materialManager, std::string("MATERIALS"))) { mat_mgr = materialManager; } diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx index 8c7c0010497ecd7859622523bf4bb3aaa2d58724..301a75ec9edcfd01da2cd068e5f593d42f44122e 100755 --- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx +++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx @@ -271,7 +271,7 @@ GeoPhysVol* BLM_Wall::BuildLayerIII(double thick, const GeoMaterial* material) const GeoShapeSubtraction& blm1 = blmWallBox->subtract(((*blmWallHole) << offset1)); const GeoShapeSubtraction& blm2 = blm1.subtract(((*blmWallHole) << offset2)); const GeoShapeSubtraction& blm3 = blm2.subtract(((*blmWallHole) << offset3)); - const GeoShapeSubtraction& blm4 = blm3.subtract(((*blmWallHole) << offset4));; + const GeoShapeSubtraction& blm4 = blm3.subtract(((*blmWallHole) << offset4)); const GeoShapeSubtraction& blmFinal = blm4.subtract(((*blmWallHole1) << offset5)); const GeoLogVol* blmWallLog = new GeoLogVol("blmWallLog", &blmFinal, material); @@ -304,7 +304,7 @@ GeoPhysVol* BLM_Wall::BuildLayerIV(double thick, const GeoMaterial* material) const GeoShapeSubtraction& blm1 = blmWallBox->subtract(((*blmWallHole) << offset1)); const GeoShapeSubtraction& blm2 = blm1.subtract(((*blmWallHole) << offset2)); const GeoShapeSubtraction& blm3 = blm2.subtract(((*blmWallHole) << offset3)); - const GeoShapeSubtraction& blm4 = blm3.subtract(((*blmWallHole) << offset4));; + const GeoShapeSubtraction& blm4 = blm3.subtract(((*blmWallHole) << offset4)); const GeoShapeSubtraction& blm5 = blm4.subtract(((*blmWallHole1) << offset5)); const GeoShapeSubtraction& blmFinal = blm5.subtract(((*blmWallHole2) << offset6)); @@ -331,7 +331,7 @@ GeoPhysVol* BLM_Wall::BuildLayerV(double thick, const GeoMaterial* material) const GeoShapeSubtraction& blm1 = blmWallBox->subtract(((*blmWallHole) << offset1)); const GeoShapeSubtraction& blm2 = blm1.subtract(((*blmWallHole) << offset2)); const GeoShapeSubtraction& blm3 = blm2.subtract(((*blmWallHole) << offset3)); - const GeoShapeSubtraction& blmFinal = blm3.subtract(((*blmWallHole) << offset4));; + const GeoShapeSubtraction& blmFinal = blm3.subtract(((*blmWallHole) << offset4)); const GeoLogVol* blmWallLog = new GeoLogVol("blmWallLog", &blmFinal, material); GeoPhysVol* blmWallPhys = new GeoPhysVol(blmWallLog); diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_ForwardModuleSideDesign.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_ForwardModuleSideDesign.cxx index b7f21ec2df4daeba549ad22f8d32ca2f01f78285..61bbd99a9e9733cac5b51b7ac3d4baac4151b343 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_ForwardModuleSideDesign.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_ForwardModuleSideDesign.cxx @@ -86,7 +86,7 @@ bool SCT_ForwardModuleSideDesign::inActiveArea(const SiLocalPosition &chargePos, double SCT_ForwardModuleSideDesign::scaledDistanceToNearestDiode(const SiLocalPosition &chargePos) const { const SCT_ForwardPolarPosition polar=m_frame.polarFromCartesian(chargePos); - return m_geometry.scaledDistanceToNearestDiode(polar);; + return m_geometry.scaledDistanceToNearestDiode(polar); } diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx index 620408c3871294d03c949f177352d3613faef5c7..4cdd9be8845dca234b51c23f38a3b47e14ad0eab 100644 --- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx +++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx @@ -75,7 +75,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) { } const GeoMaterial* air = m_mat_mgr->getMaterial("std::Air"); const GeoLogVol* envelopeLog = new GeoLogVol("Pixel",envelopeShape,air); - GeoFullPhysVol* envelopePhys = new GeoFullPhysVol(envelopeLog);; + GeoFullPhysVol* envelopePhys = new GeoFullPhysVol(envelopeLog); GeoPixelServices * pixServices = 0; if(m_gmt_mgr->DoServices() ) { diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx index 208a1e491fa1308f684351a64d76d4ef120bdc87..9639f73e2b973506f735c9bf449bbbc1e98b1743 100644 --- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx +++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.cxx @@ -138,6 +138,6 @@ SCT_TestDistortionsTool::execute(){ StatusCode SCT_TestDistortionsTool::finalize(){ - msg(MSG::INFO)<<"finalize()"<<endmsg;; + msg(MSG::INFO)<<"finalize()"<<endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx index 43d72985548eaf137907fd3d1560cc1506a0a0fc..b64748d8743cd1dd807fbca4a8808c71c9c2e877 100755 --- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx +++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx @@ -2190,7 +2190,7 @@ const GeoShape * TRTDetectorFactory_Full::makeModule ( double length, CLHEP::Hep // instead. // // (Whether the involved diagonal is 2-4 or 1-3 depends on the sign). - double commonSide = (delta14.mag() + delta23.mag() + (sign==1?delta24.mag():delta13.mag()) ) / 3.;; + double commonSide = (delta14.mag() + delta23.mag() + (sign==1?delta24.mag():delta13.mag()) ) / 3.; double base1 = delta12.mag(); // Inner base double base2 = delta34.mag(); // Outer base diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx index 93bf93ddffa69e5f96aa75dbbabdea09febe1cb5..187a7de6c9780bf492719327577a2f9af980eb3c 100755 --- a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx +++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx @@ -143,7 +143,7 @@ void ReadSiDetectorElements::printAllElements() { for (iter = m_manager->getDetectorElementBegin(); iter != m_manager->getDetectorElementEnd(); ++iter){ const SiDetectorElement * element = *iter; if (element) { - cout << m_idHelper->show_to_string(element->identify()) << endl;; + cout << m_idHelper->show_to_string(element->identify()) << endl; // The id helper is also available through the elements // // element->getIdHelper()->show(element->identify()); diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx index 9c6d5e26992657c766f7654ff4d3fb3dc86f8233..3574a1d6e1eaff473c58c25646f91a22992854be 100755 --- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx +++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx @@ -1462,7 +1462,7 @@ StatusCode IDAlignMonResiduals::fillHistograms() /* Estimates the global Z position of a TRT barrel hit by using the x,y position of the straw and the track theta */ float hitZ = -999.; - Amg::Vector3D center(-9999.,-9999.,-9999);; + Amg::Vector3D center(-9999.,-9999.,-9999); if (RawDriftCircle!=NULL) center = RawDriftCircle->detectorElement()->surface( id ).center() ; diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx index b865073ad67adbad7f4840b29b102ffba719d6ac..78e474e9b01c406e62ccadcfcc27102ee058a2c7 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx @@ -687,7 +687,7 @@ StatusCode InDetGlobalTrackMonTool::fillHistograms() } if ( summary->get(Trk::numberOfTRTHits) + summary->get(Trk::numberOfTRTOutliers) == 0 ) { - nNoTRText++;; + nNoTRText++; m_Trk_noTRText_frac_LB->Fill(m_manager->lumiBlockNumber(), 1); } else diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx index 4df06c1c19e44063b0e43d55d8f6ad5714125715..e3ac27c4dfa5516039f110992af0f40ef606e19e 100755 --- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx +++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx @@ -688,7 +688,7 @@ const xAOD::VertexContainer* SecVxContainer(0); m_massVPtBinHistos[quickBin]->Fill(ksMass/1000.); // if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "histo[" << quickBin << "]->GetEntries() = " << m_massVPtBinHistos[quickBin]->GetEntries() << endmsg; - double radius = secVx_elem->auxdata< float >("Rxy");; + double radius = secVx_elem->auxdata< float >("Rxy"); m_radius->Fill(radius); diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx index 0f6ddc428fa650d3f1ef55ee5de8d8bac034acf4..909f67a8772f011d0bfb4cf9264322a488e2c510 100644 --- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx +++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx @@ -448,7 +448,7 @@ void TrtToolBetaLiklihood::TRT_LoadPriors(std::string priorFileName) { for (j=0; j<24; j++) { LBitProb[l][i][k][j] = tmp->GetBinContent(j+1); if (LBitProb[l][i][k][j] == 0) { - LBitProb[l][i][k][j] = 1.E-6;; + LBitProb[l][i][k][j] = 1.E-6; } } } diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/InDetV0FinderTool.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/InDetV0FinderTool.cxx index 7f9242ca8f609e8dce13c21044490e69cdd343c4..a098253e76dfd2f643dd224bb97808ee620737ff 100755 --- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/InDetV0FinderTool.cxx +++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/InDetV0FinderTool.cxx @@ -272,7 +272,7 @@ StatusCode InDetV0FinderTool::performSearch(xAOD::VertexContainer*& v0Container, if ( !TPC.isValid() ) { ATH_MSG_ERROR("Input TrackParticle collection is invalid!"); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } ATH_MSG_DEBUG("Track particle container size " << TPC->size()); diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetMultiPriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetMultiPriVxFinderTool.cxx index 2f18981182807ccf1e4f376b154b7ef4e913987d..59316c0b6af824167bdfee529143f05085b5ef60 100644 --- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetMultiPriVxFinderTool.cxx +++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetMultiPriVxFinderTool.cxx @@ -509,7 +509,7 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetMultiPriVxFind } //end loop over vector of vector of tracks in which fit was performed - msg(MSG::DEBUG) << " Vtx size: "<<theVertexContainer->size()<< endmsg;; + msg(MSG::DEBUG) << " Vtx size: "<<theVertexContainer->size()<< endmsg; for (size_t i = 0 ; i < theVertexContainer->size(); i++) { if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " Vtx: " << i << diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetPriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetPriVxFinderTool.cxx index 7436f0c6aefb46b23c952eb1286237a92bfe56fa..d7e93975a1a08cf3471a0adc56db71663b4c7aa6 100755 --- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetPriVxFinderTool.cxx +++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetPriVxFinderTool.cxx @@ -150,7 +150,7 @@ namespace InDet if ( m_iBeamCondSvc.retrieve().isFailure() ) { msg(MSG::ERROR) << "Could not find BeamCondSvc." << endmsg; - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } msg(MSG::INFO) << "Initialization successful" << endmsg; diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx index 0c45b0bf473f1d13ec834460ba19a1a27d0b1371..c2159186a1b3827ad23a873713f233496a05e10f 100755 --- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx +++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx @@ -541,7 +541,7 @@ namespace InDet { int rowMin = int(2*(element->width()/element->phiPitch()))+1; int rowMax = 0; - int colMin = int(2*(element->length()/element->etaPitch()))+1;; + int colMin = int(2*(element->length()/element->etaPitch()))+1; int colMax = 0; for (; rdosBegin!= rdosEnd; ++rdosBegin) @@ -705,7 +705,7 @@ PixelCluster* MergedPixelsTool::makeCluster ATH_MSG_ERROR("Dynamic cast failed at "<<__LINE__<<" of MergedPixelsTool."); return nullptr; } - int rowMin = int(2*(design->width()/design->phiPitch()))+1;; + int rowMin = int(2*(design->width()/design->phiPitch()))+1; int rowMax = 0; int colMin = int(2*(design->length()/design->etaPitch()))+1; int colMax = 0; diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnPixelClusterSplitter.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnPixelClusterSplitter.cxx index 651263b4c6e106921bb7b0f70be1f4ed110e5e75..6564f5e93a4c512528e5d144c49e77466f67325a 100644 --- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnPixelClusterSplitter.cxx +++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnPixelClusterSplitter.cxx @@ -161,7 +161,7 @@ std::vector<InDet::PixelClusterParts> InDet::NnPixelClusterSplitter::splitCluste if (!pixelIDp->is_blayer(pixelId)) { //return empty object... - ATH_MSG_VERBOSE(" Cluster not on b-layer. Return empty object-->back to default clustering." );; + ATH_MSG_VERBOSE(" Cluster not on b-layer. Return empty object-->back to default clustering." ); return std::vector<InDet::PixelClusterParts>(); } @@ -192,7 +192,7 @@ std::vector<InDet::PixelClusterParts> InDet::NnPixelClusterSplitter::splitCluste double splitProb3=splitProb3rel/(splitProb3rel+splitProb2); - ATH_MSG_VERBOSE( " SplitProb -->2 " << splitProb2 << " SplitProb -->3 " << splitProb3 );; + ATH_MSG_VERBOSE( " SplitProb -->2 " << splitProb2 << " SplitProb -->3 " << splitProb3 ); int nParticles=1; @@ -209,7 +209,7 @@ std::vector<InDet::PixelClusterParts> InDet::NnPixelClusterSplitter::splitCluste } - ATH_MSG_VERBOSE( " Decided for n. particles: " << nParticles << "." );; + ATH_MSG_VERBOSE( " Decided for n. particles: " << nParticles << "." ); std::vector<Amg::Vector2D> allLocalPositions; std::vector<Amg::MatrixX> allErrorMatrix; diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthPixelClusterSplitter.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthPixelClusterSplitter.cxx index 5330993c7c0b154c826ad11c3483bc1961dc759c..eb26b555108ca611ff9eb4e8bed5eacc7dda190c 100644 --- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthPixelClusterSplitter.cxx +++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthPixelClusterSplitter.cxx @@ -149,7 +149,7 @@ std::vector<InDet::PixelClusterParts> InDet::TruthPixelClusterSplitter::splitClu if (!pixelIDp->is_blayer(pixelId)) { //return empty object... - ATH_MSG_VERBOSE(" Cluster not on b-layer. Return empty object-->back to default clustering." );; + ATH_MSG_VERBOSE(" Cluster not on b-layer. Return empty object-->back to default clustering." ); return std::vector<InDet::PixelClusterParts>(); } @@ -180,7 +180,7 @@ std::vector<InDet::PixelClusterParts> InDet::TruthPixelClusterSplitter::splitClu double splitProb3=splitProb3rel/(splitProb3rel+splitProb2); - ATH_MSG_VERBOSE( " SplitProb -->2 " << splitProb2 << " SplitProb -->3 " << splitProb3 );; + ATH_MSG_VERBOSE( " SplitProb -->2 " << splitProb2 << " SplitProb -->3 " << splitProb3 ); int nParticles=1; @@ -197,7 +197,7 @@ std::vector<InDet::PixelClusterParts> InDet::TruthPixelClusterSplitter::splitClu } - ATH_MSG_VERBOSE( " Decided for n. particles: " << nParticles << "." );; + ATH_MSG_VERBOSE( " Decided for n. particles: " << nParticles << "." ); std::vector<Amg::Vector2D> allLocalPositions; std::vector<Amg::MatrixX> allErrorMatrix; diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx index a1786dc3fc9d9b817ff8e19066db7613109c4cc2..dfda6f280504e8c1246ff2a873a3e78d49803caf 100755 --- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx +++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx @@ -1132,7 +1132,7 @@ InDet::SiTrajectoryElement_xk::trackStateOnSurface (bool change,bool cov,bool mu const Trk::TrackParameters * tpn = 0; if(!change) tpn = trackParameters (cov,Q); else tpn = trackParametersWithNewDirection(cov,Q); - if(!tpn) break;; + if(!tpn) break; const Trk::FitQualityOnSurface * fqn = new Trk::FitQualityOnSurface(m_linkB[i].xi2(),m_ndf); const Trk::MeasurementBase * ron = m_riotool->correct(*m_linkB[i].cluster(),*tp); diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk/TRT_ExtensionDriftCircleLink_xk.h b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk/TRT_ExtensionDriftCircleLink_xk.h index 5bc1c63d368915a5a933b963da1310879ab0b742..4cc1aa51c4411c3400f597ba721ecbbc5fae0343 100755 --- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk/TRT_ExtensionDriftCircleLink_xk.h +++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk/TRT_ExtensionDriftCircleLink_xk.h @@ -127,7 +127,7 @@ namespace InDet{ inline void TRT_ExtensionDriftCircleLink_xk::set (const int& n,double& d,double& im,double& zl, double& s,double& sd,double& sz) { - set(n,d,im,zl,s); m_sdistance = sd; m_szlocal = sz;; + set(n,d,im,zl,s); m_sdistance = sd; m_szlocal = sz; } inline void TRT_ExtensionDriftCircleLink_xk::set diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx index 8c11c750b41b573402ad7aec479841c517af6382..6ba5fa86e1b11b19229b99536955cbd28886ecbc 100755 --- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx +++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx @@ -142,7 +142,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize() StatusCode InDet::TrackClusterAssValidation::execute_r(const EventContext& ctx) const { - if(!m_usePIX && !m_useSCT) return StatusCode::SUCCESS;; + if(!m_usePIX && !m_useSCT) return StatusCode::SUCCESS; EventData_t event_data(m_tracklocation.size() ); std::vector<SG::ReadHandle<PRD_MultiTruthCollection> > read_handle; diff --git a/InnerDetector/InDetValidation/PixelRTT/src/ResPullValidation.cxx b/InnerDetector/InDetValidation/PixelRTT/src/ResPullValidation.cxx index fcf4a751480f0abf1bd003f8efc6eabdc79b9603..a168d64ad974d17439c15b806d9add3cdadb6ea5 100644 --- a/InnerDetector/InDetValidation/PixelRTT/src/ResPullValidation.cxx +++ b/InnerDetector/InDetValidation/PixelRTT/src/ResPullValidation.cxx @@ -285,7 +285,7 @@ int ResPullValidation::Analyze(TDirectory *ref_file){ else if( chdir(currpath)!=0) { std::stringstream message; message << "Failed to enter current directory!"; - throw std::runtime_error(message.str());; + throw std::runtime_error(message.str()); } delete currpath; delete reference; diff --git a/InnerDetector/InDetValidation/PixelRTT/src/TrackValidation.cxx b/InnerDetector/InDetValidation/PixelRTT/src/TrackValidation.cxx index 6eb4c31b1d7bd27e3f16a9073c0b8b3b380bf610..c0cacd451cc6ad3a301e8769f01f7b148d53801e 100644 --- a/InnerDetector/InDetValidation/PixelRTT/src/TrackValidation.cxx +++ b/InnerDetector/InDetValidation/PixelRTT/src/TrackValidation.cxx @@ -205,7 +205,7 @@ int CosmicTrackValidation::Analyze(TDirectory *ref_file){ else if( chdir(currpath)!=0) { std::stringstream message; message << "Failed to enter current directory!"; - throw std::runtime_error(message.str());; + throw std::runtime_error(message.str()); } delete currpath; diff --git a/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx b/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx index 33c143f040d97c3ced732f0c72aee921920efacc..3c1750b4f9235f54b52cd8afb01967c000dbb7ad 100644 --- a/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx +++ b/LArCalorimeter/LArCafJobs/src/LArHECNoise.cxx @@ -304,7 +304,7 @@ StatusCode LArHECNoise::execute() { for(unsigned l=0; l<lraw->size(); ++l) { if((*lraw)[l].identify() == hid) { m_nt_e = (*lraw)[l].energy(); - m_nt_t = (*lraw)[l].time()*1e-3;; + m_nt_t = (*lraw)[l].time()*1e-3; m_nt_quality = (*lraw)[l].quality(); break; } diff --git a/LArCalorimeter/LArCalibUtils/src/LArPedestal.cxx b/LArCalorimeter/LArCalibUtils/src/LArPedestal.cxx index bb454784576c41f38124eefd634c2dcb56cb567d..7472412af63a3950302854ce0f204d0902844d0d 100755 --- a/LArCalorimeter/LArCalibUtils/src/LArPedestal.cxx +++ b/LArCalorimeter/LArCalibUtils/src/LArPedestal.cxx @@ -144,7 +144,7 @@ double LArPedestal::get_rms(const unsigned isample) const return 0; //const int nsamples = m_sum.size(); const double x = m_sum[isample]/double(m_nped); - const double y = m_sumSquares[isample]/double(m_nped);; + const double y = m_sumSquares[isample]/double(m_nped); return sqrt(y-x*x); } diff --git a/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx b/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx index 603252c64b06dddefa8088b7e2024497f518d71d..457b9751275402f82cc2e5a37b7f57adeed878a4 100755 --- a/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx +++ b/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx @@ -757,7 +757,7 @@ TF1 * LArPhysWaveHECTool::CaliWave2PhysWaveHEC(TProfile *pcal, Double_t *par, do for(i=1; i<=nbin; ++i) { x[i-1] = pcal->GetBinCenter(i); y[i-1] = pcal->GetBinContent(i); - //FT std::cout<<"calib2phys: CALIWAVE: x[i-1]Time="<<x[i-1]<<" y[i-1]AmplCalib="<<y[i-1]<<std::endl;; + //FT std::cout<<"calib2phys: CALIWAVE: x[i-1]Time="<<x[i-1]<<" y[i-1]AmplCalib="<<y[i-1]<<std::endl; if(i5bin == 0 && y[i-1] > mcut) i5bin = i; }; //std::cout<<std::endl; @@ -893,7 +893,7 @@ TF1 * LArPhysWaveHECTool::CaliWave2PhysWaveHEC(TProfile *pcal, Double_t *par, do //std::cout<<"What happens after pointer assigment?"<<std::endl; //for(unsigned int i=1;i<=nbin; ++i) - //std::cout<<"xTime="<<x[i-1]<<" yAmplCalib="<<y[i-1]<<" AmplPhys="<<fitfun->Eval(x[i-1])<<std::endl;; + //std::cout<<"xTime="<<x[i-1]<<" yAmplCalib="<<y[i-1]<<" AmplPhys="<<fitfun->Eval(x[i-1])<<std::endl; return fitfun; } diff --git a/LArCalorimeter/LArCalibUtils/src/LArTimePhysPrediction.cxx b/LArCalorimeter/LArCalibUtils/src/LArTimePhysPrediction.cxx index 234fe8de24cba53839997139a3d4d7ce164be385..6d1f33eac3ef33681f55eb9a3dc1e44578e3391a 100755 --- a/LArCalorimeter/LArCalibUtils/src/LArTimePhysPrediction.cxx +++ b/LArCalorimeter/LArCalibUtils/src/LArTimePhysPrediction.cxx @@ -354,7 +354,7 @@ StatusCode LArTimePhysPrediction::stop() if((emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==15 && real_eta>0 && slot>10) || (emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==16 && real_eta>0 && slot<3)) DeltaTTC=m_vDeltaTTC_ECA_SPEC[2][1]; if(hecId->is_lar_hec(id) && abs(barrel_ec)==1 && FT==16 && real_eta>0) DeltaTTC=m_vDeltaTTC_ECA_SPEC[2][2]; //A FTs 21/22 - if(emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==21 && real_eta>0 && slot<11) DeltaTTC=m_vDeltaTTC_ECA_SPEC[3][0];; + if(emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==21 && real_eta>0 && slot<11) DeltaTTC=m_vDeltaTTC_ECA_SPEC[3][0]; if((emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==21 && real_eta>0 && slot>10) || (emId->is_lar_em(id) && abs(barrel_ec)==1 && FT==21 && real_eta>0 && slot<3)) DeltaTTC=m_vDeltaTTC_ECA_SPEC[3][1]; if(hecId->is_lar_hec(id) && abs(barrel_ec)==1 && FT==22 && real_eta>0) DeltaTTC=m_vDeltaTTC_ECA_SPEC[3][2]; //C FTs 2/3 diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx index a43800b8b0e3165b36f1b983706cd5eb1d31b766..3fd4b9b91cab10217bae8ae16f447c8914a92157 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx @@ -150,7 +150,7 @@ void LArRodBlockPhysicsV0::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EIndex) { m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - << " m_EIndex=" << m_EIndex << endmsg;; + << " m_EIndex=" << m_EIndex << endmsg; return; } //Fill up missing channels with zeros: @@ -166,7 +166,7 @@ void LArRodBlockPhysicsV0::setNextEnergy(const int32_t energy, const int32_t tim { if (m_EIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - << m_EIndex << " channels into a FEB!" <<endmsg;; + << m_EIndex << " channels into a FEB!" <<endmsg; return; } LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx index 2ded1e39c7098421ba4f9b8b2932a8c63d8ce840..0b9af1965093ba0c0573917bc4ed73ad0c8f6ba4 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx @@ -150,7 +150,7 @@ void LArRodBlockPhysicsV1::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EIndex) { m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - << " m_EIndex=" << m_EIndex << endmsg;; + << " m_EIndex=" << m_EIndex << endmsg; return; } //Fill up missing channels with zeros: @@ -165,7 +165,7 @@ void LArRodBlockPhysicsV1::setNextEnergy(const int32_t energy, const int32_t tim { if (m_EIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - << m_EIndex << " channels into a FEB!" <<endmsg;; + << m_EIndex << " channels into a FEB!" <<endmsg; return; } LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx index f101fe5fee022b21a562d168d366f8b8c4559bbc..4148926d6ac3c1b337211d89a58414e9231692e5 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx @@ -184,7 +184,7 @@ void LArRodBlockPhysicsV2::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EIndex) { m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - << " m_EIndex=" << m_EIndex << endmsg;; + << " m_EIndex=" << m_EIndex << endmsg; return; } //Fill up missing channels with zeros: @@ -199,7 +199,7 @@ void LArRodBlockPhysicsV2::setNextEnergy(const int32_t energy, const int32_t tim { if (m_EIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - << m_EIndex << " channels into a FEB!" <<endmsg;; + << m_EIndex << " channels into a FEB!" <<endmsg; return; } LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx index 81e0bead8928bb514ba0acfe9e0b4cfbf7b28df1..fd663ffb786181082c11fc03746d95175fb7fbe3 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx @@ -232,7 +232,7 @@ void LArRodBlockPhysicsV3::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EnergyIndex) { m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - << " m_EnergyIndex=" << m_EnergyIndex << endmsg;; + << " m_EnergyIndex=" << m_EnergyIndex << endmsg; return; } @@ -312,7 +312,7 @@ void LArRodBlockPhysicsV3::setNextEnergy(const uint16_t energy,const int16_t tim if (m_EnergyIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - << m_EnergyIndex << " channels into a FEB!" <<endmsg;; + << m_EnergyIndex << " channels into a FEB!" <<endmsg; return; } LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EnergyIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx index e2e0e7d2a80c240a7a923b3a6119707d9fc4b8e6..002b18a2dedb4d9aa2e3578b7695710c343f4995 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx @@ -739,7 +739,7 @@ void LArRodBlockPhysicsV5::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EnergyIndex) { //*m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - // << " m_EnergyIndex=" << m_EnergyIndex << endmsg;; + // << " m_EnergyIndex=" << m_EnergyIndex << endmsg; return; } @@ -802,7 +802,7 @@ void LArRodBlockPhysicsV5::setNextEnergy(const uint16_t energy,const int16_t tim { if (m_EnergyIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {//*m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - // << m_EnergyIndex << " channels into a FEB!" <<endmsg;; + // << m_EnergyIndex << " channels into a FEB!" <<endmsg; return; } //LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EnergyIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx index fb5e66ec7a460a4d561d5aed7d917556fea727a7..1b11e2db6b3eb5071a92a039637afdaaffd352b6 100644 --- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx +++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx @@ -750,7 +750,7 @@ void LArRodBlockPhysicsV6::setNextEnergy(const int channel, const int32_t energy //In the latter case, we fill up the missing channels with zero if (rcNb<m_EnergyIndex) { //*m_logstr << MSG::ERROR << "LArRODBlockStructure ERROR: Internal error. Channels not ordered correctly. rcNb=" << rcNb - // << " m_EnergyIndex=" << m_EnergyIndex << endmsg;; + // << " m_EnergyIndex=" << m_EnergyIndex << endmsg; return; } @@ -813,7 +813,7 @@ void LArRodBlockPhysicsV6::setNextEnergy(const uint16_t energy,const int16_t tim { if (m_EnergyIndex>=m_channelsPerFEB) //Use m_EIndex to count total number of channels {//*m_logstr << MSG::ERROR << "LArRodBlockStructure ERROR: Attempt to write Energy for channel " - // << m_EnergyIndex << " channels into a FEB!" <<endmsg;; + // << m_EnergyIndex << " channels into a FEB!" <<endmsg; return; } //LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EnergyIndex << ". E=" << energy); diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx index 0abe2bdc1130ef73c64db196648d78df7330ce73..2cbe897cb9f2002111132946200a438540abb81d 100644 --- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx +++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx @@ -1043,7 +1043,7 @@ namespace LArG4 { LArG4Identifier Geometry::CalculateECAMIdentifier(const G4Step* a_step, const G4int indECAM, const bool inSTAC, int zside) const { - LArG4Identifier result = LArG4Identifier();; + LArG4Identifier result = LArG4Identifier(); // Get all the information about the step diff --git a/LArCalorimeter/LArG4/LArG4ShowerLib/src/IShowerLib.cxx b/LArCalorimeter/LArG4/LArG4ShowerLib/src/IShowerLib.cxx index 02fb66576427ca5e877f0e91a29b8a1d381a26c7..302778d85945a974f1a78812c326e301dc17f14c 100755 --- a/LArCalorimeter/LArG4/LArG4ShowerLib/src/IShowerLib.cxx +++ b/LArCalorimeter/LArG4/LArG4ShowerLib/src/IShowerLib.cxx @@ -85,7 +85,7 @@ namespace ShowerLib { } else { //statistics for the genlib, shorter version std::stringstream out; out << getName() <<" PARTICLE: " << m_particle << " DETECTOR: "<< m_detector << ", "; - out << m_release << " " << m_geometry << " " << m_geantVersion << " " << m_physicsList << std::endl;; + out << m_release << " " << m_geometry << " " << m_geantVersion << " " << m_physicsList << std::endl; if (printParameters().length() > 0) out << printParameters() << std::endl; out << m_comment << std::endl; diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx index e7df15d035e00145b05ca554d78df79fdbd2408e..52247bac9b6e8d439ffe81795b1070bcb7669b62 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx @@ -327,7 +327,7 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos) std::ostringstream cylStream; cylStream << baseName << "::ExtraCyl"; - std::string cylName = cylStream.str();; + std::string cylName = cylStream.str(); cylName = cylName + "_beforePS"; double phi0=(*cryoExtraCyl)[i]->getDouble("PHI0"); diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx index 0943bcce88807ccf6e29782c5b1db3106c1de2f2..65097c73bb23cb8d35c3d41c2d0a0df3b7e510e8 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx @@ -126,7 +126,7 @@ void LArGeo::LArDetectorFactoryH62002::getSimulationParameters() (*log)<< MSG::WARNING << "LArDectorFactoryH62002:\tCan't access LArGeoTBH1GeoOptions, using default values\n"; } - (*log)<< MSG::INFO<< endmsg;; + (*log)<< MSG::INFO<< endmsg; (*log)<< MSG::INFO << " Use cryo X : " << m_cryoXpos << " CLHEP::mm" << endmsg; (*log)<< MSG::INFO << " Use table Y : " << m_tableYpos << " CLHEP::mm" << endmsg; diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx index 56a47e68bcd6cefde8ce72e22a13a225e630c1f5..1b6ed12dc4eeb03849470e744815ca434eeb3a70 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx @@ -245,7 +245,7 @@ GeoVPhysVol* LArGeo::LArDetectorConstructionH62003::GetEnvelope() // {CryoXPos = -18.0*cm;} log << MSG::DEBUG << "TB2003 Cryostat Position is " - << nickname << endmsg;; + << nickname << endmsg; log << MSG::DEBUG << "CryoXPos = " << CryoXPos << endmsg; diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx index 80d385e047d1eb907e72520be8a24699df39cb14..156583f2f33d5619fa16adcc90824b197a1174ae 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx @@ -394,7 +394,7 @@ GeoFullPhysVol* LArGeo::HECModuleConstruction::GetEnvelope() double rOuter = moduleRouter - larShift - deadZone; double rInner = moduleRinner2 - larShift + deadZone; - if (iSect<1 && m_frontWheel) rInner = moduleRinner1 - larShift + deadZone;; + if (iSect<1 && m_frontWheel) rInner = moduleRinner1 - larShift + deadZone; solidSlice[iSect] = new GeoTubs(rInner, rOuter, gapSize/2., modulePhistart, moduleDeltaPhi); logiSlice[iSect] = new GeoLogVol(sliceName, solidSlice[iSect], LAr); physiSlice[iSect] = new GeoPhysVol(logiSlice[iSect]); diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx index a452b122779558ea3cc68d192a4ac982b9aed2e1..b7e65c6baef5fa545680dfa7c74fe4a30efa354d 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx @@ -194,7 +194,7 @@ GeoFullPhysVol* LArGeo::HECWheelConstruction::GetEnvelope() //--- From the depth Size, calculate the boundary planes of the Wheel Mother volume --------- // (Add 0.2 mm to avoid clashes) - double g4allow = shrinkCold * 0.2*mm;; + double g4allow = shrinkCold * 0.2*mm; double zCoordinate[4]; if (m_frontWheel){ zCoordinate[0] = shrinkCold * 0.0*cm; diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h index 95fb75087037fd424cbdfa0fec7ddb394e13ba9c..993a0e8c3b6ce9b52abd27b0fae68d555c638ab8 100755 --- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h +++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h @@ -296,7 +296,7 @@ inline double EMECDetectorManager::getRefToActive () const inline double EMECDetectorManager::getActiveLength () const { - return m_MagicNumbers->activeLength;; + return m_MagicNumbers->activeLength; } diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBCell.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBCell.cxx index 99b10bf3d3cb62330e66359ff6c9706d8a8380cf..cde34057995f36a6d374a90e5be54b7894e914e3 100755 --- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBCell.cxx +++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBCell.cxx @@ -116,5 +116,5 @@ unsigned int EMBCell::getNumHVPathologies ()const{ } const EMBHVPathologiesConstLink & EMBCell::getHVPathologies (unsigned int i) const{ - return m_hvPathologies[i];; + return m_hvPathologies[i]; } diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx index 301e388a8ab71d0faedc304d4a15ba33a64340ee..9f4104ae16334bf46d7d4949600df5fae925a3b5 100755 --- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx +++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx @@ -41,7 +41,7 @@ FCALDetectorManager::~FCALDetectorManager() { for (int s=0;s<2;s++) { for (int m=0;m<3;m++) { - delete m_Module[s][m];; + delete m_Module[s][m]; } } for (unsigned int i=0;i<getNumTreeTops();i++) getTreeTop(i)->unref(); diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx index 98e4ec2e1c219f07d8eeec8b6f5f61266aac5f93..f084d421f7e5fdfb1450ab54d7b2488d3149ca3a 100755 --- a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx @@ -351,7 +351,7 @@ LArCosmicsMonTool::fillHistograms() { if(m_LArOnlineIDHelper->isFCALchannel(id)){ - int sampling = m_LArFCAL_IDHelper->module(offlineID);; + int sampling = m_LArFCAL_IDHelper->module(offlineID); const std::vector < short > samples = pLArDigit->samples(); // Look for Muons Candidates in sampling 2 diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx index 5d6309f4549e67fef96f70f67b13a9fa30096b3a..de0a65c39cf364c3f69a2706026b98123cb08351 100755 --- a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx +++ b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx @@ -658,7 +658,7 @@ LArCoverage::fillHistograms() m_hCaloNoiseToolHEC[sampling]->Fill(etaChan, noise); } if(m_LArOnlineIDHelper->isFCALchannel(id)){ - int sampling = m_LArFCAL_IDHelper->module(offlineID);; + int sampling = m_LArFCAL_IDHelper->module(offlineID); m_hCaloNoiseToolFCAL[sampling]->Fill(etaChan, noise); } diff --git a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx index ffb78245e9ab96a05425a83607674ec961a5b668..c2e44b5d1f3a2770081cc154515ae66346143534 100755 --- a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx +++ b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx @@ -655,7 +655,7 @@ bool LArRODMonTool::FebStatus_Check() { } StatusCode LArRODMonTool::fillHistograms() { - ATH_MSG_VERBOSE( "In LArRODMonTool::fillHistograms()");; + ATH_MSG_VERBOSE( "In LArRODMonTool::fillHistograms()"); // Increment event counter m_eventsCounter++; diff --git a/LArCalorimeter/LArRawEvent/src/LArPedestal.cxx b/LArCalorimeter/LArRawEvent/src/LArPedestal.cxx index 974bb5c8bc65161f42b163dce66513ae78c649cb..366b0d1813be8fb38c2fe508dc9111fe47695473 100755 --- a/LArCalorimeter/LArRawEvent/src/LArPedestal.cxx +++ b/LArCalorimeter/LArRawEvent/src/LArPedestal.cxx @@ -143,7 +143,7 @@ double LArPedestal::get_rms(const unsigned isample) const return 0; //const int nsamples = m_sum.size(); const double x = m_sum[isample]/double(m_nped); - const double y = m_sumSquares[isample]/double(m_nped);; + const double y = m_sumSquares[isample]/double(m_nped); return sqrt(y-x*x); } diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx index fe739981118e76ce9b0921c09c89da1a67d3d315..a031d49244beb82cc2b2f85829ec3d400db57af7 100755 --- a/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx +++ b/LArCalorimeter/LArRecUtils/src/LArHVCorrTool.cxx @@ -242,7 +242,7 @@ StatusCode LArHVCorrTool::LoadCalibration(IOVSVC_CALLBACK_ARGS) { } }//end if }//end else m_updateIfChanged - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx index 60b0b6e21ff25c35b17c75eb0bbad6aa9e1472c2..bc22452e8217e4aa1b1a4dbc8b0947c10fcf5809 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx +++ b/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx @@ -1846,7 +1846,7 @@ StatusCode FixLArElecCalib::fix13() { OrderOnlHash_OffID[m_sonline_idhelper->channel_Hash( shwid ).value()] = SCID.get_identifier32().get_compact(); } of << "Hash check. Onl : " << min_onl_hash << " " << max_onl_hash; - of << "; Off : " << min_off_hash << " " << max_off_hash << std::endl;; + of << "; Off : " << min_off_hash << " " << max_off_hash << std::endl; of.close(); channel_size = m_hec_idhelper->channel_hash_max(); @@ -1980,7 +1980,7 @@ StatusCode FixLArElecCalib::fix13() { } of3 << "Hash check. Onl : " << min_onl_hash << " " << max_onl_hash; - of3 << "; Off : " << min_off_hash << " " << max_off_hash << std::endl;; + of3 << "; Off : " << min_off_hash << " " << max_off_hash << std::endl; of3.close(); diff --git a/LumiBlock/LumiBlockComps/src/xAOD2NtupLumiSvc.cxx b/LumiBlock/LumiBlockComps/src/xAOD2NtupLumiSvc.cxx index 1bc6c6d27d6be8f2246eea47bd10780355960e3d..e76c49ab9c881beaf46fae6d94f3924b3fd8a9dc 100644 --- a/LumiBlock/LumiBlockComps/src/xAOD2NtupLumiSvc.cxx +++ b/LumiBlock/LumiBlockComps/src/xAOD2NtupLumiSvc.cxx @@ -77,7 +77,7 @@ StatusCode xAOD2NtupLumiSvc::finish(){ } } - if( evt.finishWritingTo( outFile ).isFailure() ) return StatusCode::FAILURE;; + if( evt.finishWritingTo( outFile ).isFailure() ) return StatusCode::FAILURE; TTree* metatree = dynamic_cast<TTree*>(outFile->Get("MetaData"))->CloneTree(); metatree->SetDirectory(0); diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/RtSpline.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/RtSpline.cxx index 0dada5d70fef99ad52f0df63112d3f31339dee00..0e48ec10f4c9fd11a8b0f4df06a96d04f33c882e 100644 --- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/RtSpline.cxx +++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/RtSpline.cxx @@ -51,7 +51,7 @@ void RtSpline::_init() { double RtSpline::radius(double t) const { //check for t_min and t_max if( t > p_sp3->GetXmax()) return p_sp3->Eval(p_sp3->GetXmax()); - if ( t < p_sp3->GetXmin() ) return p_sp3->Eval(p_sp3->GetXmin());; + if ( t < p_sp3->GetXmin() ) return p_sp3->Eval(p_sp3->GetXmin()); double r=p_sp3->Eval(t); return r >= 0 ? r : 0; } diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedTrack.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedTrack.cxx index a8192a77114754fcf1462f1f79259c1ed6dba951..b846c762bbc4c2a28dd4fc262fc352981c08eaf7 100644 --- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedTrack.cxx +++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedTrack.cxx @@ -355,14 +355,14 @@ namespace MuonCalib { foundIds.insert(id); }else{ if( measuresPhi ) sharedPhiLayers.insert(layerId); - else sharedEtaLayers.insert(layerId);; + else sharedEtaLayers.insert(layerId); foundIds.insert(layerId); } }else{ if( !id.is_mdt() && foundIds.count(layerId) ) continue; //std::cout << " only on this track " << std::endl; if( measuresPhi ) firstPhiLayers.insert(layerId); - else firstEtaLayers.insert(layerId);; + else firstEtaLayers.insert(layerId); } } std::vector<const MuonCalibHit_E*>::const_iterator it2 = pos->second.begin(); diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/HistogramManager.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/HistogramManager.cxx index 58c8c432b0cb5636a3df27ebea3f3738b8778dbc..f2800847763fa679e4ae3e4a3c30232ed94574b3 100644 --- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/HistogramManager.cxx +++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/HistogramManager.cxx @@ -10,7 +10,7 @@ // .L HistogramManager.C // HistogramManager * builder = new HistogramManager(); // builder->METODO1(); -// builder->METODO2();; +// builder->METODO2(); #include "MuonCalibStandAloneExtraTools/HistogramManager.h" #include "MuonCalibStandAloneExtraTools/MDTName.h" diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/MDTDeadElementsAnalysis.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/MDTDeadElementsAnalysis.cxx index f2671b5e1a715ff96a213878fbea2819d6c64120..2ffe50a630f66f05f6f86676b39e82dc09a6f429 100644 --- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/MDTDeadElementsAnalysis.cxx +++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/MDTDeadElementsAnalysis.cxx @@ -595,7 +595,7 @@ void MDTDeadElementsAnalysis::deadLayers(TH1F* idh1,TH1F* HRef, TH1F* deadTubesM // if(verbose){ // cout<<" average bin content "<<average_bin_content<<endl; // cout<<"minimum position content "<<minimum_position<<" " - // <<minimum_content<<" average "<<average_non_zero_bins<<endl;; + // <<minimum_content<<" average "<<average_non_zero_bins<<endl; // cout<<" rms "<<rms_non_zero_bins<<endl; // cout<<" test value "<< average_non_zero_bins-8.*rms_non_zero_bins/pow(double(indlayer-1),0.5)<< // " is larger than "<<minimum_content<<"?"<<endl; @@ -604,7 +604,7 @@ void MDTDeadElementsAnalysis::deadLayers(TH1F* idh1,TH1F* HRef, TH1F* deadTubesM int tubestart = (minimum_position-1)*nbins_per_layer[0]+1; int tubeend = minimum_position*nbins_per_layer[0]; // cout <<"Dead layer "<<minimum_position<<" found "<<endl; - deadLayer.push_back(minimum_position);; + deadLayer.push_back(minimum_position); deadLayerChamber.push_back(chambname); // if(verbose){ // cout <<"tubestart tubeend "<<tubestart<<" "<<tubeend<<endl; @@ -2870,7 +2870,7 @@ void MDTDeadElementsAnalysis::deadMultilayers(TH1F *idh1, TH1F *HRef, TH1F *dea abs(averageLevelML1/averageLevelML2)<0.1) { deadAna <<" dead MultiLayer 1 found in chamber "<<chambname<<endl; // cout <<" dead MultiLayer 1 found in chamber "<<chambname<<endl; - deadMultilayer.push_back(1);; + deadMultilayer.push_back(1); deadMLChamber.push_back(chambname); deadMLCounts.push_back(nonisolatedCountsML1); deadMLLevel.push_back(averageLevelML1); @@ -2895,7 +2895,7 @@ void MDTDeadElementsAnalysis::deadMultilayers(TH1F *idh1, TH1F *HRef, TH1F *dea abs(averageLevelML2/averageLevelML1)<0.1) { deadAna <<" dead MultiLayer 2 found in chamber "<<chambname<<endl; // cout <<" dead MultiLayer 2 found in chamber "<<chambname<<endl; - deadMultilayer.push_back(2);; + deadMultilayer.push_back(2); deadMLChamber.push_back(chambname); deadMLCounts.push_back(nonisolatedCountsML2); deadMLLevel.push_back(averageLevelML2); diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/NtupleSplitterTool.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/NtupleSplitterTool.cxx index c7f403c427c65b1c625db56094602c4d855e0a61..1201fbcf89040073c8f1ea3beeb0c8e90cb28e32 100644 --- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/NtupleSplitterTool.cxx +++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/NtupleSplitterTool.cxx @@ -89,7 +89,7 @@ StatusCode NtupleSplitterTool::initialize() { //get region selection service StatusCode sc=service("RegionSelectionSvc", p_reg_sel_svc); if(!sc.isSuccess()) { - ATH_MSG_ERROR("Cannot retrieve RegionSelectionSvc!");; + ATH_MSG_ERROR("Cannot retrieve RegionSelectionSvc!"); return sc; } sc = m_calib_tool_handle.retrieve(); diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx index 87c2369d7f3047173aec2ea2d46c0108aecd074a..36e6c85a1631f4ee424cb0ce5cebfc356b5f1008 100644 --- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx +++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx @@ -359,8 +359,8 @@ StatusCode CscDigitToCscRDOTool::fill_CSCdata() ATH_MSG_DEBUG ( "CSC Digit->RDO: Digit offline info " << m_cscHelper->show_to_string(offlineChannelId) << " " << cscDigit->charge() ); - int zsec = m_cscHelper->stationEta(offlineChannelId);; - int phisec = m_cscHelper->stationPhi(offlineChannelId);; + int zsec = m_cscHelper->stationEta(offlineChannelId); + int phisec = m_cscHelper->stationPhi(offlineChannelId); int istation = m_cscHelper->stationName(offlineChannelId) - 49; int sector = zsec*(2*phisec-istation+1); int wlay = m_cscHelper->wireLayer(offlineChannelId); diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx index 3afc793c66c4f6f6581066d6e19ebb7b8923743c..9a0fa08c2931d1053eee4c314f4066c6f4589514 100644 --- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx +++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/STGC_RawDataContainerCnv.cxx @@ -54,7 +54,7 @@ StatusCode STGC_RawDataContainerCnv::initialize() { STGC_RawDataContainer_PERS* STGC_RawDataContainerCnv::createPersistent (Muon::STGC_RawDataContainer* transCont) { MsgStream log(msgSvc(), "STGC_RawDataContainerCnv" ); if (log.level() <= MSG::DEBUG) log<<MSG::DEBUG<<"createPersistent(): main converter"<<endmsg; - return m_TPConverter.createPersistent( transCont, log );; + return m_TPConverter.createPersistent( transCont, log ); } Muon::STGC_RawDataContainer* diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx index 982d135245b3f597458f48d3ba86e155dc0238cd..701a872577fe39061f4f823a820a97953f3bea57 100644 --- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx +++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx @@ -246,7 +246,7 @@ void Muon::MMPrepDataContainerCnv_p1::persToTrans(const Muon::MMPrepDataContain // int result = m_MMId->get_detectorElement_hash(chan->identify(), deIDHash); // if (result&&log.level() <= MSG::WARNING) // log << MSG::WARNING<< " Muon::MMPrepDataContainerCnv_p1::persToTrans: problem converting Identifier to DE hash "<<endmsg; - // chan->m_detEl = m_muonDetMgr->getMMReadoutElement(deIDHash);; + // chan->m_detEl = m_muonDetMgr->getMMReadoutElement(deIDHash); log << MSG::DEBUG<<"chan identify(): "<<chan->identify()<<endmsg; chan->setHashAndIndex(collIDHash, chanIndex); diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx index f154ccd0aba163b1cdf79923f7a84b4d20f295b2..e8dcfbeeaec67bb10505bd60adaad41cdbf1d13f 100755 --- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx +++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/RpcCoinDataContainerCnv_p1.cxx @@ -174,7 +174,7 @@ void Muon::RpcCoinDataContainerCnv_p1::persToTrans(const RpcCoinDataContainerCn int result = m_RpcId->get_detectorElement_hash(clusId, deIDHash); if (result) log << MSG::WARNING << " Muon::MdtPrepDataContainerCnv_p2::persToTrans: problem converting Identifier to DE hash "<<endmsg; const MuonGM::RpcReadoutElement* detEl = - m_muonDetMgr->getRpcReadoutElement(deIDHash);; + m_muonDetMgr->getRpcReadoutElement(deIDHash); auto chan = CxxUtils::make_unique<Muon::RpcCoinData> (chanCnv.createRpcCoinData (pchan, diff --git a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/RpcRdoToRpcPrepData.cxx b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/RpcRdoToRpcPrepData.cxx index 81415df507edc8251de2727473786275d439270b..d56c161fe213eaebfa6e9e88d10f411c6ef63bbf 100755 --- a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/RpcRdoToRpcPrepData.cxx +++ b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/RpcRdoToRpcPrepData.cxx @@ -71,7 +71,7 @@ StatusCode RpcRdoToRpcPrepData::initialize(){ StatusCode RpcRdoToRpcPrepData::execute() { - StatusCode status= StatusCode::SUCCESS;; + StatusCode status= StatusCode::SUCCESS; ATH_MSG_DEBUG("**************** in RpcRdoToRpcPrepData::execute() ***********************************************"); diff --git a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/TgcRdoToTgcPrepData.cxx b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/TgcRdoToTgcPrepData.cxx index aaad0f380343516aba8f8a69a669049e3ddb6ef4..e0e3e56e3f9acdb26c2bf1ef08009d37dd5c8fb4 100755 --- a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/TgcRdoToTgcPrepData.cxx +++ b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/TgcRdoToTgcPrepData.cxx @@ -142,7 +142,7 @@ StatusCode TgcRdoToTgcPrepData::execute() { if (m_print_inputRdo) m_tool->printInputRdo(); // print input TGC RDO if (m_print_prepData) m_tool->printPrepData(); // print output TGC PRD - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } // Debugging of TgcRdoToPrepDataTool diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/RpcReadWriteCoolStr.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/RpcReadWriteCoolStr.cxx index 2c6d6641413daa27976dbed61fd025440a8bc156..90a921eaeeb043778197187141928af6a1bf50dc 100755 --- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/RpcReadWriteCoolStr.cxx +++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/RpcReadWriteCoolStr.cxx @@ -83,7 +83,7 @@ StatusCode RpcReadWriteCoolStr::execute() { m_readDone=true; - if(p_coolsvc->makeFile(m_fileName)!=StatusCode::SUCCESS) m_log << MSG::ERROR << "Problems in reading from DB"<<endmsg;; + if(p_coolsvc->makeFile(m_fileName)!=StatusCode::SUCCESS) m_log << MSG::ERROR << "Problems in reading from DB"<<endmsg; } } @@ -104,7 +104,7 @@ StatusCode RpcReadWriteCoolStr::execute() { m_readDone=true; - if(p_coolsvc->makeOnlineFile(m_fileName)!=StatusCode::SUCCESS) m_log << MSG::ERROR << "Problems in reading from DB"<<endmsg;; + if(p_coolsvc->makeOnlineFile(m_fileName)!=StatusCode::SUCCESS) m_log << MSG::ERROR << "Problems in reading from DB"<<endmsg; } } diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx index 9bf30558a22a606bed5bbeb0933e74f12b0cc2b8..cfed3c56d73834dc46d0931ed2aa51b5a164527f 100755 --- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx +++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx @@ -1281,7 +1281,7 @@ namespace MuonCalib { const DataHandle<TagInfo> tagInfo; if(detStore->retrieve(tagInfo).isFailure()) { m_log << MSG::WARNING << "Could not retrieve tag info from TDS in ignore bad multilayer..." - << endmsg;; + << endmsg; return false; } diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx index 4abc8115b8c19e89f7c60913132459d3b4d68cbb..8928a20492ed414f422b11607f5a7e24b8eff3a2 100644 --- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx +++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/MuonAlignmentDbTool.cxx @@ -1422,7 +1422,7 @@ void MuonAlignmentDbTool::dumpBLines(const std::string& folderName) m_log << MSG::INFO << "dumping B-lines for folder "<<folderName<<endmsg; if( m_debug ) m_log << MSG::DEBUG << "B " << "type jff jzz job bs bp bn sp sn tw pg tr eg ep en ID" - << endmsg;; + << endmsg; for (ciBLineMap cibline = m_blineData->begin(); cibline != m_blineData->end(); ++cibline) { Identifier BLineId = (*cibline).first; @@ -1462,7 +1462,7 @@ void MuonAlignmentDbTool::dumpILines(const std::string& folderName) m_log << MSG::INFO << "dumping I-lines for folder "<<folderName<<endmsg; if( m_debug ) m_log << MSG::DEBUG << "I " << "\ttype\tjff\tjzz\tjob\tjlay\ttras\ttraz\ttrat\trots\trotz\trott" - << endmsg;; + << endmsg; for (ciCscInternalAlignmentMap ciiline = m_ilineData->begin(); ciiline != m_ilineData->end(); ++ciiline) { Identifier ILineId = (*ciiline).first; diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx index 89424db3a66e52f7d06e553daef7e68b0caf2b08..8f0ca68db1cdd99371de5ef6a3649640655cc480 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx @@ -208,7 +208,7 @@ bool MuonAGDDToolHelper::BuildReadoutGeometry(MuonGM::MuonDetectorManager* mgr/* detectorList::const_iterator it; for (it=dList.begin(); it!=dList.end(); ++it) { - std::vector<AGDDDetectorPositioner*>& dPos=((*it).second)->GetDetectorPositioners();; + std::vector<AGDDDetectorPositioner*>& dPos=((*it).second)->GetDetectorPositioners(); for (unsigned int i=0;i<dPos.size();i++) { std::string chTag = dPos[i]->ID.detectorAddress; diff --git a/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/MuonDetDescrUtils/MuonSectorMapping.h b/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/MuonDetDescrUtils/MuonSectorMapping.h index ebce4a40e409418366fc46e7a90cd94db135f056..29e5af475b62a4f88e161811d78dba4954feca8a 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/MuonDetDescrUtils/MuonSectorMapping.h +++ b/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/MuonDetDescrUtils/MuonSectorMapping.h @@ -154,7 +154,7 @@ namespace Muon { if( dphi < -M_PI ) dphi += 2* M_PI; if( fabs(dphi) > 0.3 && m_debug ){ std::cout << " large dphi detected!!: sector " << sector << " of hit " << sectorHit << " phi ref sector " << phi_sec - << " hit " << phi << " dphi " << dphi << std::endl;; + << " hit " << phi << " dphi " << dphi << std::endl; } return redge*cos(dphi); } diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx index 7324952161f7a9b0f50fdec89975707602e61f6b..05e107078fce96712edbbe82249ae0d258951901 100644 --- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx +++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx @@ -388,8 +388,8 @@ FillCollectionWithNewDigitEDM(csc_newmap& data_SampleMap, driftTime = 2*m_timeWindowUpperOffset; } - int zsec = m_cscIdHelper->stationEta(digitId);; - int phisec = m_cscIdHelper->stationPhi(digitId);; + int zsec = m_cscIdHelper->stationEta(digitId); + int phisec = m_cscIdHelper->stationPhi(digitId); int istation = m_cscIdHelper->stationName(digitId) - 49; int wlay = m_cscIdHelper->wireLayer(digitId); @@ -515,8 +515,8 @@ FillCollectionWithOldDigitEDM(csc_map& data_map, std::map<IdentifierHash,deposit << " hash = " << hashId << " charge = " << int (stripCharge+1) ); - int zsec = m_cscIdHelper->stationEta(digitId);; - int phisec = m_cscIdHelper->stationPhi(digitId);; + int zsec = m_cscIdHelper->stationEta(digitId); + int phisec = m_cscIdHelper->stationPhi(digitId); int istation = m_cscIdHelper->stationName(digitId) - 49; int wlay = m_cscIdHelper->wireLayer(digitId); diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx index bddb65499ad8f3d2a31dc829cbc3cd0d54bb30dd..5c495e832bea92f5283d676d3a9f218ced3ea568 100644 --- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx +++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx @@ -3031,7 +3031,7 @@ StatusCode RpcDigitizationTool::DumpRPCCalibFromCoolDB() { int stripstatus = m_rSummarySvc->RPC_DeadStripList ().find(atlasId)->second ; if( stripstatus != 1 )continue; ATH_MSG_VERBOSE( "Identifier " << atlasId << " sName "<<stationName<<" sEta " <<stationEta<<" sPhi "<<stationPhi<<" dR "<<doubletR<<" dZ "<<doubletZ<<" dPhi "<<doubletPhi<<" Gap "<<gasGap<<" view "<<measphi<<" strip "<<strip << " stripstatus "<<stripstatus ); - //std::cout<<"Identifier " << atlasId << " sName "<<stationName<<" sEta " <<stationEta<<" sPhi "<<stationPhi<<" dR "<<doubletR<<" dZ "<<doubletZ<<" dPhi "<<doubletPhi<<" Gap "<<gasGap<<" view "<<measphi<<" strip "<<strip << " stripstatus "<<stripstatus << std::endl;; + //std::cout<<"Identifier " << atlasId << " sName "<<stationName<<" sEta " <<stationEta<<" sPhi "<<stationPhi<<" dR "<<doubletR<<" dZ "<<doubletZ<<" dPhi "<<doubletPhi<<" Gap "<<gasGap<<" view "<<measphi<<" strip "<<strip << " stripstatus "<<stripstatus << std::endl; }}}}}}}}} return sc; diff --git a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelper.cxx b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelper.cxx index 65c1cb54c4243a5307ccc3f74752951769e0fb5d..c33964c6ad43a089f7069f72f44839f98fcdd13f 100644 --- a/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelper.cxx +++ b/MuonSpectrometer/MuonIdHelpers/src/MuonIdHelper.cxx @@ -835,7 +835,7 @@ int MuonIdHelper::init_neighbors(void) } } else { - (*m_Log) << MSG::WARNING << " MuonIdHelper::init_neighbors - unable to get next eta compact, exp/compact "<<endmsg;; + (*m_Log) << MSG::WARNING << " MuonIdHelper::init_neighbors - unable to get next eta compact, exp/compact "<<endmsg; return (1); } m_next_eta_module_vec[index] = hash_id; diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx index c1745cac69689084ac1d6214b638e9f7ca5555bc..0fa5af224beeb29b5a009a3c40b78f8a5157b0c9 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/QratCscClusterFitter.cxx @@ -70,7 +70,7 @@ int qrat_correction(CscPlane plane, double qrat, double& cor, double& dcordqrat) pfac.push_back(-5.483); pfac.push_back(130.6); pfac.push_back(-1296.); - pfac.push_back(5994.);; + pfac.push_back(5994.); pfac.push_back(-10580.); } else if ( qrat < 0.30 ) { pfac.push_back(-0.9225); diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/RpcClusterBuilderPRD.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/RpcClusterBuilderPRD.cxx index 2d5dd81281cc5c695e41f2fe03ae00b945fd7537..ae8c0d1119818cf9b8266e1e532f0174a598c519 100755 --- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/RpcClusterBuilderPRD.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/RpcClusterBuilderPRD.cxx @@ -309,7 +309,7 @@ void RpcClusterBuilderPRD::buildClusters(Identifier elementId) { } else if(abs(lastStrip-(*dig_it).first)==1 && abs(lastTime-(*dig_it).second->time())<m_timeSpread){ // still on the same cluster, with acceptable time spread - //std::cout<<" adding to a cluster the strip "<< (*dig_it).first<<std::endl;; + //std::cout<<" adding to a cluster the strip "<< (*dig_it).first<<std::endl; lastStrip=(*dig_it).first; theIDs.push_back((*dig_it).second->identify()); theAmbFlags.push_back((*dig_it).second->ambiguityFlag()); diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx index 01679daaf07fce005668f98a0728fd2e45c7aeae..e22e820fa562312364da819e83af5852925909dc 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/MuonEDMPrinterTool.cxx @@ -686,7 +686,7 @@ namespace Muon { ATH_MSG_DEBUG("Cannot retrieve DetectorManager "); }else{ Identifier idml1 = m_idHelper->mdtIdHelper().channelID(id,1,1,1); - Identifier idml2 = m_idHelper->mdtIdHelper().channelID(id,2,1,1);; + Identifier idml2 = m_idHelper->mdtIdHelper().channelID(id,2,1,1); const MuonGM::MdtReadoutElement* detEl1 = detMgr->getMdtReadoutElement( idml1 ); const MuonGM::MdtReadoutElement* detEl2 = 0; if (m_idHelper->mdtIdHelper().numberOfMultilayers(id) == 2){ diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/MuonStationIntersectSvc.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/MuonStationIntersectSvc.cxx index 1b66165218f8eac49ef1dda9910468d300c4d0bf..34c77713a3a7f1888a7a730e0e67f9fa45089e45 100755 --- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/MuonStationIntersectSvc.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/MuonStationIntersectSvc.cxx @@ -187,7 +187,7 @@ StatusCode MuonStationIntersectSvc::finalize() { m_imp->clearGeometry(); delete m_imp->m_log; - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } const std::vector<const Muon::MuonIntersectGeometry*>& MuonStationIntersectSvc::getStationGeometry( const Identifier& id ) const { diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx index a2009e7a6084bfe7e22bd3be60048b34d51b9669..51538e0f7e73d7e4671e4409e0e1ce2235a6cfaf 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/DCMathSegmentMaker.cxx @@ -269,7 +269,7 @@ namespace Muon { TrkDriftCircleMath::DCOnTrackVec dcs; // reset chamber statistics m_dcStatistics.clear(); - bool firstMdt = true;; + bool firstMdt = true; m_phimin = 9999.; m_phimax = -9999.; unsigned index = 0; @@ -1456,7 +1456,7 @@ namespace Muon { Identifier id = meas->identify(); int measuresPhi = m_idHelperTool->measuresPhi(id); int eta = m_idHelperTool->stationEta(id); - int phi = m_idHelperTool->stationPhi(id);; + int phi = m_idHelperTool->stationPhi(id); int isTgc = m_idHelperTool->isTgc(id); int name = isTgc ? m_idHelperTool->tgcIdHelper().stationName(id) : m_idHelperTool->rpcIdHelper().stationName(id); if( !isTgc ){ @@ -1501,7 +1501,7 @@ namespace Muon { // reset chamber statistics m_dcStatistics.clear(); - bool firstMdt = true;; + bool firstMdt = true; m_phimin = 9999.; m_phimax = -9999.; diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx index 697670ed51a8601ade546d081f3fecbaf3137a21..3ee3660c383c39fefe5ddba0389b124c6fb553b1 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternCalibration.cxx @@ -589,7 +589,7 @@ namespace Muon { ISPrdIt pit = mit->second.triggerPrds.begin(); ISPrdIt pit_end = mit->second.triggerPrds.end(); for( ;pit!=pit_end;++pit ){ - *m_log << " " << m_printer->print(*(pit->second)) << std::endl;; + *m_log << " " << m_printer->print(*(pit->second)) << std::endl; } RegionIdMapIt idit = mit->second.mdtPrdsPerChamber.begin(); diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx index c66820572bc9ff957ea65f68ecd1fe26fb71d311..bfdb26db2a3c9935d624299432c730471106ecd2 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/MuonPatternSegmentMaker.cxx @@ -640,7 +640,7 @@ namespace Muon { ISPrdIt pit = mit->second.triggerPrds.begin(); ISPrdIt pit_end = mit->second.triggerPrds.end(); for( ;pit!=pit_end;++pit ){ - msg(MSG::INFO) << " " << m_printer->print(*(pit->second)) << std::endl;; + msg(MSG::INFO) << " " << m_printer->print(*(pit->second)) << std::endl; } RegionIdMapIt idit = mit->second.mdtPrdsPerChamber.begin(); diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx index d97f9b2c8e99e837d46afe6668f678397ff326e9..0bfbfaf05a0185185121e0eea0e574a3cb21117d 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx @@ -812,7 +812,7 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr } bool inBounds = false; - Amg::Vector2D locPos;; + Amg::Vector2D locPos; if( surf.globalToLocal(exPars->position(),exPars->momentum(),locPos) ){ inBounds = surf.insideBounds(locPos,-100.,-100.); } diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx index 2ebebdec81b026702a932cf8e7f6c8231bb98685..34d603ee7b2339d7a993a03d4b75cb8cbc03e826 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx @@ -140,7 +140,7 @@ namespace Muon { Trk::Track* MuonSegmentRegionRecoveryTool::recover( const Trk::Track& track ) const { - Trk::Track* result = recoverImp(track);; + Trk::Track* result = recoverImp(track); if( result ) ATH_MSG_DEBUG("Final track " << m_printer->print(*result) << std::endl << m_printer->printStations(*result) ); else ATH_MSG_DEBUG("Track lost during recovery"); return result; diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx index ba13b5fb3c89e1244ddeb669f03fde8b63a02a37..380c995baa063bed123f88094093638e92f021f2 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.cxx @@ -1234,7 +1234,7 @@ namespace Muon { bool measuresPhi = pseudo ? true : m_idHelper->measuresPhi(id); // bound checks - Amg::Vector2D locPos;; + Amg::Vector2D locPos; if( !meas->associatedSurface().globalToLocal(pars->position(),pars->position(),locPos) ){ ATH_MSG_DEBUG(" localToGlobal failed !!!!! " ); continue; diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx index f2a3616f00edef8cc18597735dd16fc59606d539..1ddaf7a923b8f5a950ca890f30e3a8ac0eadc773 100644 --- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx @@ -613,7 +613,7 @@ namespace Muon { double etaSeed = seedSeg->segment->globalPosition().eta(); for (unsigned int sin2=0; sin2<mySegColVec[lin].size(); sin2++){ if( sin==sin2 ) continue; - MuPatSegment* seg = mySegColVec[lin].operator[](sin2);; + MuPatSegment* seg = mySegColVec[lin].operator[](sin2); if (seg->quality<m_segQCut[0] || (m_segQCut[0]==-99 && !(seg->segQuality && seg->segQuality->isStrict()))) continue; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValAlg.cxx index f62db4980edecf92836eb3a6fe1d16dfd531112b..07c485d6f006d7128fb0d2a843ea7c429f43b42f 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValAlg.cxx @@ -280,7 +280,7 @@ void CSCSegmValAlg::bookSegmentHistograms() { float binmax = float(nbins) + binmin; MgmtAttr_t attr = ATTRIB_MANAGED; - m_segmDetail_EA.push_back(new MonGroup(this, segm_detailA+theKey+"/CSC", run, attr ));; + m_segmDetail_EA.push_back(new MonGroup(this, segm_detailA+theKey+"/CSC", run, attr )); m_segmDetail_EC.push_back(new MonGroup(this, segm_detailC+theKey+"/CSC", run, attr )); m_segmOview_EA.push_back(new MonGroup(this, segm_oviewA+theKey+"/CSC", run, attr )); m_segmOview_EC.push_back(new MonGroup(this, segm_oviewC+theKey+"/CSC", run, attr )); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx index 40e546bec408bf95fcc833073c628103e2f79f2c..d580e4204f62bab7b8cbf2acbaf3f14d823d4e00 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx @@ -366,7 +366,7 @@ StatusCode RpcLv1RawDataEfficiency::fillHistograms( ) } } - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } //================================================================================================================================ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx index 817e88b5ab4f5e3a794128334d68ad148249e98b..39dcb257e3399ede4859f039a44313bc2e78c672 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcRawDataValAlg.cxx @@ -4305,7 +4305,7 @@ StatusCode RpcRawDataValAlg::bookHistogramsRecurrent() rpc1DStationNameHitsSideA->GetXaxis()->SetBinLabel( 9,"BOL #eta"); rpc1DStationNameHitsSideA->GetXaxis()->SetBinLabel(10,"BOL #phi"); rpc1DStationNameHitsSideA->GetXaxis()->SetBinLabel(11,"BOF/G #eta"); - rpc1DStationNameHitsSideA->GetXaxis()->SetBinLabel(12,"BOF/G #phi");; + rpc1DStationNameHitsSideA->GetXaxis()->SetBinLabel(12,"BOF/G #phi"); rpc1DStationNameHitsSideA->SetFillColor(42); rpc1DStationNameHitsSideA->SetTitle("RPC hits surface density Side A "); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx index 25beb99a5ef7702f4d7b00d188449d1ebbac9c8f..5535b72ec3a12bdfbd18477c9db215b7a8dc5f5b 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx @@ -132,7 +132,7 @@ TgcRawDataValAlg::bookHistogramsLowStat(){ //Wire Strip Coincidence per GasGap ss.str(""); ss<< "Wire_Strip_Coincidence_Per_GasGap_In_10LBs_" << side[ac]; m_tgcwirestripcoinlowstat[ac] = new TH2F( ss.str().c_str(), ss.str() .c_str(),43, 0, 43, 48, 1, 49 ); - ATH_CHECK( tgcprd_lowstat_ac[ac]->regHist(m_tgcwirestripcoinlowstat[ac]) );; + ATH_CHECK( tgcprd_lowstat_ac[ac]->regHist(m_tgcwirestripcoinlowstat[ac]) ); for(int sec=1;sec<=12;sec++){ for(int phi=0;phi<=3;phi+=4){ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/CSCSegmValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/CSCSegmValAlg.cxx index 1f50591b1ac3568801c68b4d5d6f4a88d0daa60e..4a287f4cd9eabfa4018eb32a09a74e758261c0ba 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/CSCSegmValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/CSCSegmValAlg.cxx @@ -280,7 +280,7 @@ // float binmax = float(nbins) + binmin; // MgmtAttr_t attr = ATTRIB_MANAGED; -// m_segmDetail_EA.push_back(new MonGroup(this, segm_detailA+theKey+"/CSC", run, attr ));; +// m_segmDetail_EA.push_back(new MonGroup(this, segm_detailA+theKey+"/CSC", run, attr )); // m_segmDetail_EC.push_back(new MonGroup(this, segm_detailC+theKey+"/CSC", run, attr )); // m_segmOview_EA.push_back(new MonGroup(this, segm_oviewA+theKey+"/CSC", run, attr )); // m_segmOview_EC.push_back(new MonGroup(this, segm_oviewC+theKey+"/CSC", run, attr )); diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecValidationNtuples/src/MuonInsideOutAnalysisPlots.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecValidationNtuples/src/MuonInsideOutAnalysisPlots.cxx index 44815520bcd976080d0549f78825acbbe1d7df7f..27c030761d7d7afc68b49b8c68d7594aa1f122d7 100644 --- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecValidationNtuples/src/MuonInsideOutAnalysisPlots.cxx +++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecValidationNtuples/src/MuonInsideOutAnalysisPlots.cxx @@ -160,7 +160,7 @@ namespace Muon { error_time->Fill(fullTime,err); timeResScat->Fill(fullTime,res); timePullScat->Fill(fullTime,pull); - float errTrk = (*times.avTimeProp)[index];; + float errTrk = (*times.avTimeProp)[index]; errorTrack->Fill(errTrk); float errRT = sqrt(err*err-errTrk*errTrk); errorRT->Fill(errRT); diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.cxx index ae710cbf0ee10364a16e97e17e19eac18aa1b261..e07f109542040eaf44a04446746520e6ff51dbaa 100644 --- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.cxx +++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.cxx @@ -492,7 +492,7 @@ namespace Muon { int nseg = candidate ? candidate->layerIntersections.size() : 0; if( combinedTrack ){ IMuonHitSummaryTool::CompactSummary summary = m_hitSummaryTool->summary(*combinedTrack); - nprec = summary.nprecisionLayers;; + nprec = summary.nprecisionLayers; ntrigPhi = summary.nphiLayers; ntrigEta = summary.ntrigEtaLayers; } diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx index 5e1962d54b36830c83d2f0c3c0a29e0d777f3c07..77df975eb7863da44fc1dd5b72a3d659dbb182b3 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx @@ -45,7 +45,7 @@ ReadD3pdEvtStore::ReadD3pdEvtStore( const std::string& name, m_runnbr = "RunNumber"; m_evtnbr = "EventNumber"; m_el_n = "el_n"; - m_el_eta = "el_eta";; + m_el_eta = "el_eta"; m_el_jetcone_dr = "el_jetcone_dr"; } diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx index 9f0a987da24ad622e7b8eb8a0ba2273557d6404b..c1627ae98bd37f93077c7d1b13f81015cbeb1825 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/VFitZmmOnAOD.cxx @@ -175,7 +175,7 @@ StatusCode VFitZmmOnAOD::initialize() { sc = service("PartPropSvc", p_PartPropSvc, true); if ( sc.isFailure() || 0 == p_PartPropSvc) { ATH_MSG_ERROR("Unable to initialize Particle Properties Service"); - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } const HepPDT::ParticleDataTable* particleTable = p_PartPropSvc->PDT(); const HepPDT::ParticleData* muonPDT = particleTable->particle(13); diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx index 49c43252cf4d737bb5f67165daaa4c4002e5ad44..176d823d09981e2deb9b860c6ddffa0d612e4b32 100644 --- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx +++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx @@ -210,7 +210,7 @@ StatusCode MyToolProvider::initialize(bool isData, bool isAtlfast) if( metRebuilder->initialize().isFailure()){ ATH_MSG_ERROR( "Cannot intialize METRebuilder" ); ATH_MSG_ERROR( "Exiting... " ); - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } else { ATH_MSG_DEBUG( "METRebuilder initialized... " ); } diff --git a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/Root/HFOR_Truth.cxx b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/Root/HFOR_Truth.cxx index bb4ff793573b6f8fbd8c24d03a7cbbad9b8d9413..c4cb27d31fd06de574eab2f4d0e06ee0737a40b5 100644 --- a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/Root/HFOR_Truth.cxx +++ b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/Root/HFOR_Truth.cxx @@ -724,15 +724,15 @@ int HFOR_Truth::readRunConfig(std::string runConfigFile) { m_runConfigMap[HFORType::isLight].push_back( atoi(v.first.data()) ) ; } BOOST_FOREACH(boost::property_tree::ptree::value_type &v, runConfig.get_child("flavor.isBB")) { - //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isBB: " << v.first.data() << " --> " << v.second.data() << std::endl;; + //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isBB: " << v.first.data() << " --> " << v.second.data() << std::endl; m_runConfigMap[HFORType::isBB].push_back( atoi(v.first.data()) ) ; } BOOST_FOREACH(boost::property_tree::ptree::value_type &v, runConfig.get_child("flavor.isCC")) { - //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isCC: " << v.first.data() << " --> " << v.second.data() << std::endl;; + //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isCC: " << v.first.data() << " --> " << v.second.data() << std::endl; m_runConfigMap[HFORType::isCC].push_back( atoi(v.first.data()) ) ; } BOOST_FOREACH(boost::property_tree::ptree::value_type &v, runConfig.get_child("flavor.isC")) { - //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isC: " << v.first.data() << " --> " << v.second.data() << std::endl;; + //std::cout << BOOST_CURRENT_FUNCTION << " In flavor isC: " << v.first.data() << " --> " << v.second.data() << std::endl; m_runConfigMap[HFORType::isC].push_back( atoi(v.first.data()) ) ; } diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx index 0bc42c616005ef0e12b489ec0b9827df54c6e8b2..62728944935cbc4bedc74176e4b625f8a5e99b68 100644 --- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx +++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/SampleHandler.cxx @@ -159,7 +159,7 @@ namespace SH RCU_REQUIRE_SOFT (!sample->name().empty()); if (!sample->name().empty() && m_named.find (sample->name()) != m_named.end()) - RCU_THROW_MSG ("can't add sample of name " + sample->name() + "\na sample with that name already exists\nold sample:\n" + dbg (*m_named.find (sample->name())->second, 9999) + "\nnew sample:\n" + dbg (*sample, 9999));; + RCU_THROW_MSG ("can't add sample of name " + sample->name() + "\na sample with that name already exists\nold sample:\n" + dbg (*m_named.find (sample->name())->second, 9999) + "\nnew sample:\n" + dbg (*sample, 9999)); try { diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/BkgElectronClassification.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/BkgElectronClassification.cxx index 30b49f0eab5c00b482d86dda20f715d791df7e55..53179354a5a8fae1904ba48a0fa90ea397938de6 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/BkgElectronClassification.cxx +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/BkgElectronClassification.cxx @@ -111,7 +111,7 @@ namespace DerivationFramework { static SG::AuxElement::Decorator<int> firstEgMotherPdgID("firstEgMotherPdgId") ; firstEgMotherTT(*el)= 0; firstEgMotherTO(*el)= 0; - firstEgMotherTPL(*el)=ElementLink<xAOD::TruthParticleContainer>();; + firstEgMotherTPL(*el)=ElementLink<xAOD::TruthParticleContainer>(); firstEgMotherPdgID(*el)=0; // const xAOD::TruthParticle* eltruth = xAOD::EgammaHelpers::getBkgElectronMother(el,m_barcodecut); diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx index 589d6c9b687b23bf0eaed646dba41ddc3dfd6c84..d9bfb7c3572019c917ec18a713346d306f4a2869 100755 --- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx +++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx @@ -178,7 +178,7 @@ StatusCode ElectronTagTool::attributeSpecification(std::map<std::string,AthenaAt /** Tightness */ os.str(""); os << ElectronAttributeNames[ElectronID::Tight] << std::dec << i; - attrMap[ os.str() ] = AthenaAttributeType("unsigned int", ElectronAttributeUnitNames[ElectronID::Tight], ElectronAttributeGroupNames[ElectronID::Tight]) ;; + attrMap[ os.str() ] = AthenaAttributeType("unsigned int", ElectronAttributeUnitNames[ElectronID::Tight], ElectronAttributeGroupNames[ElectronID::Tight]) ; m_tightStr.push_back( os.str() ); /** Isolation for Electron */ diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/SoftMuonTag.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/SoftMuonTag.cxx index 6b5afa6d3af477f2ad4cbb0267722f8e366da3db..22112b556510d983fb686666ff59df885980d206 100644 --- a/PhysicsAnalysis/JetTagging/JetTagTools/src/SoftMuonTag.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/SoftMuonTag.cxx @@ -1077,7 +1077,7 @@ namespace Analysis //ATH_MSG_DEBUG( "#BTAG# tagJet is done" ); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx index 39b3abff2b43b4a6d3278b46c35936c3ed287a93..3fca7cd3d81790ab962d6b275c40d808b2247197 100644 --- a/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx +++ b/PhysicsAnalysis/JpsiUpsilonTools/src/JpsiFinder.cxx @@ -207,7 +207,7 @@ namespace Analysis { StatusCode sc1=service("ToolSvc",toolsvc); if (sc1.isFailure() ) { ATH_MSG_WARNING("Problem loading tool service. JpsiCandidates will be EMPTY!"); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; }; // // Check that the user's settings are sensible @@ -240,14 +240,14 @@ namespace Analysis { ATH_MSG_WARNING("You are requesting same-sign or all-sign combinations in a tag and probe analysis. This doesn't make sense. JpsiCandidates will be EMPTY!"); illogicalOptions=true; } - if (illogicalOptions) return StatusCode::SUCCESS;; + if (illogicalOptions) return StatusCode::SUCCESS; // Get the muons from StoreGate const xAOD::MuonContainer* importedMuonCollection; StatusCode sc = evtStore()->retrieve(importedMuonCollection,m_muonCollectionKey); if(sc.isFailure()){ ATH_MSG_WARNING("No muon collection with key " << m_muonCollectionKey << " found in StoreGate. JpsiCandidates will be EMPTY!"); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; }else{ ATH_MSG_DEBUG("Found muon collections with key "<<m_muonCollectionKey); } @@ -262,7 +262,7 @@ namespace Analysis { sc = evtStore()->retrieve(importedMuonTrackCollection,*strItr); if(sc.isFailure() || importedMuonTrackCollection==NULL){ ATH_MSG_WARNING("No muon TrackParticle collection with name " << *strItr << " found in StoreGate!"); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } else { ATH_MSG_DEBUG("Found muon TrackParticle collection " << *strItr << " in StoreGate!"); ATH_MSG_DEBUG("Muon TrackParticle container size "<< importedMuonTrackCollection->size()); @@ -276,7 +276,7 @@ namespace Analysis { sc = evtStore()->retrieve(importedTrackCollection,m_TrkParticleCollection); if(sc.isFailure()){ ATH_MSG_WARNING("No TrackParticle collection with name " << m_TrkParticleCollection << " found in StoreGate!"); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } else { ATH_MSG_DEBUG("Found TrackParticle collection " << m_TrkParticleCollection << " in StoreGate!"); } @@ -298,7 +298,7 @@ namespace Analysis { if ( !m_trkSelector->decision(*TP, vx) ) continue; theIDTracksAfterSelection.push_back(TP); } - if (theIDTracksAfterSelection.size() == 0) return StatusCode::SUCCESS;; + if (theIDTracksAfterSelection.size() == 0) return StatusCode::SUCCESS; ATH_MSG_DEBUG("Number of tracks after ID track selection: " << theIDTracksAfterSelection.size()); } @@ -319,7 +319,7 @@ namespace Analysis { if ( (*muItr)->muonType() == xAOD::Muon::SiliconAssociatedForwardMuon && !m_useCombMeasurement) continue; theMuonsAfterSelection.push_back(*muItr); } - if (theMuonsAfterSelection.size() == 0) return StatusCode::SUCCESS;; + if (theMuonsAfterSelection.size() == 0) return StatusCode::SUCCESS; ATH_MSG_DEBUG("Number of muons after selection: " << theMuonsAfterSelection.size()); } @@ -473,7 +473,7 @@ namespace Analysis { } ATH_MSG_DEBUG("Number of pairs passing all selections and going to vertexing: " << sortedJpsiCandidates.size() ); - if (sortedJpsiCandidates.size() == 0) return StatusCode::SUCCESS;; + if (sortedJpsiCandidates.size() == 0) return StatusCode::SUCCESS; // Fit each pair of tracks to a vertex @@ -510,7 +510,7 @@ namespace Analysis { } ATH_MSG_DEBUG("vxContainer size " << vxContainer->size()); - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } // ********************************************************************************* diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx index 47af1fd17976684059969ce4b824d46ad52fbaf2..3863606196f21fd82e486d568b457711a8eeb025 100644 --- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx +++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx @@ -2401,10 +2401,10 @@ double MuonCalibrationAndSmearingTool::GetSystVariation( int DetType, double var double& chi2){ chi2 = 1e20; - AmgVector(5) parsID = (*inDetTrackParticle)->definingParameters();; + AmgVector(5) parsID = (*inDetTrackParticle)->definingParameters(); parsID[4] = fabs(parsID[4]); - AmgVector(5) parsMS = (*extrTrackParticle)->definingParameters();; + AmgVector(5) parsMS = (*extrTrackParticle)->definingParameters(); //int chargeMS = parsMS[4]/fabs(parsMS[4]); parsMS[4] = fabs(parsMS[4]); diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx index c2d55e683fb502f7c6ce18594a03fea045fd4c5a..c9444781dca2989478109f495d9277329b45ee18 100644 --- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx +++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx @@ -764,7 +764,7 @@ StatusCode SUSYToolsAlg::execute() { if( m_dataSource > 0 ){ if (isNominal || syst_affectsMuons) { if ((mu->auxdata< char >("signal") == 1) && (isNominal || sysInfo.affectsWeights)) { - muons_weight *= m_SUSYTools->GetSignalMuonSF(*mu);; + muons_weight *= m_SUSYTools->GetSignalMuonSF(*mu); } } } diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx index f3833b4721e63f84e114ada2025fa1225cf0021a..8b766b83249ac2ae5a6f78694e6424d9011824ed 100644 --- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx +++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx @@ -154,7 +154,7 @@ StatusCode DiTauTruthMatchingTool::checkTruthMatch (const xAOD::DiTauJet& xDiTau if ( accNSubjets(xDiTau) < 2) { decIsTruthMatched(xDiTau) = (char)false; decIsTruthHadronic(xDiTau) = (char)false; - return StatusCode::SUCCESS;; + return StatusCode::SUCCESS; } bool bTruthMatched = true; diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ScaleFactorRetriever.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ScaleFactorRetriever.cxx index aec8c45fbb39376b2ff2903204792e07d9e3e100..b777c655d8908eb54bcc0033e9ef974f2125049d 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ScaleFactorRetriever.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ScaleFactorRetriever.cxx @@ -685,7 +685,7 @@ namespace top { return 1.0; } - return x.auxdataConst<float>(decoration);; + return x.auxdataConst<float>(decoration); } diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx index f6710642aad8f8c4cc44d4c2600ec174e8f2694b..f34c8b4719a2bf0a5a4fed82f486e60abfd6a0eb 100644 --- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx +++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx @@ -127,7 +127,7 @@ const HepMC::GenParticle * TruthParticle::genChild(const std::size_t i) const { if ( i < m_children.size() ) { const TruthParticle* child = this->child(i); - return child ? child->genParticle() : 0;; + return child ? child->genParticle() : 0; } else { std::string error = "WRONG index for TruthParticle::genChild(index)"; throw std::out_of_range(error); diff --git a/Reconstruction/EventShapes/EventShapeEvent/src/EventShapeStore.cxx b/Reconstruction/EventShapes/EventShapeEvent/src/EventShapeStore.cxx index 369f415efc82a0057f8607284fabe79c908c1e79..c15220cd155684c3a335181f9e532c398232af5e 100755 --- a/Reconstruction/EventShapes/EventShapeEvent/src/EventShapeStore.cxx +++ b/Reconstruction/EventShapes/EventShapeEvent/src/EventShapeStore.cxx @@ -20,7 +20,7 @@ bool EventShapeStore::get(const EventShapes::EventShapeType& type, double& value // bool EventShapeStore::get(const EventShapes::EventShapeType& type, // std::vector<double>& values, unsigned int index) const // { -// value.clear();; +// value.clear(); // for(store_Citer it=m_store.begin(); it!=m_store.end(); ++it ) // if(it->getType()==type) // { diff --git a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/util/ParticleTest.cxx b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/util/ParticleTest.cxx index 4af7dd720d494e862ef846ade164c750ac7aec09..11d00f1941745f70b9d4ecc1c7afb01c5c5efd59 100644 --- a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/util/ParticleTest.cxx +++ b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/util/ParticleTest.cxx @@ -84,8 +84,8 @@ int dumpjets(Index ient1 =0, Index nent =1, int detail =2, int maxobj =0, ostringstream ssjetline; ssjetline << "pT =" << setw(6) << std::fixed << setprecision(1) << mevtogev*pjet->pt() << " GeV"; ssjetline << ", m =" << setw(6) << std::fixed << setprecision(1) << mevtogev*pjet->m() << " GeV"; - ssjetline << ", eta =" << setw(5) << std::fixed << setprecision(2) << pjet->eta();; - ssjetline << ", phi =" << setw(5) << std::fixed << setprecision(2) << pjet->phi();; + ssjetline << ", eta =" << setw(5) << std::fixed << setprecision(2) << pjet->eta(); + ssjetline << ", phi =" << setw(5) << std::fixed << setprecision(2) << pjet->phi(); cout << " Jet " << ijet << ": " << ssjetline.str() << endl; // All properties. if ( detail > 1 ) { diff --git a/Reconstruction/MET/METUtilities/Root/METMaker.cxx b/Reconstruction/MET/METUtilities/Root/METMaker.cxx index 9e9fce37a0364b28cdd936446c266b095437e1b5..53ab6a27a7bbc1f4f03b2524bfa42f0e71279491 100644 --- a/Reconstruction/MET/METUtilities/Root/METMaker.cxx +++ b/Reconstruction/MET/METUtilities/Root/METMaker.cxx @@ -933,7 +933,7 @@ namespace met { MissingETBase::Types::constvec_t trkvec = assoc->overlapTrkVec(); double opx = trkvec.cpx(); double opy = trkvec.cpy(); - double osumpt = trkvec.sumpt();; + double osumpt = trkvec.sumpt(); ATH_MSG_VERBOSE( "Misc track px, py, sumpt = " << opx << ", " << opy << ", " << osumpt ); metSoftTrk->add(opx,opy,osumpt); ATH_MSG_VERBOSE("Final soft track mpx " << metSoftTrk->mpx() diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx index ca2bdb0951c3b1f0cfdf44cd6e22eaee60d343fc..865450ae553bff782a328db4c4ef603e2024a45a 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx +++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonInsideOutRecoTool.cxx @@ -216,7 +216,7 @@ namespace MuonCombined { const Muon::MuonCandidate* candidate = trackCandidateLookup[selectedTrack]; if( !candidate ){ ATH_MSG_WARNING("candidate lookup failed, this should not happen"); - return std::pair<std::unique_ptr<const Muon::MuonCandidate>,std::unique_ptr<const Trk::Track> >(nullptr,nullptr);; + return std::pair<std::unique_ptr<const Muon::MuonCandidate>,std::unique_ptr<const Trk::Track> >(nullptr,nullptr); } return std::make_pair( std::unique_ptr<const Muon::MuonCandidate>(new Muon::MuonCandidate(*candidate)), diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx index fd3c8eacd5f993293c707211c1b6e69a2484da37..4fe88ce117ccbd54e019514916ae220abfecd30f 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx +++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx @@ -1061,7 +1061,7 @@ namespace MuonCombined { // copy content of the candidate for reference LayerDataVec layerDataVec = candidate->layerDataVec; - Muon::TimePointBetaFit::HitVec hits = candidate->hits;; + Muon::TimePointBetaFit::HitVec hits = candidate->hits; // loop over maximumDataVec of the layer for( const auto& maximumData : layerData.maximumDataVec ){ diff --git a/Reconstruction/RecExample/RecExTB/root/include/monitor.h b/Reconstruction/RecExample/RecExTB/root/include/monitor.h index 62212009153af910983c103f2ecb028ac176c99b..7194a7083a69ba46f682990bdfd509a24a7ce146 100755 --- a/Reconstruction/RecExample/RecExTB/root/include/monitor.h +++ b/Reconstruction/RecExample/RecExTB/root/include/monitor.h @@ -102,7 +102,7 @@ TCanvas *c41; TCanvas *c42; TCanvas *c43; int n_rdo,trtlayer[MAX],straw_layer[MAX],straw[MAX],trtphi[MAX]; -int nDC,nmdtdig;; +int nDC,nmdtdig; float straw_y[MAX]; float drift_t[MAX],trttot[MAX],hl[MAX]; diff --git a/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx b/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx index 6d24b41ab339629d738bb0d225a8975e4ae5d704..8711252bdcdcc4dddb9bdae3c02d10ba42eddbfd 100755 --- a/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx +++ b/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx @@ -639,7 +639,7 @@ TRT_Predictor::setRegion(const TrackParameters& parameters) double eta = intersection->position().eta(); double deltaEta = m_etaRoadSafetyFactor + std::abs(parameters.position().eta() - eta); double etaMin = eta - deltaEta; - double etaMax = eta + deltaEta;; + double etaMax = eta + deltaEta; double phi = intersection->position().phi(); double deltaPhi = std::abs(parameters.position().phi() - phi); diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/TrackSelectionAlgs.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/TrackSelectionAlgs.cxx index 24891f30f6efcb4aca54e96645880e7ffb29c169..977886c6b1e2d185965b0179edbf1c4efe212f2c 100644 --- a/Reconstruction/VKalVrt/VrtSecInclusive/src/TrackSelectionAlgs.cxx +++ b/Reconstruction/VKalVrt/VrtSecInclusive/src/TrackSelectionAlgs.cxx @@ -140,7 +140,7 @@ namespace VKalVrtAthena { if(aTemp_truth) { barcode = aTemp_truth->barcode(); - matchProb= trk->auxdata< float >( "truthMatchProbability" );; + matchProb= trk->auxdata< float >( "truthMatchProbability" ); } } if( m_FillNtuple ) { diff --git a/Reconstruction/egamma/egammaCaloTools/src/egammaStripsShape.cxx b/Reconstruction/egamma/egammaCaloTools/src/egammaStripsShape.cxx index fd1760bd7cd524764cfe67d0c6293ea645ae2ed6..20b824963059be3fa1fe0b9d70240b58da4c2654 100755 --- a/Reconstruction/egamma/egammaCaloTools/src/egammaStripsShape.cxx +++ b/Reconstruction/egamma/egammaCaloTools/src/egammaStripsShape.cxx @@ -521,7 +521,7 @@ double egammaStripsShape::setDeltaEtaTrackShower(int nstrips,int ieta, pos = pos / energy; return pos; } - pos *= -1;; + pos *= -1; return -9999.; } diff --git a/Simulation/G4Utilities/G4UserActions/src/LengthIntegrator.cxx b/Simulation/G4Utilities/G4UserActions/src/LengthIntegrator.cxx index 889a324893db1693196209bcde1a0763a6535dc3..13f8ed04c9c0d5ab929bf065f0a77e4c633a5a16 100644 --- a/Simulation/G4Utilities/G4UserActions/src/LengthIntegrator.cxx +++ b/Simulation/G4Utilities/G4UserActions/src/LengthIntegrator.cxx @@ -321,7 +321,7 @@ namespace G4UA plotstring = it; - //G4cout<<"processing string "<<plotstring<<G4endl;; + //G4cout<<"processing string "<<plotstring<<G4endl; if(!m_rzMapRL[plotstring]){ diff --git a/Simulation/G4Utilities/G4UserActions/src/ScoringPlane.cxx b/Simulation/G4Utilities/G4UserActions/src/ScoringPlane.cxx index d60cd4d86d7a22746b15f9ec307a8fcd7fd342e5..8c8b6fa2eaba8de5a266c13c8a1d18ce31421d3d 100644 --- a/Simulation/G4Utilities/G4UserActions/src/ScoringPlane.cxx +++ b/Simulation/G4Utilities/G4UserActions/src/ScoringPlane.cxx @@ -66,9 +66,9 @@ namespace G4UA m_evt = 0; - G4cout<<"ScoringPlane: placing scoring plane at [mm]: " << m_config.plane << G4endl;; - G4cout<<"ScoringPlane: stop and kill particles: " << m_config.pkill << G4endl;; - G4cout<<"ScoringPlane: output root filename: " << m_config.fname << G4endl;; + G4cout<<"ScoringPlane: placing scoring plane at [mm]: " << m_config.plane << G4endl; + G4cout<<"ScoringPlane: stop and kill particles: " << m_config.pkill << G4endl; + G4cout<<"ScoringPlane: output root filename: " << m_config.fname << G4endl; } void ScoringPlane::EndOfRunAction(const G4Run*){ diff --git a/Simulation/G4Utilities/Geo2G4/src/LArFanSection.cxx b/Simulation/G4Utilities/Geo2G4/src/LArFanSection.cxx index 319e56f5e62569d985e7919473c4c8261effc63d..8582d3f5383035c8ee4b666ac288aea10346a1ab 100644 --- a/Simulation/G4Utilities/Geo2G4/src/LArFanSection.cxx +++ b/Simulation/G4Utilities/Geo2G4/src/LArFanSection.cxx @@ -169,7 +169,7 @@ bool LArWheelSolid::fs_cross_upper( if(xx1 < m_fs->xmin || xx1 > m_fs->xmax) return false; q.setX(xx1); q.setY(p.y() + v.y() * b1); - q.setZ(zz1);; + q.setZ(zz1); return true; } } diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx index cff6982cf28c37085982048a0747e24436264c92..07e98f3fe9b1fea11e1a41104e0b91b0dc92f69f 100644 --- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx +++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx @@ -215,7 +215,7 @@ StatusCode MergeMcEventCollTool::processAllSubEvents() { msg(MSG::ERROR) << "execute: Can not find TimedTruthList with key " << m_truthCollKey.value() << endmsg; - return StatusCode::RECOVERABLE;; + return StatusCode::RECOVERABLE; } //clear the background classification map diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/old_stuff/PCA_ToySimulation.cpp b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/old_stuff/PCA_ToySimulation.cpp index d2a6fa58cabdb69137ccf2ab0fd6e4bcf7acd0c2..0ed0b0a1ced4b476e7534599e2131e2772e0697a 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/old_stuff/PCA_ToySimulation.cpp +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/old_stuff/PCA_ToySimulation.cpp @@ -556,7 +556,7 @@ void PCA_ToySimulation(TString InputFile="PCAOutput.root", TString InputFile2="P //int Layers[] = {0,1,2,3,4,5,6,7,8,12,13,14,15,16,17,18,19}; int Layers[] = {0,1,2,3,12,13,14}; - std::vector<int> Relevant_Layers (Layers, Layers + sizeof(Layers) / sizeof(int) );; + std::vector<int> Relevant_Layers (Layers, Layers + sizeof(Layers) / sizeof(int) ); TreeReader* nr = new TreeReader; nr->SetTree(T_Id); diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx index 8e91dc970c579171d8ab8e843f79e681b6ad9c4a..674767de9f2298740c62f07321ae50ee2daf291f 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx @@ -1016,7 +1016,7 @@ Amg::Vector3D ISF::PunchThroughTool::propagator(double theta,double phi) const else if (theta >= theta2 && theta < theta3) { z = m_z2; - r = fabs(m_z2*tan(theta));; + r = fabs(m_z2*tan(theta)); } else if (theta >= theta3 && theta < (TMath::Pi()-theta3) ) { diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/src/PlanarDetLayerBuilder.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/src/PlanarDetLayerBuilder.cxx index 2457370a4b932ccc2126fa4bf9174e928464bdf8..bbb2ee991519a572fc98fed1d504f23745d66d2f 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/src/PlanarDetLayerBuilder.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/src/PlanarDetLayerBuilder.cxx @@ -324,7 +324,7 @@ StatusCode iFatras::PlanarDetLayerBuilder::finalize() /** LayerBuilder interface method - returning Barrel-like layers */ const std::vector<const iFatras::PlanarDetElement*>* iFatras::PlanarDetLayerBuilder::CreateElements(unsigned int layerCounter, bool isCylinder) const { - std::vector<iFatras::PlanarDetElement*>* cElements = new std::vector<iFatras::PlanarDetElement*>();; + std::vector<iFatras::PlanarDetElement*>* cElements = new std::vector<iFatras::PlanarDetElement*>(); if (isCylinder){ diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4ParticleDecayHelper.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4ParticleDecayHelper.cxx index c07fbad17918e5a610e19a8d9e6a3f4205d052ff..15fbe815d40952a944f78ca567eb2309e2f36503 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4ParticleDecayHelper.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4ParticleDecayHelper.cxx @@ -65,7 +65,7 @@ iFatras::G4ParticleDecayHelper::G4ParticleDecayHelper(const std::string& t, cons declareProperty("ParticleTruthSvc", m_truthRecordSvc, "ISF Particle Truth Svc"); // random number initializations declareProperty("RandomNumberService", m_rndmSvc, "Random number generator"); - declareProperty("RandomStreamName", m_randomEngineName, "Name of the random number stream");; + declareProperty("RandomStreamName", m_randomEngineName, "Name of the random number stream"); declareProperty("G4RandomStreamName", m_G4RandomEngineName, "Name of the random number stream for G4 tools"); // tool declarations ------------------------------------------------- diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4.cxx index 228a523533b91629f962deadaaa19a463be6ba0b..86cca99b49ce04058fc6d7429b39d00bd91aa3b1 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionFullG4.cxx @@ -57,7 +57,7 @@ namespace G4UA{ if ( !m_config.entryLayerTool.empty() ) { if ( m_config.entryLayerTool.retrieve().isFailure()) { G4ExceptionDescription description; - description << G4String("TrackProcessorUserActionFullG4: ") + "Could not retrieve ISF Entry Layer Tool: " << m_config.entryLayerTool;; + description << G4String("TrackProcessorUserActionFullG4: ") + "Could not retrieve ISF Entry Layer Tool: " << m_config.entryLayerTool; G4Exception("G4UA::iGeant4::TrackProcessorUserActionFullG4", "NoISFEntryLayerTool", FatalException, description); return; //The G4Exception call above should abort the job, but Coverity does not seem to pick this up. } diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamAction.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamAction.cxx index b6cc6f1ef57fa7016173c68e0adfbcdc6bcd60d6..09743e6b2d307b8f99135afc4159bc852cae4271 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamAction.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/src/FastCaloSimParamAction.cxx @@ -216,7 +216,7 @@ namespace G4UA{ std::string CurrentLogicalVolumeName = pCurrentLogicalVolume->GetName(); std::string OrigLogicalVolumeName = CurrentLogicalVolumeName; // std::cout <<"ZH Step length: "<<aStep->GetStepLength() /CLHEP::mm <<" in "<<OrigLogicalVolumeName<<std::endl; - double StepLength = aStep->GetStepLength()/ CLHEP::mm;; + double StepLength = aStep->GetStepLength()/ CLHEP::mm; //std::cout <<"ZH Step: "<<StepLength<<std::endl; //std::cout <<"Current : "<<CurrentLogicalVolumeName<<std::endl; diff --git a/Simulation/Tools/HitAnalysis/src/MMHitAnalysis.cxx b/Simulation/Tools/HitAnalysis/src/MMHitAnalysis.cxx index 29525012110de8fddcb8949e80b12e85e5326299..5436cd778db6da4f9169ab86864a5f10527ecbd6 100755 --- a/Simulation/Tools/HitAnalysis/src/MMHitAnalysis.cxx +++ b/Simulation/Tools/HitAnalysis/src/MMHitAnalysis.cxx @@ -264,7 +264,7 @@ StatusCode MMHitAnalysis::execute() { m_hits_x->clear(); - const DataHandle<GenericMuonSimHitCollection> p_collection;; + const DataHandle<GenericMuonSimHitCollection> p_collection; if ((evtStore()->retrieve(p_collection,"MicromegasSensitiveDetector"))==StatusCode::SUCCESS) { for (GenericMuonSimHitCollection::const_iterator i_hit = p_collection->begin(); i_hit != p_collection->end(); ++i_hit){ diff --git a/Simulation/Tools/HitAnalysis/src/sTGCHitAnalysis.cxx b/Simulation/Tools/HitAnalysis/src/sTGCHitAnalysis.cxx index 2b58910f63f51742c062b558c34a5a6aee2bd14a..1bcf471c54632ddfc8a8bf0715c9a8c2dcc1a080 100755 --- a/Simulation/Tools/HitAnalysis/src/sTGCHitAnalysis.cxx +++ b/Simulation/Tools/HitAnalysis/src/sTGCHitAnalysis.cxx @@ -125,7 +125,7 @@ StatusCode sTGCHitAnalysis::initialize() { StatusCode sTGCHitAnalysis::execute() { ATH_MSG_DEBUG( "In sTGCHitAnalysis::execute()" ); - const DataHandle<GenericMuonSimHitCollection> p_collection;; + const DataHandle<GenericMuonSimHitCollection> p_collection; if ((evtStore()->retrieve(p_collection,"sTGCSensitiveDetector"))==StatusCode::SUCCESS) { for (GenericMuonSimHitCollection::const_iterator i_hit = p_collection->begin(); i_hit != p_collection->end(); ++i_hit){ diff --git a/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx index 282e7f2ff2328f79398d9e4c472be2f19544bab1..b2a1218bf8cbf532f21f37eef618c5562213fbc1 100755 --- a/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx +++ b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx @@ -323,7 +323,7 @@ double TBPlaneTrackingAlgo::getChi2(const std::vector<double> &v_u, double chi2 = 0; for(int i = 0; i < numX; i++){ - chi2 += (v_u[i] - a1 - a2*v_w[i])*(v_u[i] - a1 - a2*v_w[i])/(v_eu[i]*v_eu[i]);; + chi2 += (v_u[i] - a1 - a2*v_w[i])*(v_u[i] - a1 - a2*v_w[i])/(v_eu[i]*v_eu[i]); } return chi2; } diff --git a/TileCalorimeter/TileEvent/src/TileMuonReceiverObj.cxx b/TileCalorimeter/TileEvent/src/TileMuonReceiverObj.cxx index 053aff514e39336c44ed61bd390e9d6d0eb61778..d05d1593abf3f4e877c794d2dd037db868025e21 100644 --- a/TileCalorimeter/TileEvent/src/TileMuonReceiverObj.cxx +++ b/TileCalorimeter/TileEvent/src/TileMuonReceiverObj.cxx @@ -40,7 +40,7 @@ TileMuonReceiverObj::operator std::string() const text << " Tile decision (4-bit word) "; for (unsigned int i=0; i<m_TileMuRcvDecision.size(); ++i) text << " " << m_TileMuRcvDecision[i]; text << " Thres d6H d6L d56H d56L "; - for (unsigned int i=0; i<m_TileMuRcvThresholds.size(); ++i) text << " " << m_TileMuRcvThresholds[i];; + for (unsigned int i=0; i<m_TileMuRcvThresholds.size(); ++i) text << " " << m_TileMuRcvThresholds[i]; text << " e(d6) e(d5+d6) "; for (unsigned int i=0; i<m_TileMuRcvEne.size(); ++i) text << " " << m_TileMuRcvEne[i]; text << " t(d6) t(d5+d6/2.) "; diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx index 4ec6d606ba94437ae643c5f33518fd8a57221e48..0702f97bedc3929cf9a9e180abc92959aad3640f 100755 --- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx +++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx @@ -559,7 +559,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*& mother, dy1EndPlate = rminb * tan_delta_phi_2 * CLHEP::cm; dy2EndPlate = tile_rmax * tan_delta_phi_2 * CLHEP::cm; - thicknessEndPlate = m_dbManager->TILBdzend2() * CLHEP::cm;; + thicknessEndPlate = m_dbManager->TILBdzend2() * CLHEP::cm; heightEndPlate = (tile_rmax-rminb) * CLHEP::cm; @@ -630,7 +630,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*& mother, // dy1EndPlate = rminbT * tan_delta_phi_2 * CLHEP::cm; // dy2EndPlate = tile_rmax * tan_delta_phi_2 * CLHEP::cm; - // thicknessEndPlate = m_dbManager->TILBdzend2() * CLHEP::cm;; + // thicknessEndPlate = m_dbManager->TILBdzend2() * CLHEP::cm; // heightEndPlate = (tile_rmax - rminbT) * CLHEP::cm; // tfEndPlate2 = new GeoTransform(HepGeom::Translate3D( diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOptFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOptFilter.cxx index 434fd7eb8f9b32308a0d74ffdb49a69befb4cb44..e1ec7126a25688a5fa5e6400d8ac5e287a301052 100644 --- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOptFilter.cxx +++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOptFilter.cxx @@ -748,7 +748,7 @@ void TileRawChannelBuilderOptFilter::buildPulseShape(std::vector<double> &pulseS //2: scan m_pulseShapeT for: tmin, tmax, nt0 and size: m_pulseShapeX[nt0]=1.0; int nt0 = 0; - int size = pulseShapeT.size();; + int size = pulseShapeT.size(); double tmin = 10000.; double tmax = -10000.; diff --git a/Tracking/TrkEvent/TrkEventUtils/src/PerigeeFromVertexCreator.cxx b/Tracking/TrkEvent/TrkEventUtils/src/PerigeeFromVertexCreator.cxx index d349e549661eb9a37df7e9edfdcc967f9cc4632a..be037c6386b36b009cfbeb2f71cd9be66a1b73ba 100755 --- a/Tracking/TrkEvent/TrkEventUtils/src/PerigeeFromVertexCreator.cxx +++ b/Tracking/TrkEvent/TrkEventUtils/src/PerigeeFromVertexCreator.cxx @@ -32,7 +32,7 @@ Trk::Perigee Trk::PerigeeFromVertexCreator::createPerigee(Amg::Vector3D& vertex, double rho = s_unitConversion*m_field*qOverP/sin(theta); double d0 = R + pow(Q,2.)*rho/2.; double z0 = vertex[2] - Q*(1-R*rho)/tan(theta); - double phi0 = phi - Q*rho;; + double phi0 = phi - Q*rho; // check phi0 for [-Pi,+Pi) range while (phi0 > M_PI) phi0 -= M_PI; @@ -61,7 +61,7 @@ Trk::Perigee* Trk::PerigeeFromVertexCreator::createNewPerigee(Amg::Vector3D& ver double rho = s_unitConversion*m_field*qOverP/sin(theta); double d0 = R + pow(Q,2.)*rho/2.; double z0 = vertex[2] - Q*(1-R*rho)/tan(theta); - double phi0 = phi - Q*rho;; + double phi0 = phi - Q*rho; // check phi0 for [-Pi,+Pi) range while (phi0 > M_PI) phi0 -= M_PI; diff --git a/Tracking/TrkEvent/TrkTrack/src/TrackStateOnSurface.cxx b/Tracking/TrkEvent/TrkTrack/src/TrackStateOnSurface.cxx index 389822cf1f44ca3b9702a21420bad677913e780e..ca1295e7b37c6157ae5931c1f2b6db50cf3c00c5 100755 --- a/Tracking/TrkEvent/TrkTrack/src/TrackStateOnSurface.cxx +++ b/Tracking/TrkEvent/TrkTrack/src/TrackStateOnSurface.cxx @@ -223,7 +223,7 @@ TrackStateOnSurface::isSane() const { } if (surfacesDiffer){ - std::cerr<<"TrackStateOnSurface::isSane. Surfaces differ! "<<std::endl;; + std::cerr<<"TrackStateOnSurface::isSane. Surfaces differ! "<<std::endl; if (m_trackParameters) std::cerr<<"ParamSurf: ["<<&(m_trackParameters->associatedSurface())<<"] "<<m_trackParameters->associatedSurface()<<std::endl; if (m_measurementOnTrack) std::cerr<<"measSurf: ["<<&(m_measurementOnTrack->associatedSurface())<<"] "<<m_measurementOnTrack->associatedSurface()<<std::endl; if (m_materialEffectsOnTrack) std::cerr<<"matSurf: ["<<&(m_materialEffectsOnTrack->associatedSurface())<<"] "<<m_materialEffectsOnTrack->associatedSurface()<<std::endl; diff --git a/Tracking/TrkEvent/VxJetVertex/src/VxClusteringTable.cxx b/Tracking/TrkEvent/VxJetVertex/src/VxClusteringTable.cxx index 5a6421dc6e30481e5fd3dd32d4eb219e9b3a7f15..b2788a781c938eb536999722bdc86e7fbd066377 100644 --- a/Tracking/TrkEvent/VxJetVertex/src/VxClusteringTable.cxx +++ b/Tracking/TrkEvent/VxJetVertex/src/VxClusteringTable.cxx @@ -44,8 +44,8 @@ namespace Trk { if (m_compatibilityPairOfVertices.size()==0) { sl << "No couple of vertices contained in the table " << endmsg; } else { - sl << "Numbers of compatibilities store: " << m_compatibilityPairOfVertices.size() << endmsg;; - sl << "Highest probability: " << m_compatibilityPairOfVertices.rbegin()->first << endmsg;; + sl << "Numbers of compatibilities store: " << m_compatibilityPairOfVertices.size() << endmsg; + sl << "Highest probability: " << m_compatibilityPairOfVertices.rbegin()->first << endmsg; std::map<float,PairOfVxVertexOnJetAxis>::const_iterator CompBegin=m_compatibilityPairOfVertices.begin(); std::map<float,PairOfVxVertexOnJetAxis>::const_iterator CompEnd=m_compatibilityPairOfVertices.end(); diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkMaterialOnTrack/MaterialEffectsOnTrackCnv_p2.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkMaterialOnTrack/MaterialEffectsOnTrackCnv_p2.cxx index 3e2c2cf50f544d466c7a1fc3f3370b3ba7e7f275..7e224f6786c80113cf89989c4b508466210797d1 100644 --- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkMaterialOnTrack/MaterialEffectsOnTrackCnv_p2.cxx +++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkMaterialOnTrack/MaterialEffectsOnTrackCnv_p2.cxx @@ -40,7 +40,7 @@ void MaterialEffectsOnTrackCnv_p2 :: transToPers( persObj->m_sigmaDeltaTheta = (float)transObj->scatteringAngles()->sigmaDeltaTheta(); } // persObj->m_energyLoss = toPersistent( &m_elossCnv, transObj->m_energyLoss, log ); -// if (transObj->m_energyLoss!=0) std::cout<<"Ending MaterialEffectsOnTrackCnv_p2::transToPers: "<<(typeid(*(transObj->m_energyLoss))).name()<<std::endl;; +// if (transObj->m_energyLoss!=0) std::cout<<"Ending MaterialEffectsOnTrackCnv_p2::transToPers: "<<(typeid(*(transObj->m_energyLoss))).name()<<std::endl; persObj->m_energyLoss = toPersistent( (ITPConverterFor<Trk::EnergyLoss>**)0, transObj->energyLoss(), log ); } diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkTrack/TrackInfoCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkTrack/TrackInfoCnv_p1.cxx index bf5cf6c8c96b3611524ec3834135f9275b8a3867..b37fef1299950336094cb65e13d3d8502482063c 100644 --- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkTrack/TrackInfoCnv_p1.cxx +++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkTrack/TrackInfoCnv_p1.cxx @@ -49,7 +49,7 @@ void TrackInfoCnv_p1::transToPers( const Trk::TrackInfo * transObj, Trk::TrackIn unsigned int i = 0; unsigned int size=transObj->patternRecognition().size(); - // std::cout<<transObj->dumpBitsPatternRecoInfo()<<std::endl;; + // std::cout<<transObj->dumpBitsPatternRecoInfo()<<std::endl; for (;i<32;++i) persObj->m_patternRecognition |= ((transObj->patternRecognition()[i]) << i); for (i=32;i<size;++i) persObj->m_extPatternRecognition |= ((transObj->patternRecognition()[i]) << (i-32)); diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx index b117be9b7e1e2400d43e03655daa57d764a8beb2..d77c21521d8bf69dc49465055f137489ebe5e951 100755 --- a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx +++ b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx @@ -1029,7 +1029,7 @@ bool Trk::KalmanFitter::iterateKalmanFilter(const Trk::TrackParameters*& startP this->prepareNextIteration(1,newFitQuality,iFilterBeginState, *startPar); ATH_MSG_VERBOSE ( endmsg << "********** call forward kalman filter, reverting " - << "DNA (still #1) **********" << endmsg );; + << "DNA (still #1) **********" << endmsg ); // do not recalibrate again - DNA usually guarantees ROTs are made close to real track m_fitStatus = m_forwardFitter->fit(m_trajectory, *startPar, runOutlier, kalMec, false, iFilterBeginState); diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx index 72d87e4bd21f453c4e0f6bf170f4ea34971f832b..8aff7a2217de29f1be2498d8c542aa5d75bf1870 100644 --- a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx +++ b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx @@ -369,7 +369,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G // construct the intial parameters m_parameterCache = new Trk::CurvilinearParameters(npos, nmom, charge); - AmgSymMatrix(5)* covMatrix = new AmgSymMatrix(5);; + AmgSymMatrix(5)* covMatrix = new AmgSymMatrix(5); covMatrix->setZero(); ATH_MSG_DEBUG( " covMatrix " << covMatrix); m_parameterCacheCov = new Trk::CurvilinearParameters(npos, nmom, charge, covMatrix); diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx index 872eaa42008c189bcb7c8c49b747ae26e5ce8d5e..1a5a17630f2e13a3d8a1090416e0800a3d56f5d3 100644 --- a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx +++ b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx @@ -46,7 +46,7 @@ void myLocal_resetTrack( const Trk::Track& ctrack ){ if( track.m_cachedMeasurementVector ){ delete track.m_cachedMeasurementVector; - track.m_cachedMeasurementVector = 0;; + track.m_cachedMeasurementVector = 0; } if( track.m_cachedOutlierVector ){ delete track.m_cachedOutlierVector; diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx index a20cc21e4275b0dcb9579a2b398799855b7bc644..ec1a7de0e135ddf6faefad28980629e44740f0fa 100755 --- a/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx +++ b/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx @@ -130,7 +130,7 @@ StatusCode ATH_MSG_ERROR ("configure as 'None' to avoid its loading."); return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_idHoleSearch<<endmsg;; + msg(MSG::INFO) << "Retrieved tool " << m_idHoleSearch<<endmsg; m_doHolesInDet = true; } } diff --git a/Tracking/TrkValidation/TrkValTools/root/TrackPlotter/trackplotter.cxx b/Tracking/TrkValidation/TrkValTools/root/TrackPlotter/trackplotter.cxx index 5b473e8bab65b8b42646888fd008f4addb98fc38..483d1b473517f943dc9c99514b3182dfd4ef8b4f 100755 --- a/Tracking/TrkValidation/TrkValTools/root/TrackPlotter/trackplotter.cxx +++ b/Tracking/TrkValidation/TrkValTools/root/TrackPlotter/trackplotter.cxx @@ -422,7 +422,7 @@ void Viewer::DoButton() { break;} case 22: // create PNG {//if(fCanvas) - char pngFileName[50]="BarrelTrack.png";; + char pngFileName[50]="BarrelTrack.png"; //sprintf(pngFileName,"BarrelTrack%d.png",int(m_entryNumber)); fCanvas->Print( pngFileName,"png"); //} diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtCore/src/CFitCascade.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtCore/src/CFitCascade.cxx index f7856c6296ad024a73c417896aba2ef8ef11737c..996dd0090e597c2f76c4c7d0efc984cf73fbf728 100755 --- a/Tracking/TrkVertexFitter/TrkVKalVrtCore/src/CFitCascade.cxx +++ b/Tracking/TrkVertexFitter/TrkVKalVrtCore/src/CFitCascade.cxx @@ -310,7 +310,7 @@ int fitVertexCascade( VKVertex * vk, int Pointing) IERR = fitVertexCascade( vk, 0); if(IERR)return IERR; //fit IERR = setVTrackMass(vk); if(IERR)return IERR; //mass of combined particle Chi2Cur += vk->Chi2; -//std::cout<<iv<<"---Chi2="<<vk->Chi2<<", "<<vk->refIterV[0]+vk->fitV[0]<<", "<<vk->refIterV[1]+vk->fitV[1]<<", "<<vk->refIterV[2]+vk->fitV[2]<<'\n';; +//std::cout<<iv<<"---Chi2="<<vk->Chi2<<", "<<vk->refIterV[0]+vk->fitV[0]<<", "<<vk->refIterV[1]+vk->fitV[1]<<", "<<vk->refIterV[2]+vk->fitV[2]<<'\n'; } if( Chi2Cur-Chi2Old > 1. && Iter){ IERR = translateToFittedPos(0.8);} //step limitation is case of divergence else { IERR = translateToFittedPos(1.0);} if(IERR)return IERR; diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx index 7269128a8149b94cdb65551fde223e2b7672d3ec..8afe943ecb822817697bb3c41035de85bfcf4447 100755 --- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx +++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx @@ -220,7 +220,7 @@ void TrkVKalVrtFitter::makeSimpleCascade(std::vector< std::vector<int> > & vrtDe std::vector< std::vector<int> > & cascadeDef) { int iv,ip,it, nVAdd, iva; - std::vector<int>::iterator iter;; + std::vector<int>::iterator iter; vrtDef.clear(); cascadeDef.clear(); int NVC=m_cascadeVList.size(); diff --git a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/V0Tools.cxx b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/V0Tools.cxx index 9e0fba789b53c042aebe2aa38592b8094ddd61f7..fc459a68aa31e40a67ada99e65ed862d50c0e043 100755 --- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/V0Tools.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/V0Tools.cxx @@ -1601,8 +1601,8 @@ namespace Trk double V0Tools::phiStar(const CLHEP::HepLorentzVector & v0, const CLHEP::HepLorentzVector & track) const { double phiStar = -999999.; - CLHEP::Hep3Vector V0 = v0.getV();; - CLHEP::Hep3Vector trk = track.getV();; + CLHEP::Hep3Vector V0 = v0.getV(); + CLHEP::Hep3Vector trk = track.getV(); //double v0_rapidity = v0.rapidity(); trk.rotateZ(-V0.phi()); trk.rotateY(-V0.theta()); diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx index 60bcdf944265d5d711011c7270103bfb198fd60f..3b228efd10cbe6447ec40495fe09d1ed1c893b5b 100755 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx @@ -163,7 +163,7 @@ namespace Trk m_cacheRunNumber = ei_RunNumber; m_cacheEventNumber = ei_EventNumber; m_currentInteractionIdx = 0; //reset counter of interactions given - McEventCollection::const_iterator itr = mcEventCollection->begin();; + McEventCollection::const_iterator itr = mcEventCollection->begin(); for ( ; itr != mcEventCollection->end(); ++itr ) { const HepMC::GenEvent* myEvent=(*itr); if(!pass( myEvent, mcEventCollection.cptr())) continue; //checked if events is acceptable diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx index 4836a39742b4aedbc84f10d8303cf337d26580f5..616dfd836be345e2578ef77569ebee1823f74707 100644 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx @@ -37,7 +37,7 @@ namespace { // if (Dy<0) { // return atan(Dy/Dx)-M_PI; // } else { - // return atan(Dy/Dx)+M_PI;; + // return atan(Dy/Dx)+M_PI; // } // } // return atan(Dy/Dx); diff --git a/Trigger/ALP/src/ALP.cxx b/Trigger/ALP/src/ALP.cxx index aa0787d003fe70bb87c34bea520dc0e6e851b228..e072261e6c371529347bf0ab303bab408ef83780 100644 --- a/Trigger/ALP/src/ALP.cxx +++ b/Trigger/ALP/src/ALP.cxx @@ -143,7 +143,7 @@ ALP::ALP(){ m_CITimePercentInReject=inst->addFloat(m_childInfo,"TimePercentInReject"); m_CITimePercentInWait=inst->addFloat(m_childInfo,"TimePercentInWait"); - m_CITimePercentInSend=inst->addFloat(m_childInfo,"TimePercentInSend");; + m_CITimePercentInSend=inst->addFloat(m_childInfo,"TimePercentInSend"); m_configTree=new boost::property_tree::ptree(); m_prepareForRunTree=new boost::property_tree::ptree(); diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ReverseRoI.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ReverseRoI.cxx index 8ae5ca5a8f981cdc2e515a420619274d50cb9209..4e43b9e8359a1ab716375041fa8744af3912de8e 100644 --- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ReverseRoI.cxx +++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ReverseRoI.cxx @@ -46,7 +46,7 @@ HLT::ErrorCode ReverseRoI::hltExecute(const HLT::TriggerElement* /* te_in */, while (newPhiMinus < -M_PI) newPhiMinus += 2. * M_PI; // this while is executed once -- it is cheaper than the "if" statement ! while (newPhiMinus > M_PI) newPhiMinus -= 2. * M_PI; - double newPhiPlus = roiDescriptor->phiPlus() + m_phi_shift;; + double newPhiPlus = roiDescriptor->phiPlus() + m_phi_shift; while (newPhiPlus < -M_PI) newPhiPlus += 2. * M_PI; // this while is executed once -- it is cheaper than the "if" statement ! while (newPhiPlus > M_PI) newPhiPlus -= 2. * M_PI; diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTPSvsFSDiagnostics.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTPSvsFSDiagnostics.cxx index b77340f44f1f85ceab628c0305d2e4519f84d092..a2cadc2376c6ff39ad183760bb26fa97e7a6771f 100644 --- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTPSvsFSDiagnostics.cxx +++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTPSvsFSDiagnostics.cxx @@ -687,7 +687,7 @@ void TrigHLTPSvsFSDiagnostics::jetsCheck(){ //!--- deltaR, deltaE to RoI center ------------------------- double min_deltaRoI = minDeltaRoI(PS_Jet->eta(), PS_Jet->phi()); - double fabs_Et = fabs(((PS_Jet->p4()).Et()-(FSmatchJet->p4()).Et())/(FSmatchJet->p4()).Et());; + double fabs_Et = fabs(((PS_Jet->p4()).Et()-(FSmatchJet->p4()).Et())/(FSmatchJet->p4()).Et()); m_hMapProf["tot_deltaRvsCenter_Jets"]->Fill(min_deltaRoI,min_delta_R); m_hMapProf["tot_deltaEtvsCenter_Jets"]->Fill(min_deltaRoI,fabs_Et); diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscSegmentMaker.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscSegmentMaker.cxx index 794a95c890b71e782538b0b80f4385cea1d34b9d..5450e9a210a8bb60967a4fd61f4109154a9065c2 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscSegmentMaker.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/CscSegmentMaker.cxx @@ -148,7 +148,7 @@ ReturnCode CscSegmentMaker :: FindSuperPointCsc( const TrigL2MuonSA::CscHits &cs TrigL2MuonSA::SuperPoint* superPoint = &((*itTrack).superPoints[csc]); const TrigL2MuonSA::SuperPoint* outerSP = &((*itTrack).superPoints[outer]); bool &large_dphidz = (*itTrack).large_dPhidZ; - double &outerCorFactor = (*itTrack).outerCorFactor;; + double &outerCorFactor = (*itTrack).outerCorFactor; //tgcfitresult double tgcmid1z = tgcFitResult.tgcMid1[3]; diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx index 0e72a0546e2dbf3c2bdc207aaf9258a179a84747..df1397c755e8e846c3c60c3b26e8813ca9209f7d 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcDataPreparator.cxx @@ -248,7 +248,7 @@ StatusCode TrigL2MuonSA::RpcDataPreparator::prepareData(const TrigRoiDescriptor* } } else { ATH_MSG_ERROR("Null pointer to ActiveStore"); - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } // Get RPC collections diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx index e2d35009976d457fbdbb5eea47c708f38f11833b..0c908d72071c516133cc42ff059cf70cc8d36873 100644 --- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/TgcDataPreparator.cxx @@ -217,7 +217,7 @@ StatusCode TrigL2MuonSA::TgcDataPreparator::prepareData(const LVL1::RecMuonRoI* } } else { ATH_MSG_ERROR("Null pointer to ActiveStore"); - return StatusCode::FAILURE;; + return StatusCode::FAILURE; } //Find closest wires in Middle diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2TrackClusterer.cxx b/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2TrackClusterer.cxx index 43ec9f99b0037c18a0d3d32bbdaf2c90c1176c51..2e9a600ee5833bed55606de2f76b3f18f5253b45 100644 --- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2TrackClusterer.cxx +++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2TrackClusterer.cxx @@ -101,7 +101,7 @@ T2TrackClusterer::cluster( const TrackCollection& tracks ) if ( tracks.empty() ) { // FIXME: unusedTracks = tracks; - return *m_cluster.asDataVector();; + return *m_cluster.asDataVector(); } const Trk::Track* seedTrack = *tracks.begin(); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx index d9c74551078536c3af3639e356dc7efc306657fe..8218f28e439351a9d2572186efe7e3ac66a6ff7b 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx @@ -305,7 +305,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: float calZ0 = 0; /// don't use calculated z position yet ... - // calZ0 = calculateZ0((*ptrigEmCluster).Eta1(), (*ptrigEmCluster).eta());; + // calZ0 = calculateZ0((*ptrigEmCluster).Eta1(), (*ptrigEmCluster).eta()); // Print out Cluster produced diff --git a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx index c52ca0f8b8f3426498d2205a2e68be46779a2876..ac6070dcd8ea16ebfb97487dad9c175043ade3af 100644 --- a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx +++ b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx @@ -167,7 +167,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca const TrigInDetTrackCollection* firstTracks(0); if ( m_secondStep ) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Finding leading track in 2nd step using tracks from 1st step" << endmsg;; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Finding leading track in 2nd step using tracks from 1st step" << endmsg; hltStatus = getFeature(inputTE, firstTracks); if(hltStatus== HLT::OK) { diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h index df376dcf11b68720eb534406a4d3635498df3f9b..71d5062e635b78f76c81853d6a107297e3af0fb0 100644 --- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h +++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h @@ -100,7 +100,7 @@ namespace Trig { const HLT::TrigNavStructure* navigation() const { //!< gives back pointer to navigation object (unpacking if necessary) if(!m_unpacker->unpacked_navigation()){ if(const_cast<CacheGlobalMemory*>(this)->unpackNavigation().isFailure()){ - ATH_MSG_WARNING("unpack Navigation failed");; + ATH_MSG_WARNING("unpack Navigation failed"); } } return m_navigation; diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h index c30fee38d04bcaf5d4a61f3e18818808151135a8..b0cff4021295c23b648a6b618af24d8c4a09174a 100644 --- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h +++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h @@ -182,7 +182,7 @@ namespace Trig { typedef const typename LINK::value_type* ptr_type; static ptr_type get_ptr(const LINK& link){return link.cptr();} static void do_it(const LINK& link, bool /*do_flatten*/){ - //std::cout << "container at" << link.cptr() << " has size " << link.cptr()->size() << std::endl;; + //std::cout << "container at" << link.cptr() << " has size " << link.cptr()->size() << std::endl; for(unsigned int j=0;j<link.cptr()->size();++j){ //std::cout << " ----element " << j << ": " << link.cptr()->at(j) << std::endl; } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx index eb10a4f27985a2114dced5a5dd97b1e804e89d8e..2c5d8e8b399dd15a0a27a8618e092db70dff3bdc 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx @@ -169,7 +169,7 @@ double TIDARoiDescriptor::phicheck(double phi) { double TIDARoiDescriptor::etacheck(double eta) { if ( !(eta > -100 && eta < 100) ) { // check also for nan - std::cerr << "TIDARoiDescriptor constructed with eta outside range -100 < eta <100 EtaRange" << std::endl;; + std::cerr << "TIDARoiDescriptor constructed with eta outside range -100 < eta <100 EtaRange" << std::endl; } return eta; } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h index f366f9eb4e1f3ff2efeba6fed9d3d1f770c5a898..d1300faa949325cbfc3d1b9bc8d9f60c894db1d4 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h @@ -19,7 +19,7 @@ public: // do the track extraction stuff here.... if ( track ) { TIDA::Track* t = new TIDA::Track( *track ); - if ( !addTrack( t ) ) delete t;; + if ( !addTrack( t ) ) delete t; // addTrack( track ); } } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h index a83857a0ceb5a8b43ec8f8270b20eb4484f70c46..98d927f664e6097d2a9db064c3e3bbc559598446 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h @@ -640,8 +640,8 @@ protected: if ( m_chainNames[ichain].passed() ) decisiontype = _decisiontype; else decisiontype = TrigDefs::alsoDeactivateTEs; - // if ( decisiontype==TrigDefs::requireDecision ) std::cout << "\tSUTT TrigDefs::requireDecision " << decisiontype << std::endl;; - // if ( decisiontype==TrigDefs::Physics ) std::cout << "\tSUTT TrigDefs::Physics " << decisiontype << std::endl;; + // if ( decisiontype==TrigDefs::requireDecision ) std::cout << "\tSUTT TrigDefs::requireDecision " << decisiontype << std::endl; + // if ( decisiontype==TrigDefs::Physics ) std::cout << "\tSUTT TrigDefs::Physics " << decisiontype << std::endl; /// and the index of the collection (if any) diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx index ad1c5c72c762ffd63fd26c707dbe2f28ad4b7cac..1da86b87228c1f955dfd82268881003749b96dd3 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx @@ -1246,7 +1246,7 @@ void AnalysisConfig_Ntuple::loop() { for( ; comb!=combEnd ; ++comb) { m_provider->msg(MSG::INFO) << "Chain " << chainName << "\tcombination " << icomb << endmsg; - // std::cout << "Chain " << chainName << "\tcombination " << icomb << std::endl;; + // std::cout << "Chain " << chainName << "\tcombination " << icomb << std::endl; icomb++; diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx index a9eafd39694575e95e0a234f0c4abedba5bf15e0..5ad3ae9da6ea082d0291da66a54d21c054759b98 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx @@ -1222,7 +1222,7 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks, - // std::cout << "a0t " << a0t << std::endl;; + // std::cout << "a0t " << a0t << std::endl; rChi2prob->Fill( pTt, TMath::Prob(reftracks[i]->chi2(),reftracks[i]->dof()) ); rChi2->Fill( pTt, reftracks[i]->chi2() ); diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx index b4631c818130a109996d375aa8570c3c74d46bdd..32b14b07bbc79abc8d18c3f89fc7b12d34557634 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx @@ -77,7 +77,7 @@ int main(int argc, char** argv ) { if ( !f.IsOpen() || f.IsZombie() ) { std::cerr << "Error: could not open input file: " << args[i] << std::endl; - std::exit(1);; + std::exit(1); } // gDirectory->ls(); diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx index d3b5d218f8f62c34c43e5c41e0d23d927819a34b..0132901cc1818e4cce8f00c9feb13bc86b076eb9 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx @@ -1117,7 +1117,7 @@ int main(int argc, char** argv) { int mean_power = 0; int rms_power = 0; - bool power_set = false;; + bool power_set = false; std::string xaxis = _histos[i][3]; diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx index 0656310b01fdb587f9d63939888090b54a4b4e69..287f50c75ebc02bf78fa6703358ff09de58434cb 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx @@ -106,7 +106,7 @@ void makeSmallRefFile( const std::string& in, const std::string& out ) { int usage(int status=0) { std::cout << "Usage: makeSmallRefFile <intputfile> <outputfile>" << std::endl; - return status;; + return status; } diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx b/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx index 285dea2219fc167908ed32cc6f51ad7b405d59c3..d231e1897e2c3db00e727cfcb2e74c9c6236ee19 100644 --- a/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx +++ b/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx @@ -431,7 +431,7 @@ TrigConf::operator<<(std::ostream & o, const TrigConf::HLTChain & c) { for (; streamTag != c.m_streams.end(); ++streamTag) o << *(*streamTag); vector<TrigConf::HLTSignature*>::const_iterator signature = c.m_HLTSignatureList.begin(); - for (; signature != c.m_HLTSignatureList.end(); ++signature) o << *(*signature);; + for (; signature != c.m_HLTSignatureList.end(); ++signature) o << *(*signature); o << "- ---------------------------------------------------------- " << endl; o.precision(dp); diff --git a/Trigger/TrigConfiguration/TrigConfMuctpi/src/MioctGeometry.cxx b/Trigger/TrigConfiguration/TrigConfMuctpi/src/MioctGeometry.cxx index cd79c815f795968a243c4ef9024f4e6d53988db3..c3ef707bc0492d097b11e38aa6541e7e47c241a3 100644 --- a/Trigger/TrigConfiguration/TrigConfMuctpi/src/MioctGeometry.cxx +++ b/Trigger/TrigConfiguration/TrigConfMuctpi/src/MioctGeometry.cxx @@ -44,7 +44,7 @@ MioctGeometry::writeXML(std::ostream & xmlfile, int indentLevel, int indentWidth xtmp.append(", "); } - mioctIndent(xmlfile, indentLevel+1, indentWidth) <<xtmp << " -->"<<endl;; + mioctIndent(xmlfile, indentLevel+1, indentWidth) <<xtmp << " -->"<<endl; for(std::vector<MioctSectorGeometry>::const_iterator isec = m_Sectors.begin(); isec < m_Sectors.end(); ++isec) isec->writeXML(xmlfile, indentLevel+1, indentWidth); diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx index 87578e0c9f87ece7239090870570641e298eab80..b7e92c8c4f74bb914b466d6dd7590648099a256f 100644 --- a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx +++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx @@ -364,7 +364,7 @@ TrigConf::DSConfigSvc::update( IOVSVC_CALLBACK_ARGS_K( keys ) ) { for(CondAttrListCollection::const_iterator attrListIt = hltMenuAttrColl->begin(); attrListIt != hltMenuAttrColl->end(); attrListIt++ ) { CondAttrListCollection::AttributeList attrList = attrListIt->second; m_hltFrame.theHLTChainList().addHLTChain( createHLTChain( attrList, &m_hltFrame.theHLTSequenceList() ) ); - nChains++;; + nChains++; } ATH_MSG_INFO( " Number of chains: " << nChains ); ATH_MSG_DEBUG( m_hltFrame.chains() ); @@ -461,7 +461,7 @@ TrigConf::DSConfigSvc::update( IOVSVC_CALLBACK_ARGS_K( keys ) ) { for(CondAttrListCollection::const_iterator attrListIt = hltgrpAtrColl->begin(); attrListIt != hltgrpAtrColl->end(); attrListIt++ ) { CondAttrListCollection::AttributeList attrList = attrListIt->second; addGroupsToHltChain( attrList, m_hltFrame.theHLTChainList() ); - nGroups++;; + nGroups++; } ATH_MSG_INFO( " Number of groups: " << nGroups ); } diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterAlgorithm.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterAlgorithm.cxx index 3c53557a9a5f98fee9ab817b10953200d881c311..c44aa34cb612114a127cb3cf5bc863995cb6d940 100644 --- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterAlgorithm.cxx +++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterAlgorithm.cxx @@ -121,7 +121,7 @@ namespace TrigCostRootAnalysis { ++m_calls; // After some thought - this just doesn't work - //Float_t _prescaleFactor = getPrescaleFactor(_e);; + //Float_t _prescaleFactor = getPrescaleFactor(_e); //_weight *= _prescaleFactor; // Special case. If we are running as part of the FullEvent monitor, we should keep weight=1 to make the output diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx index c7b7268da29ae0cae2ccd08509f8447a36e906e8..cd3ad34268a254b6ea0f9393954780d1dae5c433 100644 --- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx +++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx @@ -347,7 +347,7 @@ namespace TrigCostRootAnalysis { m_globalRateL2Counter->decorate(kDecRatesGroupName, Config::config().getStr(kAllString)); m_globalRateL2Counter->decorate(kDecPrescaleValOnlineL1, (Float_t) 0); m_globalRateL2Counter->decorate(kDecType, "Union"); - // m_globalRateL2Counter->setAdvancedLumiScaling(kFALSE);; + // m_globalRateL2Counter->setAdvancedLumiScaling(kFALSE); (*_counterMap)[Config::config().getStr(kRateGlobalL2String)] = static_cast<CounterBase*>(m_globalRateL2Counter); // Crate the global L1 counter, this will be the OR of everything L1 diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx index 7f53b479488cc3448cca2a10588e2415504953f7..4372648e6f2ca174c7e10e8e65b23c47ac51a730 100644 --- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx +++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx @@ -28,7 +28,7 @@ void test1() TrigCaloCluster cl (10000, 1.1, 2.2, 123); cl.setRawEt (9000); cl.setNCells (456); - cl.setquality (789);; + cl.setquality (789); for (int i=0; i < MAXSIZE; i++) cl.setRawEnergy ((CaloSampling::CaloSample)i, i*10000 + 20000); @@ -39,7 +39,7 @@ void test1() TrigCaloCluster cl2 (999, 999, 999, 999); cl2.setRawEt (999); cl2.setNCells (999); - cl2.setquality (999);; + cl2.setquality (999); for (int i=0; i < MAXSIZE; i++) cl2.setRawEnergy ((CaloSampling::CaloSample)i, 999); diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx index 16a08f2219c47952699fecade0d4413bafdd5b82..7dc4ec5d280ba8fb0de153b552a285c7e3a2896d 100644 --- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx +++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx @@ -28,7 +28,7 @@ void test1() TrigCaloCluster cl (10000, 1.1, 2.2, 123); cl.setRawEt (9000); cl.setNCells (456); - cl.setquality (789);; + cl.setquality (789); for (int i=0; i < MAXSIZE; i++) cl.setRawEnergy ((CaloSampling::CaloSample)i, i*10000 + 20000); @@ -39,7 +39,7 @@ void test1() TrigCaloCluster cl2 (999, 999, 999, 999); cl2.setRawEt (999); cl2.setNCells (999); - cl2.setquality (999);; + cl2.setquality (999); for (int i=0; i < MAXSIZE; i++) cl2.setRawEnergy ((CaloSampling::CaloSample)i, 999); diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx index aec5a13236afc70121d6e7669108a34f3ca4a0d1..b60e2bbc9d3d42a137dd4da940f8356cd60baca6 100644 --- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx +++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx @@ -28,7 +28,7 @@ void test1() TrigCaloCluster cl (10000, 1.1, 2.2, 123); cl.setRawEt (9000); cl.setNCells (456); - cl.setquality (789);; + cl.setquality (789); for (int i=0; i < MAXSIZE; i++) cl.setRawEnergy ((CaloSampling::CaloSample)i, i*10000 + 20000); @@ -39,7 +39,7 @@ void test1() TrigCaloCluster cl2 (999, 999, 999, 999); cl2.setRawEt (999); cl2.setNCells (999); - cl2.setquality (999);; + cl2.setquality (999); for (int i=0; i < MAXSIZE; i++) cl2.setRawEnergy ((CaloSampling::CaloSample)i, 999); diff --git a/Trigger/TrigEvent/TrigMuonEvent/src/MuonFeature.cxx b/Trigger/TrigEvent/TrigMuonEvent/src/MuonFeature.cxx index 005b7170a8bef4d1cc914aa8a6216f894b41032e..c4e34f73c810e8e316acd3b61e3b0eff70c803e6 100755 --- a/Trigger/TrigEvent/TrigMuonEvent/src/MuonFeature.cxx +++ b/Trigger/TrigEvent/TrigMuonEvent/src/MuonFeature.cxx @@ -45,7 +45,7 @@ MuonFeature::MuonFeature() m_ec_alpha = 0.; m_ec_beta = 0.; m_dq_var1 = 0.; - m_dq_var2 = 0.;; + m_dq_var2 = 0.; } // --- keep for backward compartibility diff --git a/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx b/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx index c862e730750ab7c4e16605116b937d036625bb36..ba37fbacdc77ce94f22e18100ec703eb6e618a69 100644 --- a/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx +++ b/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx @@ -275,14 +275,14 @@ bool HLTNavDetails::IHolder::serializePayload(std::vector<uint32_t>& dataBlob, DataBucketBase* dobjBase = static_cast<DataBucketBase*>(dobj); if ( dobjBase ) { dobjBase->relinquish(); - MLOG(VERBOSE) << "serialization giving up the ownership" << endmsg;; + MLOG(VERBOSE) << "serialization giving up the ownership" << endmsg; } delete dobj; delete addr; DataObject* dobjaux = getAuxDataObject(); - MLOG(VERBOSE) << "aux object: " << dobjaux << endmsg;; + MLOG(VERBOSE) << "aux object: " << dobjaux << endmsg; TrigStreamAddress* auxaddr(0); if(dobjaux){ diff --git a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx index fe546c2722dca639862d2b80a272b103e65fe318..b37b683d0f1501cf8b13dca11a11012d0a1524b1 100644 --- a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx +++ b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx @@ -106,7 +106,7 @@ bool add_operation(bool wihtAux) { Holder<TestBContainer>* cch(0); if ( !reg( new HolderImp<TestBContainer, TestBContainer>(), "TestB", 11, deco, cch) ) REPORT_AND_STOP("It should have failed before"); - TestBContainer* dav0 = new TestBContainer;; + TestBContainer* dav0 = new TestBContainer; dav0->push_back(new TestB(6)); REPORT_AND_CONTINUE( "adding simple vec" ); HLT::TriggerElement::ObjectIndex single = cch->add(dav0, false); diff --git a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx index 2cd89eec9e18d4fd0a372aa0d0b630432503546a..62543b63f7ac199d2b8ef706715aff5f109d1bd1 100644 --- a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx +++ b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx @@ -39,7 +39,7 @@ public: BEGIN_TEST("One algorithm test "+m_s); REPORT_REGTEST("executing on " << output->getId()); if (needsExecution(output)) { - REPORT_REGTEST( "REAL execution needed on " << output->getId());; + REPORT_REGTEST( "REAL execution needed on " << output->getId()); if ( !startCaching(output) ) REPORT_AND_STOP( "start caching failed " << output->getId() ); diff --git a/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx b/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx index 220e73c52d595cc4dd1c24f2198d381fdd40f332..42edf9675469c1b1d34e8777f388f338f3d02e6f 100644 --- a/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx +++ b/Trigger/TrigFTK/FastTrackSimWrap/src/DumpSp.cxx @@ -1272,7 +1272,7 @@ DumpSp::dump_raw_silicon( HitIndexMap& hitIndexMap, HitIndexMap& clusterIndexMap // FlagAA: THIS CODE IS NOT BACKWARD COMPATIBLE! Commited on Sep 18th, 2013 // now stores the local position in millimiters without Lorentz Correction // before it was storing a floating point coordinate in units of pixels - localx = (*iCluster)->localPosition()[Trk::distPhi] - sielement->getLorentzCorrection();; + localx = (*iCluster)->localPosition()[Trk::distPhi] - sielement->getLorentzCorrection(); localy = (*iCluster)->localPosition()[Trk::distEta]; } diff --git a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKBankGenAlgo.cxx b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKBankGenAlgo.cxx index 58752dfb92042ef59a3bfe0e1962b85c19346a6e..dbead5b238c446619c993cca591709842df89289 100644 --- a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKBankGenAlgo.cxx +++ b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKBankGenAlgo.cxx @@ -601,8 +601,8 @@ StatusCode FTKBankGenAlgo::execute() { }else if(1==FHIT.count){ // the position was already filled with an hit cur_plane = FHIT.originalhit.getPlane(); cur_sector = FHIT.originalhit.getSector(); - cur_phi = FHIT.originalhit.getPhiModule();; - cur_eta = FHIT.originalhit.getEtaModule();; + cur_phi = FHIT.originalhit.getPhiModule(); + cur_eta = FHIT.originalhit.getEtaModule(); cur_section = FHIT.originalhit.getSection(); // check for overlap diff --git a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx index 3554ce90c03234ec5ef08a9ac357597943de91df..969026c66b0027f449ef80512c90db5e9204fde0 100644 --- a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx +++ b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKConstGenAlgo.cxx @@ -1505,7 +1505,7 @@ void FTKConstGenAlgo::extract_1stStage() double *tmpxZ; double *tmpcovx; - int ndim8 = m_pmap_8L->getTotalDim();; + int ndim8 = m_pmap_8L->getTotalDim(); int ndim2_8 = ndim8*ndim8; int nth_dim8 = 0; int nth_dim8_2 = 0; diff --git a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKPattGenRoot.cxx b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKPattGenRoot.cxx index 0941b695cf6e32014bb67e9e688cda7cd488095b..98ff740e18b87c026679372e1b915ba2c87d6519 100644 --- a/Trigger/TrigFTK/TrigFTKBankGen/src/FTKPattGenRoot.cxx +++ b/Trigger/TrigFTK/TrigFTKBankGen/src/FTKPattGenRoot.cxx @@ -532,7 +532,7 @@ uint64_t FTKPattGenRoot::trackInvertion(u_int64_t ntrials, bool smear) { (Amg::Vector3D(m_beamspot[0],m_beamspot[1],0.)); Trk::MagneticFieldProperties magnet - =Trk::MagneticFieldProperties(Trk::FullField);; + =Trk::MagneticFieldProperties(Trk::FullField); const Trk::TrackParameters* tP= (*m_propagator)->propagate (trackpar,beamspot,Trk::anyDirection, false,magnet); diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx index 802f968f991168ece6a5c89e16b1e01be418a0c0..5d963db21f9797d83df0d1d4db9c68e44ffa3cc3 100644 --- a/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx @@ -1435,7 +1435,7 @@ StatusCode FTKMergerAlgo::convertMergedTracks() // bool primVtxExists = evtStore()->contains<VxContainer>(m_vxCandidatesPrimaryName); // if(!primVtxExists){ // log << MSG::INFO << "No VxContainer with key " << m_vxCandidatesPrimaryName << " found!" << endmsg; - // cout << evtStore()->dump() << endl;; + // cout << evtStore()->dump() << endl; // } // Extract the vector of tracks found by the FTK for the current event diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKSetup.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKSetup.cxx index 1e13848b8035601d9fd66ff00168b2467962f002..b9ff8c06255d31324d650634bf5718c25962cc9a 100644 --- a/Trigger/TrigFTK/TrigFTKSim/src/FTKSetup.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKSetup.cxx @@ -176,7 +176,7 @@ void FTKSetup::usageStat(const char *header /* =0 */) cerr << "USG[" << setw(2) << m_usage_ncalls << "]::CPU eff " << static_cast<float>(utime+stime)/realsec << " %" << endl; cerr << "USG[" << setw(2) << m_usage_ncalls << "]::Vir Mem " << vsize/MBunit << " MB" << endl; cerr << "USG[" << setw(2) << m_usage_ncalls << "]::RSS Mem " << rss/MBunit << " MB" << endl; - cerr << "USG[" << setw(2) << m_usage_ncalls << "]::Max Mem " << rsslim/MBunit << " MB" << endl;; + cerr << "USG[" << setw(2) << m_usage_ncalls << "]::Max Mem " << rsslim/MBunit << " MB" << endl; cerr << endl; } diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx index 668e6c39962080c824328fa0eddda46357a9cf85..6c146e5663b659eb131eaa7d201f780680c565d5 100644 --- a/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/src/FTK_CompressedAMBank.cxx @@ -4530,7 +4530,7 @@ const std::list<FTKRoad>& FTK_CompressedAMBank::getRoads() { ->getLocalId(getBankID(),ipl,moduleID) <<" x="<<hit[0]; if(ipl<3) std::cout<<" y="<<hit[1]; - std::cout<<"\n";; + std::cout<<"\n"; for(int imap=0;imap<3;imap++) { FTKSSMap *ssmap=getSSMapTSP(); if(imap==2) ssmap=getSSMap(); @@ -4637,7 +4637,7 @@ void FTK_CompressedAMBank::printStrips(int printPlane) const { ->getLocalId(getBankID(),plane,moduleID) <<" xHW="<<hit.getHwCoord(0)<<" x="<<hit[0]; if(plane<3) std::cout<<" yHW="<<hit.getHwCoord(1)<<" y="<<hit[1]; - std::cout<<"\n";; + std::cout<<"\n"; for(int imap=0;imap<3;imap++) { FTKSSMap *ssmap=getSSMapTSP(); if(imap==2) ssmap=getSSMap(); diff --git a/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx b/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx index 15216953e9a0fa80dbd4d38912a80f66b406b92a..14e4fa0099772e3f1bbd4e96e8418f79d0ff9395 100644 --- a/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx @@ -977,7 +977,7 @@ void averageCluster(cluster &clu) { int etaMin = 4000; int phiMax = -1; int phiMin = 4000; - int rowMin = 99999; //int(2*(design->width()/design->phiPitch()))+1;; + int rowMin = 99999; //int(2*(design->width()/design->phiPitch()))+1; int rowMax = 0; int colMin = 99999; //int(2*(design->length()/design->etaPitch()))+1; int colMax = 0; diff --git a/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_df.cxx b/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_df.cxx index 52eb19924cde8ce1c47eeff8661799222ccead48..c801d567139eccfbaead87728fea26b5d3c6827a 100644 --- a/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_df.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_df.cxx @@ -437,7 +437,7 @@ string myTimeString(double time) { void *CS_loopmonitor(void *ptr) { FTKTreeObject *ftktree = (FTKTreeObject*) ptr; - time_t starttime = time(NULL);; + time_t starttime = time(NULL); sleep(30); const unsigned int diskunit = 1024*1024; // MB while (!ftktree->loopbreak) { @@ -807,7 +807,7 @@ PyObject *FTKTreeObject_CollectStats(FTKTreeObject* self, PyObject *args) self->loopbreak = false; self->totnbytes = 0; pthread_create(&ctrlthread, NULL, &CS_loopmonitor, (void*) self); - time_t starttime = time(NULL);; + time_t starttime = time(NULL); long int istep = (maxevent+9)/10; diff --git a/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_match.cxx b/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_match.cxx index acaca5414b429fbd1d95ec361c7548e316d4edf6..b429478c0e9f7ec93569f94dc12b6f188ce34ffc 100644 --- a/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_match.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/standalone_scripts/cftkutils_src/cftkutils_match.cxx @@ -369,7 +369,7 @@ PyObject *FTKTreeObject_MatchRoadsToTruth(FTKTreeObject* self, PyObject *args) /* each object has to checked and the members have to be extracted, the names of the members is stored here to be faster */ PyObject *sbarcode = PyString_FromString("barcode"); - PyObject *sevtindex = PyString_FromString("evtindex");; + PyObject *sevtindex = PyString_FromString("evtindex"); //iterator and counter to loop on the sequence and fill the output Tuple unsigned int counter(0); diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx index 7b0789263e819371dae520fab505823b18d55deb..2b9b1e1d1fbb316ef07eca1ecf4d3dc00872048e 100755 --- a/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx +++ b/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx @@ -330,13 +330,13 @@ bool TrigBjetFexStandalone::l2TrackSel(const TrigBjetTrackInfo &track, unsigned if(m_useEtaPhiTrackSel) { if (fabs(track.eta() - m_trigBjetJetInfo->etaRoI()) > 0.2) { - if (msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << " track " << i+1 << " not selected (eta matching)" << endmsg;; + if (msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << " track " << i+1 << " not selected (eta matching)" << endmsg; m_listCutApplied.push_back(2); return false; } if (fabs(m_taggerHelper->phiCorr(m_taggerHelper->phiCorr(track.phi()) - m_trigBjetJetInfo->phiRoI())) > 0.2) { if (msgLvl() <= MSG::VERBOSE) - msg() << MSG::VERBOSE << " track " << i+1 << " not selected (phi matching)" << endmsg;; + msg() << MSG::VERBOSE << " track " << i+1 << " not selected (phi matching)" << endmsg; m_listCutApplied.push_back(3); return false; } } diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFDielectronMassFex.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFDielectronMassFex.cxx index 243d1854d3785d7cc55fc6b2d2aa159c942310f9..96433bc83174b7eefbaa50ce525e5a2945ae8e23 100755 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFDielectronMassFex.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFDielectronMassFex.cxx @@ -249,7 +249,7 @@ void TrigEFDielectronMassFex::process(HLT::TEConstVec& inputTE, xAOD::TrigCompos // good combination found m_monCut = 3; m_monMassAccepted = mass; - xAOD::TrigComposite *comp=new xAOD::TrigComposite();; + xAOD::TrigComposite *comp=new xAOD::TrigComposite(); objs->push_back(comp); comp->setName("elel"); comp->setDetail("mass",mass); @@ -287,7 +287,7 @@ void TrigEFDielectronMassFex::process(HLT::TEConstVec& inputTE, xAOD::TrigCompos // good combination found m_monCut = 5; m_monMassAccepted = mass; - xAOD::TrigComposite *comp=new xAOD::TrigComposite();; + xAOD::TrigComposite *comp=new xAOD::TrigComposite(); objs->push_back(comp); comp->setName("elcl"); comp->setDetail("mass",mass); diff --git a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx index ceab1f82b20925e0d54ae80b14643716a58f16e1..c5cc6aed90ac8ba2e2b75d205bf49def106f2106 100755 --- a/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaMuonCombHypo/src/TrigEFPhotonMuonAngleFexAlgo.cxx @@ -136,7 +136,7 @@ HLT::ErrorCode TrigEFPhotonMuonAngleFexAlgo::hltExecute(HLT::TEConstVec& inputTE msg() << MSG::DEBUG << " empty xAOD::PhotonContainer from the trigger element" << endmsg; return HLT::OK; } - const xAOD::PhotonContainer* photonContainer1 = vectorEgammaContainers.back();; + const xAOD::PhotonContainer* photonContainer1 = vectorEgammaContainers.back(); // Now get muons diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/MucombStauHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/MucombStauHypo.cxx index ce42f987ec2563c124e689c806ef9e603f163342..e15bdf7e1b67a18b917d4ae425e60e9910eb86f0 100755 --- a/Trigger/TrigHypothesis/TrigMuonHypo/src/MucombStauHypo.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/MucombStauHypo.cxx @@ -57,7 +57,7 @@ HLT::ErrorCode MucombStauHypo::hltInitialize(){ if ( sc.isFailure() ) { msg() << MSG::ERROR << "Could not retrieve "<<m_backExtrapolator<< endmsg; - return HLT::BAD_JOB_SETUP;; + return HLT::BAD_JOB_SETUP; } else { msg() << MSG::INFO << "Retrieved tool " << m_backExtrapolator << endmsg; diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TileMuHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TileMuHypo.cxx index e32a842d1b60365c026b71a165c4ee8469c28f79..42dff8da483ba67e42905226a18fb9fe432978d1 100755 --- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TileMuHypo.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TileMuHypo.cxx @@ -315,7 +315,7 @@ HLT::ErrorCode TileMuHypo::hltExecute(const HLT::TriggerElement* outputTE, m_hypoDelEtaTrkTR = here_hypoDelEtaTrkTR; m_hypoDelPhiTrk = here_hypoDelPhiTrk; m_hypoDelPhiTrkTR = here_hypoDelPhiTrkTR; - m_hypo_absPtTrk_Pre = here_hypo_absPtTrk_Pre;; + m_hypo_absPtTrk_Pre = here_hypo_absPtTrk_Pre; pass = result; diff --git a/Trigger/TrigHypothesis/TrigTauHypo/macros/table.cxx b/Trigger/TrigHypothesis/TrigTauHypo/macros/table.cxx index d7514b612e6c39842583eb586de3a22985cc3d7f..25779bae9e407f362154dd051a8ed02d26de8d02 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/macros/table.cxx +++ b/Trigger/TrigHypothesis/TrigTauHypo/macros/table.cxx @@ -14,7 +14,7 @@ struct Cuts{ int l2NtrkMin; int l2NtrkMax; float l2LeadtPtMin; - float l2SumPtRatioMax;; + float l2SumPtRatioMax; float l2SimpleEtFlowMin; int efNTrackMin ; @@ -33,7 +33,7 @@ struct Cuts{ l2NtrkMin = 0; l2NtrkMax = 0; l2LeadtPtMin = 0; - l2SumPtRatioMax = 0;; + l2SumPtRatioMax = 0; l2SimpleEtFlowMin = 0; efNTrackMin = 0 ; diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloFEBTool.cxx b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloFEBTool.cxx index 25e374a8e1f42f3d08aabdf9476569c6489d8356..609eaf47e5571ba9c0ee49f0f98cd96a66e1c2c6 100644 --- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloFEBTool.cxx +++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloFEBTool.cxx @@ -275,7 +275,7 @@ StatusCode HLTCaloFEBTool::fill() { double sigmax = (tmpx*tmpx); double sigmay = (tmpy*tmpy); double sigmaz = (tmpz*tmpz); - //std::cout << "just test " << cell->caloDDE()->sinTh() << " " << 1./cosh ( cell->eta() ) << " " << cell->caloDDE()->cosPhi() << " " << cos ( cell->phi() ) << " " << cell->caloDDE()->sinTh()* cell->caloDDE()->cotTh() << " " << tanh(cell->eta() ) << " " << m_threshold << std::endl;; + //std::cout << "just test " << cell->caloDDE()->sinTh() << " " << 1./cosh ( cell->eta() ) << " " << cell->caloDDE()->cosPhi() << " " << cos ( cell->phi() ) << " " << cell->caloDDE()->sinTh()* cell->caloDDE()->cotTh() << " " << tanh(cell->eta() ) << " " << m_threshold << std::endl; #ifndef NDEBUG if ( energy > 0 ) { ATH_MSG_VERBOSE( " All cells that compose feb : " diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx index 9849a366fefb0f12049740d343ea09aece44055d..3e621825baa04eed9a2271b58d3efe6b0669c4a9 100644 --- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx +++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx @@ -437,7 +437,7 @@ HLT::ErrorCode TrigIDTPMonitorElectron::hltExecute(const HLT::TriggerElement* in //Calculate invariant mass of tag-TRACK probe-cluster pair //NOTE: this is not required by algorithm, check for effects of bremstrahlung. Remove when algorithm implemented online for(auto tagTrack:tagTracks){//only one track for fully reconstructed tag - tempClusterTagTrackInvMass=ClusterTagTrackInvMass(tagTrack,tempPT,tempPx,tempPy,tempPz);; + tempClusterTagTrackInvMass=ClusterTagTrackInvMass(tagTrack,tempPT,tempPx,tempPy,tempPz); //pushback onto vector m_invClusterTagTrack_before_cuts.push_back(tempClusterTagTrackInvMass); } diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuFastMon.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuFastMon.cxx index 9deccf89b77d305d9c147dc730e5c18fa1ab8061..27e9251ceaf0b3d24a46bebf19e4219a91c0dcf9 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuFastMon.cxx +++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/MuFastMon.cxx @@ -457,7 +457,7 @@ StatusCode HLTMuonMonTool::fillMuFastDQA() // if muFast succeeded segment reconstruction. - //std::cout << "L1_MBTS_2 " << getTDT()->isPassed( "L1_MBTS_2" ) << " L1_MU0 " << getTDT()->isPassed( "L1_MU0" ) << std::endl;; + //std::cout << "L1_MBTS_2 " << getTDT()->isPassed( "L1_MBTS_2" ) << " L1_MU0 " << getTDT()->isPassed( "L1_MU0" ) << std::endl; if( !isEndcap ){//barrel for(int i_tube=0; i_tube<n_mdt_hits; i_tube++) { diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx index 87e955a1bf384e0e380d735bfb133b98e9b420e9..fb7404c3802833b284ec8bfdcf36a031b18db809 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx @@ -813,7 +813,7 @@ namespace LVL1 { int gain1(-9),gain2(-9); float score(0.0),multiplier(1.0); bool adc1_noGainL1(false),adc1_halfGainL1(false); - bool pmt2Valid(false),adc2_noGainL1(false),adc2_halfGainL1(false);; + bool pmt2Valid(false),adc2_noGainL1(false),adc2_halfGainL1(false); // PMT 1 gain1 = tileCell->gain1(); diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx index 786743b7c7be6c0a5475cc0fe7012c177895d8c7..9ce07ae552c0becedabe789badfba80da2a83b33 100644 --- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx +++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx @@ -30,7 +30,7 @@ Run2JetElementMaker::Run2JetElementMaker( const std::string& name, ISvcLocator* : AthAlgorithm( name, pSvcLocator ), m_JetElementTool("LVL1::L1JetElementTools/L1JetElementTools") { - m_triggerTowerLocation = TrigT1CaloDefs::xAODTriggerTowerLocation;; + m_triggerTowerLocation = TrigT1CaloDefs::xAODTriggerTowerLocation; m_jetElementLocation = TrigT1CaloDefs::JetElementLocation; // This is how you declare the parameters to Gaudi so that diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx index 03b3f2c3579a2fa6ccb5147b6b76d02aa030c06b..e5087f95a631c0f63e0e70ff04097f262be3f0fa 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx @@ -80,7 +80,7 @@ void L1JetTools::mapJetInputs(const DataVector<JetElement>* jes, std::map<int, J if (test == elements->end()){ // no JI yet. Create it! ATH_MSG_DEBUG( "Creating JetInput at (" - << jetElementPhi << " , " << jetElementEta << ")" );; + << jetElementPhi << " , " << jetElementEta << ")" ); jetInput=new JetInput(jetElementPhi,jetElementEta, jetElementET, key); elements->insert(std::map<int, JetInput*>::value_type(key,jetInput)); //and put it in the map. } diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx index 051c3e80778d0f5f548e7bf8ebb25a94276442ac..b557839f0865054b9a697393ff91e0214de374cf 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx @@ -282,7 +282,7 @@ Coordinate JetElementKeyBase::upPhi(const Coordinate coord){ /**returns key of next JE in +ve phi dir.*/ unsigned int JetElementKeyBase::upPhiKey(const double phi, const double eta){ Coordinate coord=upPhi(phi,eta); - return jeKey(coord.phi(),coord.eta());; + return jeKey(coord.phi(),coord.eta()); } /**returns coord of next JE in -ve phi dir.*/ @@ -310,7 +310,7 @@ Coordinate JetElementKeyBase::downPhi(const Coordinate coord){ /**returns key of next JE in -ve phi dir.*/ unsigned int JetElementKeyBase::downPhiKey(const double phi, const double eta){ Coordinate coord=downPhi(phi,eta); - return jeKey(coord.phi(),coord.eta());; + return jeKey(coord.phi(),coord.eta()); } Coordinate JetElementKeyBase::upperLeft(const double phi,const double eta){ diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx index 70bc27b517b1cf73e0e93af72b0d8a1ff98a2071..3284dab96219c3b5f923c2f5b09efac85af2b454 100644 --- a/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx +++ b/Trigger/TrigT1/TrigT1Interfaces/src/Lvl1MuCTPIInput.cxx @@ -157,7 +157,7 @@ namespace LVL1MUONIF { int bcid ) const { for( size_t ip=0; ip<m_data[systemAddress].size(); ip++){ int bc=((m_data[systemAddress]).at(ip)).first; - if (bc == bcid) return false;; + if (bc == bcid) return false; } return true; } diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx index b7c056b1961f5aa04ef9387a142e97eb4158949b..38f1283bfa9912b72a00b08775d7b1822ca22b85 100644 --- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx +++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx @@ -366,7 +366,7 @@ double L1CaloPMTScoresMon::tileNonNominal(const CaloCell* cell) int gain1(-9),gain2(-9); float score(0.0),multiplier(1.0); bool adc1_noGainL1(false),adc1_halfGainL1(false); - bool pmt2Valid(false),adc2_noGainL1(false),adc2_halfGainL1(false);; + bool pmt2Valid(false),adc2_noGainL1(false),adc2_halfGainL1(false); // PMT 1 gain1 = tileCell->gain1(); diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx index ea455c1cbee4629faa5cb0614fa89e7910db1d4d..6cb16c30f5fd2bdb1f7ad7b46998a9d18e1db863 100755 --- a/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx +++ b/Trigger/TrigT1/TrigT1RPChardware/src/Matrix.cxx @@ -1886,7 +1886,7 @@ if(nthresPass) { out_k_trigger<<" THR "<<thresPass[i]<<endl; if(overlPass[i]) { out_k_trigger<<" TIME "<<BCidentifier[i]*25.+timeOffsetThr; - out_k_trigger<<" OVL "<<overlPass[i]<<std::endl;; + out_k_trigger<<" OVL "<<overlPass[i]<<std::endl; } } } diff --git a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx index 368401f3ea2f23738e785e5f497ad6c8d1ab1d40..78ad84d1ce6f1d9583b25985229dc7aa31beb9f2 100755 --- a/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx +++ b/Trigger/TrigT1/TrigT1RPChardware/src/PadReadOutStructure.cxx @@ -127,7 +127,7 @@ ubit16 PadReadOutStructure::decodeFragment(ubit16 inputWord, char &field) { m_l1id = get16Bits(inputWord,s_headerPos[2],s_headerLen[2]); } else if(isSubHeader()) { m_field = 'S'; - m_bcid = get16Bits(inputWord,s_subHeaderPos[1],s_subHeaderLen[1]);; + m_bcid = get16Bits(inputWord,s_subHeaderPos[1],s_subHeaderLen[1]); } else if(isPreFooter()) { m_field = 'P'; m_fifoCM = get16Bits(inputWord,s_prefooterPos[1],s_prefooterLen[1]); diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx index b8120539f961d4e7ee427b780f01c6507961dcfa..f81bab87773a1557a914c79fb4823e667542a342 100644 --- a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx +++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx @@ -293,7 +293,7 @@ TGCSlaveBoard& TGCSlaveBoard::operator=(const TGCSlaveBoard& right) patchPanelOut=0; if(right.patchPanelOut) patchPanelOut = new TGCPatchPanelOut(*right.patchPanelOut); - lengthOfCoincidenceOut = right.lengthOfCoincidenceOut;; + lengthOfCoincidenceOut = right.lengthOfCoincidenceOut; if(coincidenceOut!=0) delete coincidenceOut; coincidenceOut=0; if(right.coincidenceOut) coincidenceOut = new TGCHitPattern(*right.coincidenceOut); diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx index 755fbf385b6416e507f943d5cbde22228f174af4..664bd28c946044fd854ebe2ca581302cb7b7fa26 100644 --- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx +++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyB.cxx @@ -1643,7 +1643,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyB::executeTripletMaking() { // Get z0 index info unsigned int z0index=0; - float z0=m_trks[trk].z0;; + float z0=m_trks[trk].z0; for(unsigned int loop=0; loop<m_spTripletZ0Steps; loop++) { if(z0>=z0Lo[loop] && z0<z0Hi[loop]) z0index=loop; } diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx index 1e49e4f77e8636050ec70193c6e597e780b4fa2d..f2c332b0f24c81967463f115aa947394a3a9cf67 100644 --- a/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx +++ b/Trigger/TrigTools/TrigInDetTrackFitter/src/TrigL2ResidualCalculator.cxx @@ -74,10 +74,10 @@ StatusCode TrigL2ResidualCalculator::initialize() return StatusCode::FAILURE; } if (detStore()->retrieve(m_sctId, "SCT_ID").isFailure()) { - ATH_MSG_FATAL("Could not get SCT ID helper");; + ATH_MSG_FATAL("Could not get SCT ID helper"); return StatusCode::FAILURE; } - ATH_MSG_INFO("Using Athena magnetic field service");; + ATH_MSG_INFO("Using Athena magnetic field service"); sc = m_MagFieldSvc.retrieve(); if(sc.isFailure()) { diff --git a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx index 636dd1da0998e2fdfbb398cdd7c4a7ab819d2ca5..9c1990ab449ef23284214a324bcbffd09fbfd903 100755 --- a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx +++ b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx @@ -119,7 +119,7 @@ StatusCode TrigTRT_DriftCircleProviderTool::initialize() //------------------------------------------------------------------------- StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(const IRoiDescriptor &roi) -{ //std::cout<<" in TrigTRT_DriftCircleProviderTool::convertBStoDCColl "<<std::endl;; +{ //std::cout<<" in TrigTRT_DriftCircleProviderTool::convertBStoDCColl "<<std::endl; m_time_regsel = 0.0; m_time_robprov = 0.0; @@ -229,7 +229,7 @@ StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(const IRoiDescriptor //------------------------------------------------------------------------- StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(std::vector<IdentifierHash> listOfTRTIds,std::vector<const ROBF*> v) -{ //std::cout<<" in TrigTRT_DriftCircleProviderTool::convertBStoDCColl "<<std::endl;; +{ //std::cout<<" in TrigTRT_DriftCircleProviderTool::convertBStoDCColl "<<std::endl; m_time_regsel = 0.0; m_time_robprov = 0.0; diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx index 80125d62639d3752581b0c3c0e5e685e9a4e80c2..7b3a3a20291e70c31674a25013e42a081db5187f 100755 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx @@ -426,7 +426,7 @@ StatusCode T2SampCalibTool::printCondObjects(){ for(int i=0;i<ve_size;++i){ m_log << MSG::DEBUG << "T2SampCalibTool::VECut["<<i<<"]: " << (m_lvl2_calib->ve_cuts()).at(i) - << endmsg;; + << endmsg; } int weight_size=(m_lvl2_calib->calib_weights().size()); m_log << MSG::DEBUG << "T2SampCalibTool::Number of ve bins: " << ve_size << endmsg; diff --git a/graphics/Qat/QatSystemInterfaces/src/Serializer.cpp b/graphics/Qat/QatSystemInterfaces/src/Serializer.cpp index 4e1c2948c03035aaf59c595f3b00f399dfe34a39..86c4b14d520afe601b1e51bd5a49caa6e7d4765c 100644 --- a/graphics/Qat/QatSystemInterfaces/src/Serializer.cpp +++ b/graphics/Qat/QatSystemInterfaces/src/Serializer.cpp @@ -137,7 +137,7 @@ void Serializer::save(const std::string & name) { } void Deserializer::restore(std::string & name){ - QString nameString;; + QString nameString; (*c->state) >> nameString; name = nameString.toStdString(); diff --git a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx index b1946ea6bcc117fc87ee952d1e147eb7301265b6..58c924a87fa8ef43348f20c818540bdcdd0a89e8 100644 --- a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx +++ b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx @@ -785,7 +785,7 @@ void VP1ExaminerViewer::restoreFromState(QByteArray ba_state) state >> ibuffer; if (ibuffer==1) setBufferingType(BUFFER_SINGLE); else if (ibuffer==2) setBufferingType(BUFFER_INTERACTIVE); - else setBufferingType(BUFFER_DOUBLE);; + else setBufferingType(BUFFER_DOUBLE); VP1Msg::messageVerbose("restoreState Render Buffer = ("+str(ibuffer)+")"); //camtype and camera parameters: diff --git a/graphics/VP1/VP1Gui/src/VP1LocalEvtRetriever.cxx b/graphics/VP1/VP1Gui/src/VP1LocalEvtRetriever.cxx index 9de0dfdbddf334f3b36f1b9023908a0d020230ea..3cd4cd8875a50a8ec7156e0fe7e8190902ee741b 100644 --- a/graphics/VP1/VP1Gui/src/VP1LocalEvtRetriever.cxx +++ b/graphics/VP1/VP1Gui/src/VP1LocalEvtRetriever.cxx @@ -72,7 +72,7 @@ void VP1LocalEvtRetriever::updateLocalDir() QString basefn = QFileInfo(fn).fileName(); QString target = tmplocal + basefn; if (!QFile::exists(target)) { - QString tmptarget = ad+basefn+"_"+QString::number(ntmpdlcount++);; + QString tmptarget = ad+basefn+"_"+QString::number(ntmpdlcount++); if (!QFile::copy(fn,tmptarget)) { m_availEvts->message("Problems copying "+fn+" to "+tmptarget); changesad = true; diff --git a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx index e339dcf037d2508924b01c008eca1498e800d4c0..5916f844707192df677fa3e771c94f711aa794c0 100644 --- a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx +++ b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx @@ -284,7 +284,7 @@ VP1MainWindow::VP1MainWindow(VP1ExecutionScheduler*sched,VP1AvailEvents * ae,QWi else savedgoal = s.value("font/pointsize_relativepercent", 0).toInt(); - menu_changeFontSize = menu_Style->addMenu ( "&Font size" );; + menu_changeFontSize = menu_Style->addMenu ( "&Font size" ); QList<int> fontoptions; if (m_defaultfont_pointsize<0.0) fontoptions <<15<<10<<+5<<+3<<+2<<+1<<0<<-1<<-2<<-3<<-5<<-10<<-20<<-30; diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/IParticleCollHandle_Jet.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/IParticleCollHandle_Jet.cxx index 35133db21f614119b453df4ae799a84f46f3ef1f..74635e8c37fa4679938c3d328a3e94daed68d90f 100644 --- a/graphics/VP1/VP1Systems/VP1AODSystems/src/IParticleCollHandle_Jet.cxx +++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/IParticleCollHandle_Jet.cxx @@ -377,7 +377,7 @@ void IParticleCollHandle_Jet::setRandomJetColours(const bool& b) return; d->randomColours = b; - std::cout << "isRandom: " << d->randomColours << std::endl;; + std::cout << "isRandom: " << d->randomColours << std::endl; if (!isLoaded()) return; diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollHandle.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollHandle.cxx index cc75fc32a7be825b47fc426c28d82cacfd4450b3..ff74d390745f012c898a42d338d69a2b0bcc3bd3 100644 --- a/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollHandle.cxx +++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollHandle.cxx @@ -322,7 +322,7 @@ void MissingEtCollHandle::setMetSize(int size) // return; // // d->randomColours = b; -// std::cout << "isRandom: " << d->randomColours << std::endl;; +// std::cout << "isRandom: " << d->randomColours << std::endl; // // if (!isLoaded()) // return; diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx index 0a3d3ec6bcd8c69fb8270a5e288bef69183ae094..06e0615adc9e58278260c0120a56077fc40d802c 100644 --- a/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx +++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx @@ -725,7 +725,7 @@ void VP1AODSystem::dumpToJSON() // std::cout<<"collNum="<<collNum++<<std::endl; if (ahandle->xAODType()!=lastType) { - // std::cout<<"Last type = "<<lastType<<", new type="<<ahandle->xAODType()<<std::endl;; + // std::cout<<"Last type = "<<lastType<<", new type="<<ahandle->xAODType()<<std::endl; // New type, so Terminate the 'type' enclosure add a new level of JSON enclosure. if (lastType != xAOD::Type::EventInfo) { // std::cout<<"Not first loop, so do add },"<<std::endl; diff --git a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VP1GeometrySystem.cxx b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VP1GeometrySystem.cxx index ed9e636c1d9639b005e060a497b832846ee8d8c9..4b3059d2c1d497c866d5b844f3bdb7cfd488d912 100644 --- a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VP1GeometrySystem.cxx +++ b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VP1GeometrySystem.cxx @@ -361,7 +361,7 @@ QWidget * VP1GeometrySystem::buildController() connect(d->controller,SIGNAL(adaptMuonChambersToEventData()),this,SLOT(adaptMuonChambersToEventData())); connect(d->controller,SIGNAL(muonChamberAdaptionStyleChanged(VP1GeoFlags::MuonChamberAdaptionStyleFlags)), this,SLOT(adaptMuonChambersStyleChanged())); - connect(d->controller,SIGNAL(autoExpandByVolumeOrMaterialName(bool,QString)),this,SLOT(autoExpandByVolumeOrMaterialName(bool,QString)));; + connect(d->controller,SIGNAL(autoExpandByVolumeOrMaterialName(bool,QString)),this,SLOT(autoExpandByVolumeOrMaterialName(bool,QString))); connect(d->controller,SIGNAL(actionOnAllNonStandardVolumes(bool)),this,SLOT(actionOnAllNonStandardVolumes(bool))); connect(d->controller,SIGNAL(autoAdaptPixelsOrSCT(bool,bool,bool,bool,bool,bool)),this,SLOT(autoAdaptPixelsOrSCT(bool,bool,bool,bool,bool,bool))); connect(d->controller,SIGNAL(resetSubSystems(VP1GeoFlags::SubSystemFlags)),this,SLOT(resetSubSystems(VP1GeoFlags::SubSystemFlags))); diff --git a/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDSystemController.cxx b/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDSystemController.cxx index be19b7761b8b2c0b359e3b565fd5627a01fee1ef..8fd3713ac3e5473858ec32b273b21e90c30e2b9d 100644 --- a/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDSystemController.cxx +++ b/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDSystemController.cxx @@ -98,7 +98,7 @@ PRDSystemController::PRDSystemController(IVP1System * sys) m_d->highlightmaterial = 0; - m_d->ui_int.matButton_multiselline->setMaterial(VP1MaterialButton::createMaterial(1,1,0));; + m_d->ui_int.matButton_multiselline->setMaterial(VP1MaterialButton::createMaterial(1,1,0)); m_d->ui_cuts.groupBox_cuts_tracksegmentassociation->setVisible(false);//Since it is not used at the moment! if (!VP1QtUtils::environmentVariableIsOn("VP1_DEVEL_ENABLEREFIT")) diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TSOS.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TSOS.cxx index 20cb64383ba1cd358d2b653322ab67bc4cbb795c..6cfdf1a2cf24e1fb781b846cb016600fd29bb8c3 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TSOS.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TSOS.cxx @@ -329,7 +329,7 @@ void AscObj_TSOS::addDeviationFromMeasurementInfoToShapes( SoSeparator*&shape_si delete unitz; SoLineSet * line = new SoLineSet(); - SoVertexProperty * vertices = new SoVertexProperty();; + SoVertexProperty * vertices = new SoVertexProperty(); vertices->vertex.set1Value(0,point.x(),point.y(),point.z()); vertices->vertex.set1Value(1,pointMeas.x(),pointMeas.y(),pointMeas.z()); line->numVertices = 2; @@ -399,7 +399,7 @@ void AscObj_TSOS::addTrackParamInfoToShapes( SoSeparator*&shape_simple, //Line: SoLineSet * line = new SoLineSet(); - SoVertexProperty * vertices = new SoVertexProperty();; + SoVertexProperty * vertices = new SoVertexProperty(); vertices->vertex.set1Value(0,p1.x(),p1.y(),p1.z()); vertices->vertex.set1Value(1,p2.x(),p2.y(),p2.z()); line->numVertices.set1Value(0,2); diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx index 90f2999346a7b336d68a8f8a345dafe4ff81c862..e7f0e523ba66f584f0916eb5ab4dfe831313573b 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/AscObj_TruthPoint.cxx @@ -94,7 +94,7 @@ void AscObj_TruthPoint::buildShapes(SoSeparator*&shape_simple, SoSeparator*&shap Amg::Vector3D p2 = p1+5*CLHEP::cm*u; SoLineSet * line = new SoLineSet(); - SoVertexProperty * vertices = new SoVertexProperty();; + SoVertexProperty * vertices = new SoVertexProperty(); vertices->vertex.set1Value(0,p1.x(),p1.y(),p1.z()); vertices->vertex.set1Value(1,p2.x(),p2.y(),p2.z()); line->numVertices.set1Value(0,2); diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_TRTHit.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_TRTHit.cxx index d97f05881afa32a632071bcdca1a3de66eb6bf06..a4b45b0ba832c334217cdb4ddf29b374423c855f 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_TRTHit.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_TRTHit.cxx @@ -60,8 +60,8 @@ Amg::Vector3D SimHitHandle_TRTHit::momentumDirection() const if (VP1Msg::verbose()&&posStart()==posEnd()) VP1Msg::messageVerbose("SimHitHandle_SiHit::momentumDirection() ERROR: posStart()==posEnd()"); Amg::Vector3D u((posEnd()-posStart()).unit()); -// return Trk::GlobalMomentum(u.x(),u.y(),u.z());; - return Amg::Vector3D(u.x(),u.y(),u.z());; +// return Trk::GlobalMomentum(u.x(),u.y(),u.z()); + return Amg::Vector3D(u.x(),u.y(),u.z()); } //____________________________________________________________________ diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx index 6f9fd0da904c1867328409c6a079ae84786bec07..df71213249b3945e5b49ecc834638feedbe91d78 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx @@ -675,7 +675,7 @@ void TrackHandleBase::Imp::rebuild3DObjects() line->ref(); theclass->registerTrack(); - SoVertexProperty * vertices = new SoVertexProperty();; + SoVertexProperty * vertices = new SoVertexProperty(); int iver(0), numlines(0); diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx index b860730af6a25509326142f5ce88847c621181dc..96225bc4670aebef4cf17f4793756fb837119815 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx @@ -62,7 +62,7 @@ QStringList TrackHandle_TrkTrack::clicked() const l << "ERROR: This TrackHandle_TrkTrack handle has a NULL track pointer!!"; return l; } - l << "Author info: " << " "+QString(m_trk->info().dumpInfo().c_str());; + l << "Author info: " << " "+QString(m_trk->info().dumpInfo().c_str()); l << TrackHandleBase::baseInfo(); if (m_trk->fitQuality()) diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackSystemController.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackSystemController.cxx index 982d7c1421b1d045a40004fd49ef5138b157d46d..f6ee083404c57771222792a9db9c7506529172b8 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackSystemController.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackSystemController.cxx @@ -1629,7 +1629,7 @@ int TrackSystemController::numberOfPointsOnCircles() const //roughly 4..32: const int n(1+static_cast<int>(0.5+7.0*(val-min)/(1.0*max)));//number between 1 and 8 - return std::min<int>(32,std::max<int>(4,4*n));; + return std::min<int>(32,std::max<int>(4,4*n)); } //____________________________________________________________________ diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSummary.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSummary.cxx index 872f589e443849d567453702ae62769b694f2c62..4d0968015c7dd85cca721fc99b158dae05f266a1 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSummary.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSummary.cxx @@ -77,7 +77,7 @@ bool VP1TrackSummary::countHits( const Trk::Segment* seg, return false; std::set<const Trk::TrkDetElementBase*> detelems;// Need several to handle #$$%ing cROTs. EJWM - std::vector< const Trk::MeasurementBase * >::const_iterator tsos_iter = seg->containedMeasurements().begin(), tsos_end = seg->containedMeasurements().end();; + std::vector< const Trk::MeasurementBase * >::const_iterator tsos_iter = seg->containedMeasurements().begin(), tsos_end = seg->containedMeasurements().end(); for (; tsos_iter != tsos_end; ++tsos_iter) { const Trk::MeasurementBase* meas = *tsos_iter; addCounts(detelems, meas, idhelper, nPixelHits , nSCTHits , nTRTHits , nhits_muon_phi , nhits_rpc , nhits_mdt , nhits_tgc , nhits_csc); diff --git a/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/src/VP1TriggerDecisionSystem.cxx b/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/src/VP1TriggerDecisionSystem.cxx index 93c634803206b10af2c0fef52a7cc854a1e7169f..f01c41f361a33bed08365abdebe8a74b1002da91 100644 --- a/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/src/VP1TriggerDecisionSystem.cxx +++ b/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/src/VP1TriggerDecisionSystem.cxx @@ -172,7 +172,7 @@ void VP1TriggerDecisionSystem::Clockwork::getInfo(const std::string& key,const s continue; } os << " "<< roiIt->label() << " ROI: " - << "(" << roi->eta() << ", " << roi->phi() << ") " << std::endl;; + << "(" << roi->eta() << ", " << roi->phi() << ") " << std::endl; } } @@ -194,7 +194,7 @@ void VP1TriggerDecisionSystem::Clockwork::getInfo(const std::string& key,const s } os << " "<< roiIt->label() << " ROI: " - << "(" << roi->eta() << ", " << roi->phi() << ") " << std::endl;; + << "(" << roi->eta() << ", " << roi->phi() << ") " << std::endl; } } } diff --git a/graphics/VP1/VP1Utils/src/SurfaceToSoNode.cxx b/graphics/VP1/VP1Utils/src/SurfaceToSoNode.cxx index cb76ab42cb284a3202d201edda3a982f7a7fe2c5..f30d452a2a263522e01e4e3772a8a9c018bac835 100644 --- a/graphics/VP1/VP1Utils/src/SurfaceToSoNode.cxx +++ b/graphics/VP1/VP1Utils/src/SurfaceToSoNode.cxx @@ -146,7 +146,7 @@ SoNode* SurfaceToSoNode::translatePlaneSurface(const Trk::PlaneSurface& psf x.push_back(-cdiabo->minHalflengthX());y.push_back( -2*cdiabo->halflengthY1()); SbPolyhedronPolygonXSect sbPoly(x,y,dz); - return new SoPolyhedron(sbPoly);; + return new SoPolyhedron(sbPoly); } const Trk::AnnulusBounds* cannulus = dynamic_cast<const Trk::AnnulusBounds*>(&(psf.bounds()));