From 699dba0d352bf7192cc4a2d9a7bb4d23845cfe61 Mon Sep 17 00:00:00 2001 From: Charles Leggett <leggett@cern.ch> Date: Wed, 1 Mar 2017 19:09:59 +0100 Subject: [PATCH] replace all instances of endreq with endmsg endreq is deprecated, and replaced with endmsg. Did not replace in log files, or READMEs. Two files which are questionable are InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/GeoModelTRT.dev and InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx --- .../SimpleDataVector.h | 2 +- .../src/CaloBadChanTool.cxx | 4 +- .../src/CaloSurfaceBuilder.cxx | 28 +- .../AsgTools/AsgTools/MsgStream.h | 2 - .../AthExStoreGateExample/src/ReadData.cxx | 12 +- .../src/ReadDataReentrant.cxx | 12 +- .../MultiInputExample/src/MyAlg.cxx | 40 +-- .../MultiInputExample/src/MyMultiInputAlg.cxx | 40 +-- .../src/PerfMonTestErroneousAlg.cxx | 2 +- .../src/MonitoringFile_DiMuPostProcess.cxx | 2 +- .../AthenaPoolTools/src/EventCount.cxx | 12 +- .../CoolLumiUtilities/src/BunchGroupTool.cxx | 2 +- .../CoolLumiUtilities/src/BunchLumisTool.cxx | 2 +- .../CoolLumiUtilities/src/FillParamsTool.cxx | 6 +- Database/FileStager/src/FileStagerAlg.cxx | 32 +- .../src/IOVPayloadContainerPTCnv_p1.cxx | 4 +- .../AGDDHandlers/src/compositionHandler.cxx | 2 +- .../DetDescrCondTools/src/CoolHistSvc.cxx | 8 +- .../DetectorStatus/doc/packagedoc.h | 8 +- .../RegionSelector/src/RegSelSvc.cxx | 8 +- .../RegionSelector/src/RegSelectorHashMap.cxx | 4 +- .../RegionSelector/src/RegSelectorMap.cxx | 4 +- .../RegionSelector/src/obsolete.icc | 224 +++++++------- .../src/EventBookkeeper.cxx | 4 +- .../src/INav4MomAssocsCnv.cxx | 2 +- .../src/INav4MomLinkContainerCnv.cxx | 2 +- .../src/IParticleLinkContainerCnv.cxx | 2 +- .../src/INav4MomAssocsCnv_p1.cxx | 26 +- .../src/INav4MomAssocsCnv_p2.cxx | 8 +- .../src/INav4MomAssocsCnv_p3.cxx | 2 +- .../IDC_OverlayBase/IDC_OverlayCommon.icc | 8 +- .../src/xAODCaloRingsContainerCnv.cxx | 2 +- .../Root/TrigT2MbtsBits_v1.cxx | 4 +- .../AFP_Digitization/src/AFP_PileUpTool.cxx | 4 +- .../AFP_EventTPCnv/src/AFP_RawDataCnv_p1.cxx | 4 +- .../src/AFP_RawDataCollectionCnv_p1.cxx | 4 +- .../src/AFP_RawDataContainerCnv_p1.cxx | 4 +- .../src/AFP_SIDLocRecoEventCnv_p1.cxx | 4 +- .../src/AFP_SIDSimHitCnv_p1.cxx | 4 +- .../AFP_EventTPCnv/src/AFP_SiDigiCnv_p1.cxx | 4 +- .../AFP_EventTPCnv/src/AFP_TDDigiCnv_p1.cxx | 4 +- .../src/AFP_TDLocRecoEventCnv_p1.cxx | 4 +- .../AFP_EventTPCnv/src/AFP_TDSimHitCnv_p1.cxx | 4 +- .../AFP_LocReco/src/AFP_SIDBasicKalman.cxx | 26 +- .../AFP_LocReco/src/AFP_SIDLocReco.cxx | 6 +- .../AFP_LocReco/src/AFP_TDLocReco.cxx | 10 +- .../AFP_LocReco/src/AFP_TDZVertex.cxx | 4 +- .../src/ALFA_BeamTransport.cxx | 24 +- .../ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx | 50 ++-- .../src/ALFA_CLinkEventCnv.cxx | 8 +- .../src/ALFA_RawDataContainerCnv.cxx | 6 +- .../src/ALFA_RawDataContainerCnv_charge.cxx | 6 +- .../ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx | 112 +++---- .../ALFA_GloRec/src/ALFA_GloRec.cxx | 48 +-- .../ALFA_GloRec/src/AlfaLocalHits.cxx | 8 +- .../src/ForwardRegionFieldSvc.cxx | 8 +- .../src/SimulationHitCnv_p1.cxx | 4 +- .../src/LUCID_DigitContainerCnv.cxx | 4 +- .../src/LUCID_RawDataContainerCnv.cxx | 4 +- .../src/LUCID_DigitByteStreamCnv.cxx | 12 +- .../src/LUCID_RodDecoder.cxx | 12 +- .../src/LUCID_RodEncoder.cxx | 20 +- .../src/LUCID_DigiSettings.cxx | 18 +- .../src/LUCID_PileUpTool.cxx | 12 +- .../src/LUCID_HitsMoniTool.cxx | 14 +- .../src/ZDC_PileUpTool.cxx | 6 +- .../BoostAfterburner/src/BoostEvent.cxx | 12 +- .../Charybdis_i/src/CharybdisInterface.cxx | 4 +- .../src/GenPDG_Property.cxx | 4 +- Generators/EvtGen_i/src/EvtDecay.cxx | 18 +- Generators/EvtGen_i/src/EvtInclusiveDecay.cxx | 54 ++-- Generators/ExoGraviton_i/src/ExoGraviton.cxx | 2 +- Generators/FlowAfterburner/src/CheckFlow.cxx | 44 +-- .../FlowAfterburner/src/CheckFlow_New.cxx | 44 +-- .../EventBoost/src/EventBoost.cxx | 34 +-- .../ReweightTools/src/PDFReweightTool.cxx | 62 ++-- .../TruthHelper/src/GenAccessIO.cxx | 6 +- .../GeneratorFilters/src/DecayModeFilter.cxx | 2 +- .../GeneratorFilters/src/DiBjetFilter.cxx | 8 +- .../GeneratorFilters/src/GapJetFilter.cxx | 50 ++-- Generators/GeneratorFilters/src/HTFilter.cxx | 2 +- .../src/JetFilterWithTruthPhoton.cxx | 42 +-- .../src/LeadingDiBjetFilter.cxx | 36 +-- .../GeneratorFilters/src/LeptonPairFilter.cxx | 12 +- .../src/MultiParticleFilter.cxx | 20 +- .../src/ParentChildwStatusFilter.cxx | 30 +- .../src/TTbarPlusHeavyFlavorFilter.cxx | 4 +- .../src/TrimuMassRangeFilter.cxx | 42 +-- .../src/VBFHbbEtaSortingFilter.cxx | 10 +- .../src/McEventCollectionCnv.cxx | 4 +- Generators/Starlight_i/src/Starlight_i.cxx | 32 +- Generators/TruthIO/src/HepMCReadFromFile.cxx | 8 +- .../TruthIO/src/ReadHepEvtFromAscii.cxx | 14 +- .../InDetAlignGenAlgs/doc/packagedoc.h | 2 +- .../InDetAlignGenAlgs/src/AddTRTMomConstr.cxx | 28 +- .../InDetAlignGenAlgs/src/AlignWrt.cxx | 24 +- .../src/CreateMisalignAlg.cxx | 282 +++++++++--------- .../InDetAlignGenAlgs/src/GeoModelTRT.dev | 22 +- .../InDetAlignGenAlgs/src/SiDistWriteAlg.cxx | 16 +- .../src/SurveyConstraint.cxx | 104 +++---- .../src/SurveyConstraintTestAlg.cxx | 86 +++--- .../src/DetailedIDNtupleTool.cxx | 44 +-- .../src/SimpleIDNtupleTool.cxx | 18 +- .../src/RefitTracksAndVertex.cxx | 2 +- .../InDetBeamSpotService/src/BeamCondSvc.cxx | 32 +- .../TRT_ConditionsAlgs/src/TRTCondWrite.cxx | 6 +- .../TRT_ConditionsAlgs/src/TRTStrawAlign.cxx | 50 ++-- .../src/TRTStrawStatusWrite.cxx | 12 +- .../InDetCosmicsFilters/src/TrackFilter.cxx | 20 +- .../BCM_GeoModel/src/BCM_Module.cxx | 4 +- .../BLM_GeoModel/src/BLM_Module.cxx | 4 +- .../src/InDetDetectorManager.cxx | 46 +-- .../src/PixelDetectorManager.cxx | 58 ++-- .../src/SCT_DetectorManager.cxx | 20 +- .../src/SiCommonItems.cxx | 2 +- .../src/SiDetectorElement.cxx | 22 +- .../src/SiDetectorManager.cxx | 4 +- .../src/TRT_DetectorManager.cxx | 38 +-- .../src/SiLayerBuilder.cxx | 2 +- .../src/TRTFastDigitizationTool.cxx | 4 +- .../src/BCM_RawContByteStreamCnv.cxx | 14 +- .../src/BCM_RawContByteStreamTool.cxx | 8 +- .../src/BCM_RawDataProvider.cxx | 20 +- .../src/BCM_RawDataProviderTool.cxx | 14 +- .../src/BCM_RodDecoder.cxx | 46 +-- .../src/BCM_RDO_CollectionCnv_p0.cxx | 4 +- .../src/BCM_RDO_ContainerCnv.cxx | 8 +- .../src/BCM_RDO_ContainerCnv_p0.cxx | 4 +- .../src/BCM_RawDataCnv_p0.cxx | 4 +- .../InDetJiveXML/src/BeamSpotRetriever.cxx | 18 +- .../InDetJiveXML/src/InDetGeoModelTool.cxx | 16 +- .../src/PixelClusterRetriever.cxx | 10 +- .../InDetJiveXML/src/PixelRDORetriever.cxx | 10 +- .../InDetJiveXML/src/SCTRDORetriever.cxx | 8 +- .../InDetJiveXML/src/SiClusterRetriever.cxx | 10 +- .../src/SiSpacePointRetriever.cxx | 16 +- .../InDetJiveXML/src/TRTRetriever.cxx | 14 +- .../TRT_G4Utilities/src/TRTOutputFile.cc | 8 +- .../TRT_G4Utilities/src/TRTParameters.cc | 16 +- .../src/TRTParametersOfBarrelStraws.cc | 16 +- .../src/TRTParametersOfModulesA.cc | 16 +- .../src/TRTParametersOfModulesB.cc | 16 +- .../src/TRTParametersOfModulesC.cc | 16 +- .../src/TRTParametersOfStrawPlanes.cc | 16 +- .../src/TRTParametersOfWheelsA.cc | 16 +- .../src/TRTParametersOfWheelsB.cc | 16 +- .../src/TRTParametersOfWheelsC.cc | 16 +- .../TRT_G4Utilities/src/TRTUtilities.cc | 8 +- .../TRT_G4Utilities/src/TRTVisualization.cc | 12 +- .../TRT_G4_SD/src/TRTPrintingOfHits.cxx | 8 +- .../src/GetDetectorLocalFrames.cxx | 44 +-- .../src/GetDetectorPositions.cxx | 52 ++-- .../InDetDiMuonMonitoring/src/DiMuMon.cxx | 8 +- .../src/InDetGlobalBCMTool.cxx | 6 +- .../src/InDetGlobalBeamSpotMonTool.cxx | 6 +- .../src/InDetGlobalErrorMonTool.cxx | 8 +- .../src/InDetGlobalHitsMonTool.cxx | 10 +- .../src/InDetGlobalManager.cxx | 68 ++--- .../src/InDetGlobalMotherMonTool.cxx | 24 +- .../src/InDetGlobalMotherMonTool.h | 10 +- .../src/InDetGlobalMotherTrigMonTool.cxx | 4 +- .../src/InDetGlobalNoiseOccupancyMonTool.cxx | 26 +- .../src/InDetGlobalPixelTool.cxx | 2 +- .../src/InDetGlobalSynchMonTool.cxx | 4 +- .../src/InDetGlobalTopBottomMonTool.cxx | 40 +-- .../src/InDetGlobalTrackMonTool.cxx | 14 +- .../PixelMonitoring/src/Clusters.cxx | 12 +- .../PixelMonitoring/src/Errors.cxx | 8 +- .../PixelMonitoring/src/Hits.cxx | 28 +- .../PixelMonitoring/src/PixelDCSMon.cxx | 10 +- .../PixelMonitoring/src/PixelMainMon.cxx | 130 ++++---- .../PixelMonitoring/src/SpacePoints.cxx | 6 +- .../PixelMonitoring/src/Status.cxx | 8 +- .../PixelMonitoring/src/Track.cxx | 18 +- .../src/BCM_ZeroSuppression.cxx | 20 +- .../src/BcmCollisionTimeAlg.cxx | 2 +- .../InDetLowBetaFinder/src/LowBetaAlg.cxx | 18 +- .../src/TrackParticleCreator.cxx | 54 ++-- .../src/InDetPriVxDummyFinder.cxx | 4 +- .../InDetPriVxFinder/src/InDetPriVxFinder.cxx | 26 +- .../src/InDetTrackPRD_Association.cxx | 8 +- .../InDetZVTOP_Alg/src/InDetZVTOP_Alg.cxx | 30 +- .../src/TRT_StandaloneTrackFinder.cxx | 12 +- .../InDetPRD_AssociationToolGangedPixels.cxx | 30 +- .../src/CompetingSCT_ClustersOnTrackTool.cxx | 66 ++-- .../CompetingTRT_DriftCirclesOnTrackTool.cxx | 68 ++--- .../src/DivisiveMultiSeedFinder.cxx | 88 +++--- .../src/HistogrammingMultiSeedFinder.cxx | 76 ++--- .../src/SlidingWindowMultiSeedFinder.cxx | 64 ++-- .../src/InDetTrackClusterCleaningTool.cxx | 54 ++-- .../src/InDetTrackZ0SortingTool.cxx | 12 +- .../src/PVFindingTrackFilter_cxx | 14 +- .../src/InDetJetFitterUtils.cxx | 2 +- .../src/InDetTestBLayerTool.cxx | 46 +-- .../src/InDetTestPixelLayerTool.cxx | 38 +-- .../src/InDetTrackHoleSearchTool.cxx | 46 +-- .../src/InDetConversionTrackSelectorTool.cxx | 30 +- .../src/InDetCosmicTrackSelectorTool.cxx | 6 +- .../src/InDetDetailedTrackSelectorTool.cxx | 24 +- .../src/InDetTrackSelectorTool.cxx | 6 +- .../src/InDetTrtDriftCircleCutTool.cxx | 8 +- .../src/InDetVKalPriVxFinder.cxx | 76 ++--- .../InDetVKalPriVxFinderTool/src/PVrtFind.cxx | 8 +- .../InDetVKalPriVxFinderTool/src/PVrtFit.cxx | 12 +- .../src/Utilities.cxx | 4 +- .../InDetVKalVxInJetTool/src/BTagVrtSec.cxx | 2 +- .../src/InDetVKalVxInJetTool.cxx | 4 +- .../src/ZVTOP_AmbiguitySolver.cxx | 10 +- .../src/ZVTOP_SecVtxTool.cxx | 68 ++--- .../src/ZVTOP_SimpleVtxProbCalc.cxx | 2 +- .../src/ZVTOP_SlowSpatialPointFinder.cxx | 30 +- .../src/ZVTOP_SpatialPointFinder.cxx | 22 +- .../InDetZVTOPVxFinder/src/ZVTOP_Tool.cxx | 62 ++-- .../src/ZVTOP_TrkProbTubeCalc.cxx | 10 +- .../src/SeedToTrackConversionTool.cxx | 10 +- .../src/SiCombinatorialTrackFinder_xk.cxx | 38 +-- .../src/SiSpacePointsSeedMaker_ATLxk.cxx | 14 +- .../src/SiSpacePointsSeedMaker_BeamGas.cxx | 12 +- .../src/SiSpacePointsSeedMaker_Cosmic.cxx | 12 +- .../src/SiSpacePointsSeedMaker_HeavyIon.cxx | 8 +- .../src/SiSpacePointsSeedMaker_ITK.cxx | 14 +- .../SiSpacePointsSeedMaker_LowMomentum.cxx | 12 +- .../src/SiSpacePointsSeedMaker_Trigger.cxx | 8 +- .../TRT_DriftCircleOnTrackRecalibrateTool.cxx | 12 +- .../src/TRT_DriftCircleOnTrackTool.cxx | 6 +- .../TRT_DriftCircleOnTrackUniversalTool.cxx | 4 +- .../src/TRT_TrackSegmentsMaker_ATLxk.cxx | 34 +-- .../TRT_TrackSegmentsMaker_BarrelCosmics.cxx | 100 +++---- .../src/TRT_TrackSegmentsMaker_ECcosmics.cxx | 202 ++++++------- .../TRT_TR_Process/src/TRRegionXMLHandler.cxx | 12 +- .../src/TRTTransitionRadiation.cxx | 10 +- .../src/InDetTrigAmbiguitySolver.cxx | 30 +- .../src/InDetTrigExtensProcessor.cxx | 56 ++-- .../src/Pixel_TrgClusterization.cxx | 4 +- .../src/SCT_TrgClusterization.cxx | 2 +- .../src/TRT_TrgRIO_Maker.cxx | 4 +- .../src/TrigPixRawDataProvider.cxx | 40 +-- .../src/TrigSCTRawDataProvider.cxx | 40 +-- .../src/TrigTRTRawDataProvider.cxx | 40 +-- .../src/TrigTrackResidualMonitor.cxx | 62 ++-- .../src/TrigTrackSlimmer.cxx | 28 +- .../src/SCT_TrigSpacePointTool.cxx | 6 +- .../src/SiTrigSpacePointFinder.cxx | 2 +- .../src/PRD_TruthTrajectoryManipulatorID.cxx | 2 +- .../src/PRD_TruthTrajectorySelectorID.cxx | 2 +- .../src/SegmentDriftCircleAssValidation.cxx | 20 +- .../src/TrackClusterAssValidation.cxx | 26 +- .../src/InDetTrackSplitterTool.cxx | 218 +++++++------- .../src/LArAffectedRegionAlg.cxx | 2 +- .../LArCalibTools/LArReadParamsFromFile.icc | 6 +- .../src/CaloCellGroup2Ntuple.cxx | 12 +- .../LArCalibTools/src/CaloCondBlob2Ntuple.cxx | 14 +- .../src/LArAccumulatedDigits2Ntuple.cxx | 36 +-- .../LArCalibTools/src/LArAutoCorr2Ntuple.cxx | 12 +- .../LArCalibTools/src/LArCaliWaves2Ntuple.cxx | 42 +-- .../LArCalibTools/src/LArCompleteToFlat.cxx | 120 ++++---- .../LArCalibTools/src/LArCond2NtupleBase.cxx | 68 ++--- .../LArCalibTools/src/LArDSPConfig2Ntuple.cxx | 14 +- .../src/LArDSPThresholds2Ntuple.cxx | 20 +- .../LArCalibTools/src/LArDigits2Ntuple.cxx | 30 +- .../LArCalibTools/src/LArFEBTemp2Ntuple.cxx | 14 +- .../src/LArFebTimeOffset2Ntuple.cxx | 4 +- .../LArCalibTools/src/LArFillDSPConfig.cxx | 4 +- .../src/LArGainThresholds2Ntuple.cxx | 10 +- .../src/LArHVScaleCorr2Ntuple.cxx | 8 +- .../src/LArMphysOverMcal2Ntuple.cxx | 12 +- .../LArCalibTools/src/LArNoise2Ntuple.cxx | 12 +- .../LArCalibTools/src/LArOFC2Ntuple.cxx | 32 +- .../LArCalibTools/src/LArOFCBinAlg.cxx | 12 +- .../LArCalibTools/src/LArParams2Ntuple.cxx | 86 +++--- .../LArCalibTools/src/LArPedestals2Ntuple.cxx | 14 +- .../LArCalibTools/src/LArPhysCaliTDiffAlg.cxx | 8 +- .../LArCalibTools/src/LArPhysWaves2Ntuple.cxx | 26 +- .../LArCalibTools/src/LArRamps2Ntuple.cxx | 84 +++--- .../LArCalibTools/src/LArShape2Ntuple.cxx | 24 +- .../LArCalibTools/src/LArWFParams2Ntuple.cxx | 32 +- .../LArCalibTools/src/LArWaves2Ntuple.cxx | 26 +- .../LArCalibTools/src/LArfSampl2Ntuple.cxx | 10 +- .../LArCalibTools/src/LAruA2MeV2Ntuple.cxx | 14 +- .../src/TestLArHWID_Algo.cxx | 80 ++--- .../src/LArDSPThresholdFillInline.cxx | 8 +- .../LArEventTest/src/DumpLArRawChannels.cxx | 2 +- .../src/LumiBlockCollectionCnv.cxx | 2 +- .../MagFieldUtils/src/MagFieldTestbedAlg.cxx | 2 +- .../src/MuonSegmentToCalibSegment.cxx | 20 +- .../src/MuonEventCnvTool.cxx | 2 +- .../MuonAGDD/src/MuonAGDDToolHelper.cxx | 2 +- .../MuonGeoModelTest/src/MuonGMCheck.cxx | 4 +- .../MuonGeoModelTest/src/MuonGMTestOnPrd.cxx | 10 +- .../MuonSegPatAssMap.h | 8 +- .../src/MuonHoughMathUtils.cxx | 8 +- .../src/MuonAlignValidation.cxx | 2 +- .../src/CscCalibMonToolBase.cxx | 138 ++++----- .../src/CscCalibMonToolPed.cxx | 104 +++---- .../src/CscCalibMonToolSlope.cxx | 168 +++++------ .../src/InnerDetProbeCollectorTool.cxx | 26 +- .../MuonDQAUtils/src/InsituTrackTools.cxx | 6 +- .../MuonDQAUtils/src/MuonDQAFitFunc.cxx | 14 +- .../MuonSpectrometerProbeCollectorTool.cxx | 30 +- .../src/MdtRawDataValAlg.cxx | 2 +- .../src/MdtVsTgcRawDataValAlg.cxx | 50 ++-- .../src/MdtVsTgcRawData_TGCEffCheck.cxx | 48 +-- .../src/MdtVsTgcRawData_bookhistograms.cxx | 24 +- .../src/MdtVsTgcRawData_correlation.cxx | 16 +- .../src/MdtVsTgcRawData_functions.cxx | 4 +- .../src/MdtVsTgcRawData_maptgchits.cxx | 4 +- .../MdtVsTgcRawData_MidstationMatching.cxx | 4 +- .../functions/MdtVsTgcRawData_PRDonTrack.cxx | 4 +- .../src/RpcLv1RawDataEfficiency.cxx | 58 ++-- .../src/RpcLv1RawDataSectorLogic.cxx | 142 ++++----- .../src/TgcLv1RawDataValAlg.cxx | 64 ++-- .../TgcLv1RawDataValAlg_CoincidenceWindow.cxx | 6 +- .../src/TgcLv1RawDataValAlg_Efficiency.cxx | 58 ++-- .../TgcLv1RawDataValAlg_NumberOfTrigger.cxx | 78 ++--- .../src/TgcLv1RawDataValAlg_ReadContainer.cxx | 26 +- .../TgcLv1RawDataValAlg_Summary_LowStat.cxx | 12 +- .../src/TgcLv1RawDataValAlg_TriggerTiming.cxx | 100 +++---- .../src/TgcRawDataValAlg.cxx | 60 ++-- .../src/TgcRawDataValAlg_Efficiency.cxx | 34 +-- .../src/TgcRawDataValAlg_Functions.cxx | 12 +- .../src/TgcRawDataValAlg_NumberOfHits.cxx | 12 +- .../src/TgcRawDataValAlg_Profile.cxx | 14 +- .../src/TgcRawDataValAlg_ReadContainer.cxx | 10 +- .../src/TgcRawDataValAlg_Summary_LowStat.cxx | 14 +- .../src/TgcRawDataValAlg_XYView.cxx | 6 +- .../src/AODCaloClusterRetriever.cxx | 42 +-- .../AnalysisJiveXML/src/AODJetRetriever.cxx | 30 +- .../AnalysisJiveXML/src/BJetRetriever.cxx | 32 +- .../src/CompositeParticleRetriever.cxx | 22 +- .../AnalysisJiveXML/src/ElectronRetriever.cxx | 26 +- .../AnalysisJiveXML/src/MuonRetriever.cxx | 24 +- .../AnalysisJiveXML/src/PhotonRetriever.cxx | 26 +- .../AnalysisJiveXML/src/TauJetRetriever.cxx | 40 +-- .../src/TrackParticleRetriever.cxx | 24 +- .../src/TrigEMClusterRetriever.cxx | 6 +- .../src/TruthParticleRetriever.cxx | 18 +- .../src/RawInfoSummaryForTagCnv.cxx | 4 +- .../JetTagAlgs/BTagging/src/BJetBuilder.cxx | 32 +- .../BTagging/src/BTagTrackAssociation.cxx | 6 +- .../src/CalibrationBroker.cxx | 4 +- .../TauID/TauTrackEvent/src/TruthTau.cxx | 4 +- .../McParticleTests/src/McAodSymLinkTests.cxx | 36 +-- .../HIRecAthenaPool/src/EtaPhiBinsCnv.cxx | 2 +- .../src/HIPixelTrackletsCollectionCnv.cxx | 4 +- .../HIRecAthenaPool/src/HITRTInfoCnv.cxx | 2 +- .../HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx | 24 +- .../HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx | 16 +- .../HIRecTPCnv/src/HITRTInfoCnv_p1.cxx | 10 +- .../Root/JetTruthParticleSelectorTool.cxx | 16 +- .../Jet/JetUtils/Root/JetCaloVariables.cxx | 28 +- .../PanTau/PanTauAlgs/Root/TauFeature.cxx | 8 +- .../PanTau/PanTauEvent/src/TauFeature.cxx | 10 +- .../src/RecoTimingObjCnv.cxx | 2 +- .../src/obsolete/CBNTAA_DetailedCellInfo.cxx | 114 +++---- .../FastCaloSimHit/src/FastHitConv.cxx | 2 +- .../src/CaloCalibrationHitsTestTool.cxx | 4 +- .../G4Atlas/G4AtlasTests/src/SimTestHisto.h | 2 +- .../G4AtlasTests/src/TileHitsTestTool.cxx | 2 +- .../RHadrons/src/SG_StepNtuple.cxx | 2 +- .../G4SimTPCnv/src/TrackRecordCnv_p1.cxx | 6 +- .../G4Field/src/G4AtlasFieldSvc.cxx | 2 +- .../src/BremsstrahlungStrategy.cxx | 4 +- .../src/CaloCatchAllStrategy.cxx | 6 +- .../G4TruthStrategies/src/ComptonStrategy.cxx | 4 +- .../src/ConversionStrategy.cxx | 4 +- .../G4TruthStrategies/src/DecayStrategy.cxx | 4 +- .../src/HadronicInteractionStrategy.cxx | 4 +- .../src/IonizationStrategy.cxx | 4 +- .../Geo2G4/src/Geo2G4SolidFactory.cxx | 80 ++--- .../src/PlanarClusterOnTrack.cxx | 8 +- .../src/ISF_PRD_AssociationTool.cxx | 16 +- .../src/ISF_TrackSummaryHelperTool.cxx | 54 ++-- .../src/PlanarClusterOnTrackTool.cxx | 2 +- .../ISF_Geant4Services/src/Geant4SimSvc.cxx | 10 +- .../ISF_TrackingTools/src/TrkExtrapolator.cxx | 4 +- .../src/PileUpEventInfoTest.cxx | 16 +- .../src/PileUpEventInfoTestTool.cxx | 16 +- .../AtlasCLHEP_RandomGenerators_test.cxx | 46 +-- .../TruthJiveXML/src/TruthTrackRetriever.cxx | 10 +- .../TBCaloGeometry/src/TBCaloCoordinate.cxx | 12 +- .../TBCondRunPar/src/TBCondRunParTool.cxx | 2 +- TestBeam/TBTPCnv/src/TBBPCContCnv_p1.cxx | 2 +- TestBeam/TBTPCnv/src/TBTailCatcherCnv_p1.cxx | 2 +- .../TileGeoG4SD/src/TileGeoG4LookupBuilder.cc | 4 +- .../TileMonitoring/src/TileCellMonTool.cxx | 2 +- .../TileMonitoring/src/TileDigitsMonTool.cxx | 2 +- .../src/TileRawChannelMonTool.cxx | 6 +- .../TileSimUtils/src/TileSimInfoLoader.cxx | 2 +- .../AthExHelloWorld/src/HelloAlg.cxx | 8 +- Tools/Scripts/share/newpkg | 8 +- .../TrkTrackSlimmer/src/TrackSlimmer.cxx | 4 +- .../VxJetVertex/src/RecVertexPositions.cxx | 6 +- .../VxJetVertex/src/VertexPositions.cxx | 4 +- .../VxJetVertex/src/VxJetFitterDebugInfo.cxx | 4 +- .../src/TrackFitInputPreparator.cxx | 6 +- .../TrkKalmanFitter/doc/packagedoc.h | 2 +- .../TrkVertexBilloirTools/FastVertexFitter.h | 10 +- .../TrkVertexBilloirTools/FullVertexFitter.h | 10 +- .../src/FastVertexFitter.cxx | 44 +-- .../src/FullVertexFitter.cxx | 28 +- .../src/Chi2TrackCompatibilityEstimator.cxx | 6 +- .../src/DetAnnealingMaker.cxx | 6 +- .../src/DummyAnnealingMaker.cxx | 4 +- .../src/FullLinearizedTrackFactory.cxx | 4 +- .../src/ImpactPoint3dEstimator.cxx | 56 ++-- .../src/KalmanVertexTrackUpdator.cxx | 24 +- .../src/KalmanVertexUpdator.cxx | 10 +- .../NeutralParticleParameterCalculator.cxx | 18 +- .../src/TrackToVertexIPEstimator.cxx | 30 +- .../src/Z0PVTrackComaptibilityEstimator.cxx | 2 +- .../src/CrossDistancesSeedFinder.cxx | 38 +-- .../src/DummySeedFinder.cxx | 4 +- .../src/ImagingSeedFinder.cxx | 20 +- .../src/MCTrueSeedFinder.cxx | 12 +- .../src/ZScanSeedFinder.cxx | 32 +- .../src/NNVertexWeightCalculator.cxx | 20 +- .../src/SumPtVertexWeightCalculator.cxx | 6 +- .../TrueVertexDistanceWeightCalculator.cxx | 8 +- .../TrigDetCalib/src/ScoutingStreamWriter.cxx | 14 +- .../TrigDetCalib/src/TrigCheckForTracks.cxx | 28 +- .../TrigDetCalib/src/TrigEtaHypo.cxx | 12 +- .../TrigDetCalib/src/TrigROBListWriter.cxx | 10 +- .../TrigDetCalib/src/TrigROBSelector.cxx | 6 +- .../TrigDetCalib/src/TrigSubDetListWriter.cxx | 36 +-- .../TrigEgammaRec/src/TrigEgammaRec.cxx | 112 +++---- .../src/TrigHLTJetHemisphereRec.cxx | 2 +- .../src/IParticleSelectorEtaPt.cxx | 2 +- .../src/PseudoJetSelectorEtaPt.cxx | 2 +- .../TrigL2MissingET/src/T2CaloMissingET.cxx | 90 +++--- .../TrigL2MissingET/src/T2MissingET.cxx | 104 +++---- .../src/TrigL2SiTrackFinder.cxx | 116 +++---- .../TrigMinBias/src/TrigTrackCounter.cxx | 22 +- .../TrigMinBias/src/TrigVertexCounter.cxx | 20 +- .../TrigMinBias/src/TrigVertexCounterHypo.cxx | 36 +-- .../src/TrigMissingETMuon.cxx | 82 ++--- .../TrigSecVtxFinder/src/TrigSecVtxFinder.cxx | 98 +++--- .../TrigT2CaloCommon/src/T2CaloBase.cxx | 16 +- .../TrigT2CaloCommon/src/T2CaloInitSvc.cxx | 10 +- .../TrigT2CaloCommon/src/T2CaloNewBase.cxx | 20 +- .../TrigT2CaloCommon/src/TrigDataAccess.cxx | 4 +- .../TrigT2CaloCosmic/CosmicSamp2Fex.h | 2 +- .../TrigT2CaloCosmic/src/T2CaloCosmic.cxx | 50 ++-- .../TrigT2CaloEgamma/EgammaAllFex.h | 2 +- .../TrigT2CaloEgamma/EgammaHadEnFex.h | 2 +- .../TrigT2CaloEgamma/EgammaSamp2Fex.h | 2 +- .../TrigT2CaloEgamma/src/EgammaHadEnFex.cxx | 4 +- .../TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx | 2 +- .../TrigT2CaloEgamma/src/T2CaloEgamma.cxx | 86 +++--- .../TrigT2CaloTau/src/T2CaloTau.cxx | 86 +++--- .../TrigT2CaloTau/src/TauAllCaloDRFex.cxx | 48 +-- .../src/TrigT2HistoPrmVtx.cxx | 68 ++--- .../src/TrigT2HistoPrmVtxAllTE.cxx | 70 ++--- .../src/TrigT2HistoPrmVtxBase.cxx | 50 ++-- .../src/TrigT2HistoPrmVtxCombo.cxx | 8 +- .../TrigT2IDTau/src/T2IDTau.cxx | 94 +++--- .../TrigT2IDTau/src/T2IDTauIPHelper.cxx | 42 +-- .../TrigT2MinBias/src/T2MbtsFex.cxx | 44 +-- .../TrigT2MinBias/src/T2MbtsHypo.cxx | 40 +-- .../TrigT2MinBias/src/T2MbtsUtils.cxx | 12 +- .../TrigT2MinBias/src/T2ZdcFex.cxx | 16 +- .../TrigT2MinBias/src/T2ZdcHypo.cxx | 36 +-- .../src/TrigCountSpacePoints.cxx | 150 +++++----- .../src/TrigCountSpacePointsHypo.cxx | 208 ++++++------- .../TrigT2MinBias/src/TrigCountTrtHits.cxx | 60 ++-- .../src/TrigCountTrtHitsHypo.cxx | 58 ++-- .../TrigT2Tau/src/T2TauFinal.cxx | 60 ++-- .../TrigT2Tau/src/T2TauTrkRadiusTool.cxx | 2 +- .../TrigTauRec/src/TrigTauRecMerged.cxx | 170 +++++------ .../TrigAlgorithms/TrigmuIso/src/muIso.cxx | 58 ++-- .../TrigmuRoI/src/TrigmuRoI.cxx | 66 ++-- .../src/TrigDecisionMaker.cxx | 2 +- .../AnalysisConfig_Ntuple.h | 2 - .../T_AnalysisConfig_Tier0.h | 174 ++++++----- .../TrigTestMonToolAC.h | 2 +- .../TrigTestPhysValMon.h | 4 +- .../src/AnalysisConfig_Ntuple.cxx | 243 ++++++++------- .../src/TrigTestBase.cxx | 64 ++-- .../src/TrigTestMonToolAC.cxx | 54 ++-- .../src/TrigInDetTrackTruthMaker.cxx | 148 ++++----- .../src/MuonRoiChain.cxx | 12 +- .../src/TgcCoinHierarchy.cxx | 32 +- .../src/TgcCoinHierarchyFindTool.cxx | 4 +- .../TrigConfBase/TrigConfBase/MsgStream.h | 2 +- .../src/TrigROBDataProviderSvc.cxx | 214 ++++++------- .../src/TrigROBDataProviderSvc_RTT.cxx | 86 +++--- .../TrigBSExtraction/src/TrigBSExtraction.cxx | 4 +- .../src/TrigConfAlgCnv_p1.cxx | 4 +- .../src/TrigConfChainCnv_p1.cxx | 4 +- .../src/TrigConfSeqCnv_p1.cxx | 4 +- .../src/TrigConfSigCnv_p1.cxx | 4 +- .../src/TrigMonAlgCnv_p1.cxx | 4 +- .../src/TrigMonConfigCnv_p1.cxx | 4 +- .../src/TrigMonEventCnv_p1.cxx | 16 +- .../src/TrigMonROBCnv_p1.cxx | 4 +- .../src/TrigMonROBDataCnv_p1.cxx | 4 +- .../src/TrigMonROBDataCnv_p2.cxx | 4 +- .../src/TrigMonRoiCnv_p1.cxx | 4 +- .../src/TrigMonSeqCnv_p1.cxx | 4 +- .../src/TrigMonTECnv_p1.cxx | 4 +- .../Root/TrigNavStructure.cxx | 4 +- .../src/HLTResultCnv_p1.cxx | 4 +- .../src/Lvl1ResultCnv_p1.cxx | 4 +- .../src/Lvl1ResultCnv_p2.cxx | 4 +- .../src/TrigOperationalInfoCnv_p1.cxx | 4 +- .../src/TrigPassBitsCnv_p1.cxx | 4 +- .../src/TrigPassFlagsCnv_p1.cxx | 8 +- .../src/TrigRoiDescriptorCnv_p1.cxx | 6 +- .../src/TrigRoiDescriptorCnv_p2.cxx | 6 +- .../src/TrigRoiDescriptorCnv_p3.cxx | 4 +- .../TrigFTK/TrigFTKByteStream/src/FTKDump.cxx | 2 +- .../src/TrigFTKByteStreamCnv.cxx | 20 +- .../test/FTKEncodeDecode_CppUnit.cxx | 4 +- .../TrigFTKSim/src/FTKTrackFitterAlgo.cxx | 4 +- .../src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx | 48 +-- .../TrigFake/src/FakeLvl1RoIatFixedEtaPhi.cxx | 34 +-- Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx | 10 +- .../src/TrigEFDPhiMetJetAllTE.cxx | 4 +- .../src/TrigCaloRatioHypo.cxx | 54 ++-- .../src/TrigL2HVJetHypo.cxx | 24 +- .../src/TrigL2HVJetHypoAllCuts.cxx | 36 +-- .../src/TrigL2HVJetHypoTrk.cxx | 34 +-- .../src/TrigLLPInnerDetectorHypo.cxx | 80 ++--- .../src/TrigLoFRemovalHypo.cxx | 16 +- .../src/TrigNewLoFHypo.cxx | 20 +- .../src/TrigL2CaloRingerFex.cxx | 54 ++-- .../src/TrigL2CaloRingerHypo.cxx | 30 +- .../TrigL1CaloUpgrade/src/DumpAll.cxx | 24 +- .../TrigL1CaloUpgrade/src/EFexAnalysis.cxx | 16 +- .../src/SimpleLArDigitsChecks.cxx | 14 +- .../src/SimpleSuperCellChecks.cxx | 20 +- .../src/TrigT1CaloBaseFex.cxx | 22 +- .../TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx | 14 +- .../src/TrigT1CaloTauFex.cxx | 34 +-- .../TrigCostMonitor/src/TrigCostRun.cxx | 70 ++--- .../src/TrigNtEBWeightTool.cxx | 4 +- .../TrigCostMonitor/src/TrigNtVarsTool.cxx | 12 +- .../TrigCostMonitor/src/UtilCost.cxx | 32 +- .../src/L1TopoByteStreamCnv.cxx | 22 +- Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx | 40 +-- .../src/L1CaloRampRunPlan.cxx | 2 +- .../TrigT1CaloCondSvc/L1CaloCondSvc.icc | 14 +- .../TrigT1CaloCondSvc/src/L1CaloCondSvc.cxx | 10 +- .../src/CpmMappingTool.cxx | 2 +- .../src/JemMappingTool.cxx | 2 +- .../src/PpmCoolMappingTool.cxx | 32 +- .../src/PpmCoolOrBuiltinMappingTool.cxx | 14 +- .../src/PpmMappingTool.cxx | 6 +- .../src/TrigT1CaloLWHistogramTool.cxx | 12 +- .../src/TrigT1CaloLWHistogramToolV1.cxx | 12 +- .../src/TrigT1CaloMonErrorTool.cxx | 48 +-- .../src/TrigT1CaloMonErrorToolV1.cxx | 48 +-- .../src/CMMCPHitsCollectionCnv.cxx | 4 +- .../src/CMMEtSumsCollectionCnv.cxx | 4 +- .../src/CMMJetHitsCollectionCnv.cxx | 4 +- .../TrigT1EventAthenaPool/src/CMMRoICnv.cxx | 4 +- .../src/CMXCPHitsCollectionCnv.cxx | 4 +- .../src/CMXCPTobCollectionCnv.cxx | 4 +- .../src/CMXEtSumsCollectionCnv.cxx | 4 +- .../src/CMXJetHitsCollectionCnv.cxx | 4 +- .../src/CMXJetTobCollectionCnv.cxx | 4 +- .../TrigT1EventAthenaPool/src/CMXRoICnv.cxx | 4 +- .../src/CPMHitsCollectionCnv.cxx | 4 +- .../src/CPMRoICollectionCnv.cxx | 4 +- .../src/CPMTobRoICollectionCnv.cxx | 4 +- .../src/CPMTowerCollectionCnv.cxx | 4 +- .../src/JEMEtSumsCollectionCnv.cxx | 4 +- .../src/JEMHitsCollectionCnv.cxx | 4 +- .../src/JEMRoICollectionCnv.cxx | 4 +- .../src/JEMTobRoICollectionCnv.cxx | 4 +- .../src/JetElementCollectionCnv.cxx | 4 +- .../src/RODHeaderCollectionCnv.cxx | 4 +- .../src/TriggerTowerCollectionCnv.cxx | 4 +- .../TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx | 30 +- .../TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx | 12 +- .../TrigT1RPCsteering/src/TrigT1RPC.cxx | 4 +- .../RecRoIBResultByteStreamCnv.icc | 14 +- .../RecRoIBResultByteStreamTool.icc | 2 +- .../RoIBResultByteStreamCnv.icc | 22 +- .../RoIBResultByteStreamTool.icc | 48 +-- .../src/CTPByteStreamCnv.cxx | 32 +- .../src/MuCTPIByteStreamCnv.cxx | 44 +-- .../src/RecCTPByteStreamCnv.cxx | 22 +- .../src/RecMuCTPIByteStreamCnv.cxx | 20 +- .../src/RoIBResultByteStreamTool.cxx | 68 ++--- Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx | 54 ++-- Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx | 56 ++-- .../IDScanHitFilter/src/IDScanHitFilter.cxx | 22 +- .../IDScanZFinder/src/IDScanZFinder.cxx | 78 ++--- .../IDScanZFinder/src/TrigZFinder.cxx | 76 ++--- .../src/TrigFTKUncertiantyTool.cxx | 22 +- .../src/TestPixelModuleDisablingSvc.cxx | 2 +- .../TrigL2DataConversionUtils.h | 4 +- .../src/TrigInDetTrackExtrapolator.cxx | 48 +-- .../src/setupJetKeyDescriptor.cxx | 14 +- .../src/TrigMuonBackExtrapolator.cxx | 6 +- .../TrigMuonRoITools/src/TrigMuonRoITool.cxx | 70 ++--- .../src/TrigTRT_DCCollByteStreamTool.cxx | 46 +-- .../src/TrigTRT_DriftCircleProviderTool.cxx | 22 +- .../src/EgammaGapCalibration.cxx | 10 +- .../src/EgammaHitsCalibration.cxx | 84 +++--- .../src/EgammaHitsShowerDepth.cxx | 2 +- .../src/EgammaLWCalibration.cxx | 10 +- .../src/EgammaSshapeCalibration.cxx | 46 +-- .../src/EgammaTransitionRegions.cxx | 26 +- .../src/T2GSCalibTool.cxx | 22 +- .../src/T2JESCalibTool.cxx | 2 +- .../src/T2SampCalibTool.cxx | 64 ++-- .../src/TrigTrackJetFinderTool.cxx | 54 ++-- .../src/TrigInDetTrackTruth.cxx | 26 +- .../src/TrigInDetTrackTruthMap.cxx | 14 +- .../src/TrigInDetTrackTruthMapCnv.cxx | 10 +- .../src/AthenaTestHarness.cxx | 10 +- .../src/TriggersFiredTest.cxx | 22 +- .../src/FilterUsingMBTS.cxx | 18 +- .../src/FilterUsingMBTSTiming.cxx | 16 +- .../src/FilterUsingSpacePoints.cxx | 12 +- .../GeometryJiveXML/src/GeometryWriter.cxx | 44 +-- .../src/MuonGeometryWriter.cxx | 10 +- 618 files changed, 7724 insertions(+), 7731 deletions(-) diff --git a/AtlasTest/CppUnitSGServiceExample/CppUnitSGServiceExample/SimpleDataVector.h b/AtlasTest/CppUnitSGServiceExample/CppUnitSGServiceExample/SimpleDataVector.h index 5ee59d4f026..4e16f31cd31 100755 --- a/AtlasTest/CppUnitSGServiceExample/CppUnitSGServiceExample/SimpleDataVector.h +++ b/AtlasTest/CppUnitSGServiceExample/CppUnitSGServiceExample/SimpleDataVector.h @@ -32,7 +32,7 @@ struct SimpleTestStruct { log << MSG::INFO << "In SimpleDataVector Gaudi message service is called -" << endl << "and it prints the value of integer data member:" << m_int - << endreq; + << endmsg; } }; diff --git a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx index 5726a8d0580..0786f77c5cf 100644 --- a/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx +++ b/Calorimeter/CaloBadChannelTool/src/CaloBadChanTool.cxx @@ -46,11 +46,11 @@ StatusCode CaloBadChanTool::initialize() CaloBadChannel CaloBadChanTool::caloStatus(Identifier id) const{ if (m_tileBCT && m_caloID->is_tile(id)) { - //(*m_log) << MSG::VERBOSE << "Calling Tile BadChannelTool ... not yet implemeted" << endreq; + //(*m_log) << MSG::VERBOSE << "Calling Tile BadChannelTool ... not yet implemeted" << endmsg; return m_tileBCT->caloStatus(id); } else if(m_larBCT && m_caloID->is_lar(id)) { - // (*m_log) << MSG::VERBOSE << "Calling LAr BadChannelTool ... not yet implemeted" << endreq; + // (*m_log) << MSG::VERBOSE << "Calling LAr BadChannelTool ... not yet implemeted" << endmsg; return m_larBCT->caloStatus(id); } else { diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx index 9d5b95a7d39..2577cd91b14 100755 --- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx +++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx @@ -338,17 +338,17 @@ Trk::Surface* CaloSurfaceBuilder:: CreateUserSurface (const CaloCell_ID::CaloSa betterz = m_calodepth->radius(sample,etaCaloLocal,0.); z = offset + betterz - (*pos)(2,3); //log <<MSG::DEBUG << " shift z by : betterz + offset - old-z = " << betterz << " + " << offset << " - " - // << pos->getTranslation().z() << " = " << z << endreq; + // << pos->getTranslation().z() << " = " << z << endmsg; Amg::Translation3D vec(0.,0.,z); *pos = (*pos) * vec ; } else{ - //log<<MSG::DEBUG<<" Is a tile or HEC3 the z won't be changed "<<z<<endreq; + //log<<MSG::DEBUG<<" Is a tile or HEC3 the z won't be changed "<<z<<endmsg; } //log<<MSG::DEBUG << " got -real- disk for Sample " << (int) sample << " rmin: "<< rmin <<" rmax: " - // << rmax << " z = " << pos->getTranslation().z() << " for etaCaloLocal=" << etaCaloLocal << endreq; + // << rmax << " z = " << pos->getTranslation().z() << " for etaCaloLocal=" << etaCaloLocal << endmsg; //m_calo_tb_coord->print_transform ( *pos ); // for Atlas configuration, avoid to create a hole a phi ~ pi by hphi @@ -508,7 +508,7 @@ CaloSurfaceBuilder::CreateGirderSurface() const { return NULL; /* - log <<MSG::DEBUG << "In CreateGirderSurface()"<<endreq; + log <<MSG::DEBUG << "In CreateGirderSurface()"<<endmsg; const std::vector<const Trk::TrackingVolume*>* tileVolumes = m_tileVolumeBuilder->trackingVolumes(); //Girder part const Trk::TrackingVolume* tileBarrelGirder = (*tileVolumes)[11]; @@ -520,7 +520,7 @@ CaloSurfaceBuilder::CreateGirderSurface() const { double radius = tileBarrelGirderBounds->outerRadius(); delete tileBarrelGirderBounds; double hlen = 6600; //big enough so the extrapolation will always find it. - log<<MSG::DEBUG << "Created Surface right after the Girder with radius: " << radius << " hlen: " << hlen << endreq; + log<<MSG::DEBUG << "Created Surface right after the Girder with radius: " << radius << " hlen: " << hlen << endmsg; return (new Trk::CylinderSurface(new Amg::Transform3D,radius,hlen) ); */ } @@ -555,7 +555,7 @@ CaloSurfaceBuilder::CreateDDLayers(CaloSubdetNames::ALIGNVOL alvol, std::vector< Trk::CylinderBounds* objectBounds = new Trk::CylinderBounds(radius[i], hlength[i]); - // log << MSG::DEBUG << "DD barrel Layer constructed with material-properties: " << objectMaterial << endreq; + // log << MSG::DEBUG << "DD barrel Layer constructed with material-properties: " << objectMaterial << endmsg; // CylinderLayer takes ownership of the transformation. thelayer->push_back(new Trk::CylinderLayer(new Amg::Transform3D(htrans), objectBounds, objectLayerMaterial)); @@ -600,7 +600,7 @@ CaloSurfaceBuilder::CreateDDECLayers(CaloSubdetNames::ALIGNVOL alvol, std::vecto Trk::DiscBounds* objectBounds = new Trk::DiscBounds(rmin[i], rmax[i] ); - // log << MSG::DEBUG << "DD endcap Layer constructed with material-properties: " << objectMaterial << endreq; + // log << MSG::DEBUG << "DD endcap Layer constructed with material-properties: " << objectMaterial << endmsg; thelayer->push_back(new Trk::DiscLayer(eachtrans, objectBounds, objectLayerMaterial)); } @@ -621,7 +621,7 @@ CaloSurfaceBuilder::setCaloDepth(CaloDepthTool* /*mytool*/ ) // else { // StatusCode s = m_toolsvc->retrieveTool("CaloDepthTool",m_calodepth,this); // if (s.isFailure()) -// log<<MSG::ERROR<<"Could not find CaloDepthTool " <<endreq; +// log<<MSG::ERROR<<"Could not find CaloDepthTool " <<endmsg; // } } @@ -691,7 +691,7 @@ CaloSurfaceBuilder::get_cylinder_surface (CaloCell_ID::CaloSample sample, int si } else{ - //log<<MSG::VERBOSE<<" get_cylinder_surface in TILES sample "<<sample <<" side "<<side<<endreq; + //log<<MSG::VERBOSE<<" get_cylinder_surface in TILES sample "<<sample <<" side "<<side<<endmsg; //this are not cylinders switch (sample) { @@ -721,7 +721,7 @@ CaloSurfaceBuilder::get_cylinder_surface (CaloCell_ID::CaloSample sample, int si } } } - //log<<MSG::DEBUG<<" get_cylinder_surface with hphi: "<<hphi <<" radius: "<<radius<<" hlength: "<<hlength<<endreq; + //log<<MSG::DEBUG<<" get_cylinder_surface with hphi: "<<hphi <<" radius: "<<radius<<" hlength: "<<hlength<<endmsg; result = true; } return result; @@ -765,7 +765,7 @@ CaloSurfaceBuilder::get_disk_surface (CaloCell_ID::CaloSample sample, int side, if ( sample == CaloCell_ID::TileExt2 ) return false; double ri, ra, zow; - //log<<MSG::VERBOSE<<" get_disk_surface in sample "<<sample<<endreq; + //log<<MSG::VERBOSE<<" get_disk_surface in sample "<<sample<<endmsg; //std::cout << " disk work ..." << std::endl; std::vector <CaloDetDescriptor*>::const_iterator first = m_calo_dd->calo_descriptors_begin(); @@ -785,7 +785,7 @@ CaloSurfaceBuilder::get_disk_surface (CaloCell_ID::CaloSample sample, int side, } if ( sample == CaloCell_ID::TileGap3 ){ - //log<<MSG::VERBOSE<<" get_disk_surface in TileGap3 sample "<<sample<<endreq; + //log<<MSG::VERBOSE<<" get_disk_surface in TileGap3 sample "<<sample<<endmsg; std::vector <CaloDetDescriptor*>::const_iterator first = m_calo_dd->tile_descriptors_begin(); std::vector <CaloDetDescriptor*>::const_iterator last = m_calo_dd->tile_descriptors_end(); @@ -802,7 +802,7 @@ CaloSurfaceBuilder::get_disk_surface (CaloCell_ID::CaloSample sample, int side, } } } - //log<<MSG::VERBOSE<<" get_disk_surface in TileGap3 sample "<<sample<<endreq; + //log<<MSG::VERBOSE<<" get_disk_surface in TileGap3 sample "<<sample<<endmsg; } if ( rmin > rmax ) rmin = 0.; @@ -811,7 +811,7 @@ CaloSurfaceBuilder::get_disk_surface (CaloCell_ID::CaloSample sample, int side, *htrans = (*htrans) * vec; //log<<MSG::DEBUG<<" get_disk_surface with hphi: "<<hphisec <<" rmin: "<<rmin<<" rmax: "<<rmax<< - // " z: "<<z<<" depth: "<<depth<<endreq; + // " z: "<<z<<" depth: "<<depth<<endmsg; return result; } diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h index 83ab522ae77..9ec6a923a4e 100644 --- a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h +++ b/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h @@ -107,8 +107,6 @@ private: inline MsgStream& endmsg( MsgStream& s ) { return s.doOutput(); } -/// Backwards compatibility definition -#define endreq endmsg #else # error "What environment are we in?!?" diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadData.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ReadData.cxx index 5718f6e7b6e..0515a3e4c88 100755 --- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadData.cxx +++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadData.cxx @@ -82,12 +82,12 @@ StatusCode ReadData::execute() { //FIXME if (StatusCode::SUCCESS != p_SGevent->retrieve(dobj) ) { //FIXME log << MSG::ERROR //FIXME << "Could not find default MyDataObj" - //FIXME << endreq; + //FIXME << endmsg; //FIXME return( StatusCode::FAILURE); //FIXME } //FIXME log << MSG::INFO //FIXME << "default MyDataObj Val: " << dobj->val() - //FIXME << endreq; + //FIXME << endmsg; ///////////////////////////////////////////////////////////////////// // ii) Get a specific MyDataObj by providing its key @@ -187,11 +187,11 @@ StatusCode ReadData::execute() { //FIXME if (p_SGevent->contains<MyDataObj>(SG::DEFAULTKEY)) { //FIXME log << MSG::INFO //FIXME <<"event store contains default MyDataObj" - //FIXME <<endreq; + //FIXME <<endmsg; //FIXME } else { //FIXME log << MSG::ERROR //FIXME <<"event store claims it does not contain default MyDataObj" - //FIXME <<endreq; + //FIXME <<endmsg; //FIXME return( StatusCode::FAILURE); //FIXME } @@ -257,11 +257,11 @@ StatusCode ReadData::execute() { // if (!toBeRead.isValid()) { // log << MSG::ERROR // << "Could not read back MapElement" - // << endreq; + // << endmsg; // return( StatusCode::FAILURE); // } else { // log << MSG::INFO << "MapElement read back: key " << toBeRead->first - // << " value " << toBeRead->second <<endreq; + // << " value " << toBeRead->second <<endmsg; // } ///////////////////////////////////////////////////////////////////// diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx index 89e56c238c2..481bc77e473 100644 --- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx +++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx @@ -100,12 +100,12 @@ StatusCode ReadDataReentrant::execute_r (const EventContext& ctx) const //FIXME if (StatusCode::SUCCESS != p_SGevent->retrieve(dobj) ) { //FIXME log << MSG::ERROR //FIXME << "Could not find default MyDataObj" - //FIXME << endreq; + //FIXME << endmsg; //FIXME return( StatusCode::FAILURE); //FIXME } //FIXME log << MSG::INFO //FIXME << "default MyDataObj Val: " << dobj->val() - //FIXME << endreq; + //FIXME << endmsg; ///////////////////////////////////////////////////////////////////// // ii) Get a specific MyDataObj by providing its key @@ -174,11 +174,11 @@ StatusCode ReadDataReentrant::execute_r (const EventContext& ctx) const //FIXME if (p_SGevent->contains<MyDataObj>(SG::DEFAULTKEY)) { //FIXME log << MSG::INFO //FIXME <<"event store contains default MyDataObj" - //FIXME <<endreq; + //FIXME <<endmsg; //FIXME } else { //FIXME log << MSG::ERROR //FIXME <<"event store claims it does not contain default MyDataObj" - //FIXME <<endreq; + //FIXME <<endmsg; //FIXME return( StatusCode::FAILURE); //FIXME } @@ -224,11 +224,11 @@ StatusCode ReadDataReentrant::execute_r (const EventContext& ctx) const // if (!toBeRead.isValid()) { // log << MSG::ERROR // << "Could not read back MapElement" - // << endreq; + // << endmsg; // return( StatusCode::FAILURE); // } else { // log << MSG::INFO << "MapElement read back: key " << toBeRead->first - // << " value " << toBeRead->second <<endreq; + // << " value " << toBeRead->second <<endmsg; // } ///////////////////////////////////////////////////////////////////// diff --git a/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx b/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx index 3e7de4a0eab..c9df0197e90 100644 --- a/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx +++ b/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx @@ -115,45 +115,45 @@ StatusCode MyAlg::execute() StatusCode sc; - log<<MSG::INFO<<"HAHAHAHA1"<<endreq; + log<<MSG::INFO<<"HAHAHAHA1"<<endmsg; if (iEvt->pSubEvtSG->contains<ExampleClass>("MyData")) { - log<<MSG::INFO<<"HAHAHAHA2"<<endreq; + log<<MSG::INFO<<"HAHAHAHA2"<<endmsg; const DataHandle<ExampleClass> ec1; - log<<MSG::INFO<<"HAHAHAHA3"<<endreq; + log<<MSG::INFO<<"HAHAHAHA3"<<endmsg; sc = iEvt->pSubEvtSG->retrieve(ec1, "MyData"); - log<<MSG::INFO<<"HAHAHAHA4"<<endreq; + log<<MSG::INFO<<"HAHAHAHA4"<<endmsg; if (!sc.isSuccess()) { - log<<MSG::INFO<<"HAHAHAHA5"<<endreq; - log << MSG::ERROR << "Could not find ExampleClass/MyData" << endreq; + log<<MSG::INFO<<"HAHAHAHA5"<<endmsg; + log << MSG::ERROR << "Could not find ExampleClass/MyData" << endmsg; return(StatusCode::FAILURE); } - log << MSG::INFO<<"HAHAHAHA6"<<endreq; - log << MSG::INFO << "Run = " << ec1->getRun() << " event = " << ec1->getEvent() << " :: " << ec1->getText() << endreq; + log << MSG::INFO<<"HAHAHAHA6"<<endmsg; + log << MSG::INFO << "Run = " << ec1->getRun() << " event = " << ec1->getEvent() << " :: " << ec1->getText() << endmsg; } - log<<MSG::INFO<<"GOGOHAHAHAHA1"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA1"<<endmsg; if (endEvt->pSubEvtSG->contains<ExampleClass>("MyData")) { - log<<MSG::INFO<<"GOGOHAHAHAHA2"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA2"<<endmsg; const DataHandle<ExampleClass> ec2; - log<<MSG::INFO<<"GOGOHAHAHAHA3"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA3"<<endmsg; sc = endEvt->pSubEvtSG->retrieve(ec2, "MyData"); - log<<MSG::INFO<<"GOGOHAHAHAHA4"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA4"<<endmsg; if (!sc.isSuccess()) { - log<<MSG::INFO<<"GOGOHAHAHAHA5"<<endreq; - log << MSG::ERROR << "Could not find ExampleClass/MyData" << endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA5"<<endmsg; + log << MSG::ERROR << "Could not find ExampleClass/MyData" << endmsg; return(StatusCode::FAILURE); } - log<<MSG::INFO<<"GOGOHAHAHAHA6"<<endreq; - log << MSG::INFO << "Run = " << ec2->getRun() << " event = " << ec2->getEvent() << " :: " << ec2->getText() << endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA6"<<endmsg; + log << MSG::INFO << "Run = " << ec2->getRun() << " event = " << ec2->getEvent() << " :: " << ec2->getText() << endmsg; } *//* - log << MSG::INFO << "DUMPDUMPDUMP\t"<<i<<"\n"<<iEvt->pSubEvtSG->dump() <<endreq; + log << MSG::INFO << "DUMPDUMPDUMP\t"<<i<<"\n"<<iEvt->pSubEvtSG->dump() <<endmsg; const EventInfo * evt = 0; StatusCode sc = iEvt->pSubEvtSG->retrieve( evt ); if ( sc.isFailure() ) { - log << MSG::ERROR << " Could not get event info" << endreq; + log << MSG::ERROR << " Could not get event info" << endmsg; return StatusCode::FAILURE; } else { @@ -161,11 +161,11 @@ StatusCode MyAlg::execute() << evt->event_ID()->run_number() << "," << evt->event_ID()->event_number() << ":" << evt->event_ID()->time_stamp() << "] " - << endreq; + << endmsg; log << MSG::DEBUG << "Event type: user type " << evt->event_type()->user_type() << " weight " << evt->event_type()->mc_event_weight() - << endreq; + << endmsg; } iEvt++;i++; diff --git a/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx b/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx index f151298254a..7ee8ea354cd 100644 --- a/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx +++ b/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx @@ -109,45 +109,45 @@ StatusCode MyMultiInputAlg::execute() StatusCode sc; - log<<MSG::INFO<<"HAHAHAHA1"<<endreq; + log<<MSG::INFO<<"HAHAHAHA1"<<endmsg; if (iEvt->pSubEvtSG->contains<ExampleClass>("MyData")) { - log<<MSG::INFO<<"HAHAHAHA2"<<endreq; + log<<MSG::INFO<<"HAHAHAHA2"<<endmsg; const DataHandle<ExampleClass> ec1; - log<<MSG::INFO<<"HAHAHAHA3"<<endreq; + log<<MSG::INFO<<"HAHAHAHA3"<<endmsg; sc = iEvt->pSubEvtSG->retrieve(ec1, "MyData"); - log<<MSG::INFO<<"HAHAHAHA4"<<endreq; + log<<MSG::INFO<<"HAHAHAHA4"<<endmsg; if (!sc.isSuccess()) { - log<<MSG::INFO<<"HAHAHAHA5"<<endreq; - log << MSG::ERROR << "Could not find ExampleClass/MyData" << endreq; + log<<MSG::INFO<<"HAHAHAHA5"<<endmsg; + log << MSG::ERROR << "Could not find ExampleClass/MyData" << endmsg; return(StatusCode::FAILURE); } - log << MSG::INFO<<"HAHAHAHA6"<<endreq; - log << MSG::INFO << "Run = " << ec1->getRun() << " event = " << ec1->getEvent() << " :: " << ec1->getText() << endreq; + log << MSG::INFO<<"HAHAHAHA6"<<endmsg; + log << MSG::INFO << "Run = " << ec1->getRun() << " event = " << ec1->getEvent() << " :: " << ec1->getText() << endmsg; } - log<<MSG::INFO<<"GOGOHAHAHAHA1"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA1"<<endmsg; if (endEvt->pSubEvtSG->contains<ExampleClass>("MyData")) { - log<<MSG::INFO<<"GOGOHAHAHAHA2"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA2"<<endmsg; const DataHandle<ExampleClass> ec2; - log<<MSG::INFO<<"GOGOHAHAHAHA3"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA3"<<endmsg; sc = endEvt->pSubEvtSG->retrieve(ec2, "MyData"); - log<<MSG::INFO<<"GOGOHAHAHAHA4"<<endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA4"<<endmsg; if (!sc.isSuccess()) { - log<<MSG::INFO<<"GOGOHAHAHAHA5"<<endreq; - log << MSG::ERROR << "Could not find ExampleClass/MyData" << endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA5"<<endmsg; + log << MSG::ERROR << "Could not find ExampleClass/MyData" << endmsg; return(StatusCode::FAILURE); } - log<<MSG::INFO<<"GOGOHAHAHAHA6"<<endreq; - log << MSG::INFO << "Run = " << ec2->getRun() << " event = " << ec2->getEvent() << " :: " << ec2->getText() << endreq; + log<<MSG::INFO<<"GOGOHAHAHAHA6"<<endmsg; + log << MSG::INFO << "Run = " << ec2->getRun() << " event = " << ec2->getEvent() << " :: " << ec2->getText() << endmsg; } *//* - log << MSG::INFO << "DUMPDUMPDUMP\t"<<i<<"\n"<<iEvt->pSubEvtSG->dump() <<endreq; + log << MSG::INFO << "DUMPDUMPDUMP\t"<<i<<"\n"<<iEvt->pSubEvtSG->dump() <<endmsg; const EventInfo * evt = 0; StatusCode sc = iEvt->pSubEvtSG->retrieve( evt ); if ( sc.isFailure() ) { - log << MSG::ERROR << " Could not get event info" << endreq; + log << MSG::ERROR << " Could not get event info" << endmsg; return StatusCode::FAILURE; } else { @@ -155,11 +155,11 @@ StatusCode MyMultiInputAlg::execute() << evt->event_ID()->run_number() << "," << evt->event_ID()->event_number() << ":" << evt->event_ID()->time_stamp() << "] " - << endreq; + << endmsg; log << MSG::DEBUG << "Event type: user type " << evt->event_type()->user_type() << " weight " << evt->event_type()->mc_event_weight() - << endreq; + << endmsg; } iEvt++;i++; diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx index a62924b44a0..500564ff342 100644 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx @@ -89,7 +89,7 @@ bool ErroneousAlg::jumpOnUninitializedValue() else yesNo[1]++; - //m_msg << "Jump, jump not, jump, jump not : " << yesNo[0] << " to " << yesNo[1] << endreq; + //m_msg << "Jump, jump not, jump, jump not : " << yesNo[0] << " to " << yesNo[1] << endmsg; return (yesNo[1]==0); } diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_DiMuPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_DiMuPostProcess.cxx index 45cffcee22e..4e81fa8f5ae 100644 --- a/DataQuality/DataQualityUtils/src/MonitoringFile_DiMuPostProcess.cxx +++ b/DataQuality/DataQualityUtils/src/MonitoringFile_DiMuPostProcess.cxx @@ -112,7 +112,7 @@ fitMergedFile_DiMuMonManager( std::string inFilename, bool isIncremental) f->Close(); delete f; - // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "DiMuPostProcessing done!" <<endreq; + // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "DiMuPostProcessing done!" <<endmsg; } void MonitoringFile::processModule( TFile* f, std::string run_dir, TKey* key_module, std::string moduleName){ diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx index f3b817531a0..8ee269efcdd 100755 --- a/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx +++ b/Database/AthenaPOOL/AthenaPoolTools/src/EventCount.cxx @@ -228,7 +228,7 @@ StatusCode EventCount::execute() ins_stat = m_prov_keys.insert(it_pr->getKey()); if (ins_stat.second) { log << MSG::DEBUG << "Provenance key " - << it_pr->getKey() << endreq; + << it_pr->getKey() << endmsg; } */ // Add token to list, and associate it with the key @@ -244,7 +244,7 @@ StatusCode EventCount::execute() /* else { log << MSG::INFO << "Provenance key " << it_pr->getKey() - << " appears multiple times" << endreq; + << " appears multiple times" << endmsg; } */ //} @@ -303,7 +303,7 @@ StatusCode EventCount::finalize() while (it!=m_runs.end()) { msg() << " " << *it; ++it; } - msg() << endreq; + msg() << endmsg; // List all the event types ATH_MSG_INFO ( "Input contained the following Event Types" ); std::set<std::string>::iterator itype=m_types.begin(); @@ -319,10 +319,10 @@ StatusCode EventCount::finalize() ++istr; } /* - log << MSG::INFO << "Input contained the following Provenance Tags" << endreq; + log << MSG::INFO << "Input contained the following Provenance Tags" << endmsg; std::set<std::string>::iterator ipr = m_prov_keys.begin(); while (ipr!=m_prov_keys.end()) { - log << MSG::INFO << " -- " << *ipr << endreq; + log << MSG::INFO << " -- " << *ipr << endmsg; ++ipr; } */ @@ -350,7 +350,7 @@ StatusCode EventCount::finalize() else { ATH_MSG_WARNING ( "Could not locate ClassIDSvc" ); } - //log << MSG::INFO << "--------- D A T A - O B J ---------" << endreq; + //log << MSG::INFO << "--------- D A T A - O B J ---------" << endmsg; std::map<int,int>::iterator i = m_clids.begin(); std::string classname = "NONE"; StatusCode clidsvc_sc; diff --git a/Database/CoolLumiUtilities/src/BunchGroupTool.cxx b/Database/CoolLumiUtilities/src/BunchGroupTool.cxx index 6c81140b765..0ab6defa80f 100644 --- a/Database/CoolLumiUtilities/src/BunchGroupTool.cxx +++ b/Database/CoolLumiUtilities/src/BunchGroupTool.cxx @@ -205,7 +205,7 @@ BunchGroupTool::updateCache( IOVSVC_CALLBACK_ARGS_P(/*idx*/, /*keys*/) ) msg(MSG::DEBUG) << "BunchGroup1 list: "; for (unsigned int i=0; i<m_bg1.size(); i++) msg(MSG::DEBUG) << m_bg1[i] << " "; - msg(MSG::DEBUG) << endreq; + msg(MSG::DEBUG) << endmsg; } ATH_MSG_DEBUG( "Bunch Group 0 entries: " << m_bg0.size()); diff --git a/Database/CoolLumiUtilities/src/BunchLumisTool.cxx b/Database/CoolLumiUtilities/src/BunchLumisTool.cxx index 4148ece60e9..8c564644e17 100644 --- a/Database/CoolLumiUtilities/src/BunchLumisTool.cxx +++ b/Database/CoolLumiUtilities/src/BunchLumisTool.cxx @@ -164,7 +164,7 @@ BunchLumisTool::reloadRawLumi() // Check if we didn't find the preferred channel if (first == last) { - ATH_MSG_WARNING( "BUNCHLUMI data not found for channel " << m_channel << "!" <<endreq ); + ATH_MSG_WARNING( "BUNCHLUMI data not found for channel " << m_channel << "!" <<endmsg ); return; } diff --git a/Database/CoolLumiUtilities/src/FillParamsTool.cxx b/Database/CoolLumiUtilities/src/FillParamsTool.cxx index 3235a0359f2..3cbdc6ddee3 100644 --- a/Database/CoolLumiUtilities/src/FillParamsTool.cxx +++ b/Database/CoolLumiUtilities/src/FillParamsTool.cxx @@ -136,7 +136,7 @@ FillParamsTool::updateCache( IOVSVC_CALLBACK_ARGS_P(/*idx*/, /*keys*/) ) m_beam1Bunches.push_back(*p); if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << *p << " "; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endmsg; // Decode beam2 list if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Beam2 bunches list: "; @@ -144,7 +144,7 @@ FillParamsTool::updateCache( IOVSVC_CALLBACK_ARGS_P(/*idx*/, /*keys*/) ) m_beam2Bunches.push_back(*p); if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << *p << " "; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endmsg; // Decode luminous list if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Luminous bunches list: "; @@ -152,7 +152,7 @@ FillParamsTool::updateCache( IOVSVC_CALLBACK_ARGS_P(/*idx*/, /*keys*/) ) m_luminousBunches.push_back(*p); if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << *p << " "; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << endmsg; return StatusCode::SUCCESS; } diff --git a/Database/FileStager/src/FileStagerAlg.cxx b/Database/FileStager/src/FileStagerAlg.cxx index ab9bc258d1e..f4bdc443a56 100644 --- a/Database/FileStager/src/FileStagerAlg.cxx +++ b/Database/FileStager/src/FileStagerAlg.cxx @@ -86,21 +86,21 @@ StatusCode FileStagerAlg::initialize() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << name() << "Initialize()" << endreq; + log << MSG::DEBUG << name() << "Initialize()" << endmsg; // use the incident service to register IIncidentSvc* incsvc = 0; StatusCode status = service("IncidentSvc", incsvc, true); if(status.isFailure() || incsvc==0) { - log << MSG::WARNING << "Unable to get IncidentSvc! MF mechanism is disabled" << endreq; + log << MSG::WARNING << "Unable to get IncidentSvc! MF mechanism is disabled" << endmsg; return StatusCode::SUCCESS; } incsvc->addListener(this, "BeginInputFile", 60); // pri has to be < 100 to be after MetaDataSvc. incsvc->addListener(this, "EndInputFile", 0); - log << MSG::DEBUG << "Added listeners on begin and end of input files." << endreq; + log << MSG::DEBUG << "Added listeners on begin and end of input files." << endmsg; // configure the stager configStager(); @@ -109,7 +109,7 @@ FileStagerAlg::initialize() setupNextFile(); - log << MSG::DEBUG << name() << "Initialize() successful" << endreq; + log << MSG::DEBUG << name() << "Initialize() successful" << endmsg; return StatusCode::SUCCESS; } @@ -118,9 +118,9 @@ StatusCode FileStagerAlg::execute() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << name() << "Execute()" << endreq; + log << MSG::DEBUG << name() << "Execute()" << endmsg; - log << MSG::DEBUG << name() << "Execute() successful" << endreq; + log << MSG::DEBUG << name() << "Execute() successful" << endmsg; return StatusCode::SUCCESS; } @@ -129,12 +129,12 @@ StatusCode FileStagerAlg::finalize() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << name() << "Finalize()" << endreq; - log << MSG::WARNING << "Total wait time = " << _waittime << " s." << endreq; + log << MSG::DEBUG << name() << "Finalize()" << endmsg; + log << MSG::WARNING << "Total wait time = " << _waittime << " s." << endmsg; if (m_storeStats) { std::string fileName = "filestager_stats.root"; - log << MSG::WARNING << "Writing filestager statistics to file <" << fileName << ">" << endreq; + log << MSG::WARNING << "Writing filestager statistics to file <" << fileName << ">" << endmsg; TFile *ff = new TFile(fileName.c_str(),"recreate"); _waithist->Write(); ff->Close(); @@ -143,7 +143,7 @@ FileStagerAlg::finalize() // release remaining staged files in destructor - log << MSG::DEBUG << name() << "Finalize() successful" << endreq; + log << MSG::DEBUG << name() << "Finalize() successful" << endmsg; return StatusCode::SUCCESS; } @@ -152,7 +152,7 @@ void FileStagerAlg::configStager() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << "configStager()" << endreq; + log << MSG::DEBUG << "configStager()" << endmsg; // itr for looping over input files _fItr = m_inCollection.begin(); @@ -186,7 +186,7 @@ void FileStagerAlg::loadStager() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << "loadStager()" << endreq; + log << MSG::DEBUG << "loadStager()" << endmsg; TStageManager& manager(TStageManager::instance()); @@ -225,7 +225,7 @@ void FileStagerAlg::setupNextFile() { MsgStream log(msgSvc(), name()); - log << MSG::DEBUG << "setupNextFile()" << endreq; + log << MSG::DEBUG << "setupNextFile()" << endmsg; if (_fItr!=m_inCollection.end()) { TStageManager& manager(TStageManager::instance()); @@ -239,7 +239,7 @@ FileStagerAlg::setupNextFile() _waithist->Fill(_stopwatch->RealTime()); _waittime += _stopwatch->RealTime(); - log << MSG::DEBUG << "Time to wait for <" << _fItr->c_str() << "> = " << _stopwatch->RealTime() << " s." << endreq; + log << MSG::DEBUG << "Time to wait for <" << _fItr->c_str() << "> = " << _stopwatch->RealTime() << " s." << endmsg; ++_fItr; } @@ -253,12 +253,12 @@ FileStagerAlg::handle(const Incident& inc) const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc); if (fileInc == 0) { - log << MSG::ERROR << " Unable to get FileName from BeginInputFile/EndInputFile incident" << endreq; + log << MSG::ERROR << " Unable to get FileName from BeginInputFile/EndInputFile incident" << endmsg; return; } const std::string fileName = fileInc->fileName(); - log << MSG::DEBUG << "handle() " << inc.type() << " for " << fileName << endreq; + log << MSG::DEBUG << "handle() " << inc.type() << " for " << fileName << endmsg; if (inc.type() == "BeginInputFile") { // do nothing diff --git a/Database/IOVDbPTCnv/src/IOVPayloadContainerPTCnv_p1.cxx b/Database/IOVDbPTCnv/src/IOVPayloadContainerPTCnv_p1.cxx index 0073b08e201..54b6788d849 100644 --- a/Database/IOVDbPTCnv/src/IOVPayloadContainerPTCnv_p1.cxx +++ b/Database/IOVDbPTCnv/src/IOVPayloadContainerPTCnv_p1.cxx @@ -371,7 +371,7 @@ IOVPayloadContainerPTCnv_p1::fillAttributeData(unsigned int attrName, case IOVPayloadContainer_p1::ATTR_BLOB: // log << MSG::ERROR // << "IOVPayloadContainerPTCnv_p1::fillAttributeData - cannot currently treat BLOB type " - // << endreq; + // << endmsg; return; case IOVPayloadContainer_p1::ATTR_DATE: persObj->m_attrIndexes.push_back( @@ -445,7 +445,7 @@ IOVPayloadContainerPTCnv_p1::fillAttributeData(const IOVPayloadContainer_p1* per case IOVPayloadContainer_p1::ATTR_BLOB: // log << MSG::ERROR // << "IOVPayloadContainerPTCnv_p1::fillAttributeData - cannot currently treat BLOB type " - // << endreq; + // << endmsg; return; case IOVPayloadContainer_p1::ATTR_DATE: { diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/compositionHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/compositionHandler.cxx index d04cf3ead31..4706f22084e 100644 --- a/DetectorDescription/AGDD/AGDDHandlers/src/compositionHandler.cxx +++ b/DetectorDescription/AGDD/AGDDHandlers/src/compositionHandler.cxx @@ -21,7 +21,7 @@ void compositionHandler::ElementHandle() { std::string name=getAttributeAsString("name"); // if (msgLog().level()<=MSG::DEBUG) -// msgLog()<<MSG::DEBUG<<" Composition "<<name<<endreq; +// msgLog()<<MSG::DEBUG<<" Composition "<<name<<endmsg; AGDDComposition *c=new AGDDComposition(name); diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolHistSvc.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolHistSvc.cxx index 9eab8c3eb90..e8c89fa0e56 100755 --- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolHistSvc.cxx +++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolHistSvc.cxx @@ -202,7 +202,7 @@ StatusCode CoolHistSvc::getHist_i(const std::string& folder, const CondAttrListCollection* atrcol; if (StatusCode::SUCCESS!=p_detstore->retrieve(atrcol,folder)) { msg(mlevel) << "Cannot retrieve CondAttrListCollection for " << - folder << endreq; + folder << endmsg; return StatusCode::FAILURE; } // find the channel number to look at @@ -222,7 +222,7 @@ StatusCode CoolHistSvc::getHist_i(const std::string& folder, } if (!found) { msg(mlevel) << "Channel named " << channelName << - " does not exist in folder " << folder << endreq; + " does not exist in folder " << folder << endmsg; return StatusCode::FAILURE; } } @@ -234,7 +234,7 @@ StatusCode CoolHistSvc::getHist_i(const std::string& folder, atrcol->chanAttrListPair(channel); if (citr==atrcol->end()) { msg(mlevel) << "Cannot find valid reference for " << folder << - " channel " << channel << endreq; + " channel " << channel << endmsg; return StatusCode::FAILURE; } const std::string coolguid=citr->second["fileGUID"].data<std::string>(); @@ -277,7 +277,7 @@ StatusCode CoolHistSvc::getHist_i(const std::string& folder, ATH_MSG_DEBUG("Getting object "+histname+" from file"); pfile->GetObject(histname.c_str(),hist); if (hist==0) { - msg(mlevel) << "Could not load TObject " << histname << endreq; + msg(mlevel) << "Could not load TObject " << histname << endmsg; return StatusCode::FAILURE; } m_histkeymap[histkey]=std::pair<std::string,TObject*>(coolguid,hist); diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h b/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h index 5d350abba40..d335a0be22d 100644 --- a/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h +++ b/DetectorDescription/DetDescrCond/DetectorStatus/doc/packagedoc.h @@ -196,7 +196,7 @@ to do this: // get DetStatusSvc interface const IDetStatusSvc* p_detstatussvc; if (StatusCode::SUCCESS!=service("DetStatusSvc",p_detstatussvc)) { - m_log << MSG::ERROR << "Cannot get DetStatusSvc" << endreq; + m_log << MSG::ERROR << "Cannot get DetStatusSvc" << endmsg; return StatusCode::FAILURE; } @@ -206,16 +206,16 @@ to do this: // test a particular one - SCTB const DetStatus* ptr=p_detstatussvc->findStatus("SCTB"); if (ptr!=0) { - m_log << MSG::INFO << "SCTB status found to be " << ptr->colour() << endreq; + m_log << MSG::INFO << "SCTB status found to be " << ptr->colour() << endmsg; } else { - m_log << MSG::ERROR << "Could not find status of SCTB" << endreq; + m_log << MSG::ERROR << "Could not find status of SCTB" << endmsg; } // loop over all status words, print those which are bad DetStatusMap::const_iterator begin,end; p_detstatussvc->getIter(begin,end); for (DetStatusMap::const_iterator itr=begin;itr!=end;++itr) { if (itr->second.code()<3) m_log << MSG::WARNING << "Status of " << - itr->first << " is bad: fullcode " << itr->second.fullCode() << endreq; + itr->first << " is bad: fullcode " << itr->second.fullCode() << endmsg; } </pre> diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx index af3883600d4..9b686eae721 100755 --- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx +++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx @@ -156,9 +156,9 @@ StatusCode RegSelSvc::initialize() { msg(MSG::INFO) << "DetectorDescription version " << m_geometryVersion; if (m_geometryVersionProp.value() == "use_geomodel"){ - msg() << " (obtained from GeoModelSvc)" << endreq; + msg() << " (obtained from GeoModelSvc)" << endmsg; } else { - msg() << " (supplied as property)" << endreq; + msg() << " (supplied as property)" << endmsg; } ATH_MSG_DEBUG( "property value was " << m_geometryVersionProp.value() << ")" ); @@ -204,7 +204,7 @@ StatusCode RegSelSvc::initialize() { if( m_initOnlyMuon.value() ) msg() << " ( rpc=" << rpcflag << " mdt=" << mdtflag << " tgc=" << tgcflag << " csc=" << cscflag << " )"; - msg() << endreq; + msg() << endmsg; bool errorFlag=false; // true indicates an error occured somewhere @@ -298,7 +298,7 @@ void RegSelSvc::handle(const Incident& incident) { std::vector<std::string>::const_iterator d; for (d=m_enabledDetectors.begin(); d!=m_enabledDetectors.end(); ++d) msg() << " " << *d; - msg() << " detectors have been initialized" << endreq; // " with Region Type " << m_regionType << endreq; + msg() << " detectors have been initialized" << endmsg; // " with Region Type " << m_regionType << endmsg; } if ( m_dumpTable ) { diff --git a/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx b/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx index 807bc18b90c..0a8eed20276 100755 --- a/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx +++ b/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx @@ -536,9 +536,9 @@ StatusCode RegSelectorHashMap::read(const char *filename){ // use path resolver to find full path to file std::string unresolvedFileName(filename); std::string fullFileName = PathResolver::find_file (unresolvedFileName, "DATAPATH"); - //log << MSG::DEBUG << "PathResolver found " << fullFileName << endreq; + //log << MSG::DEBUG << "PathResolver found " << fullFileName << endmsg; if (fullFileName == "") { - //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endreq; + //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endmsg; std::cerr << "LArTTRegionSelectorIdentifierHash: FATAL: Could not find input file in DATAPATH" << unresolvedFileName<< std::endl; return StatusCode::FAILURE; } diff --git a/DetectorDescription/RegionSelector/src/RegSelectorMap.cxx b/DetectorDescription/RegionSelector/src/RegSelectorMap.cxx index 4b61cd8dfbc..6d2878946a8 100755 --- a/DetectorDescription/RegionSelector/src/RegSelectorMap.cxx +++ b/DetectorDescription/RegionSelector/src/RegSelectorMap.cxx @@ -314,9 +314,9 @@ StatusCode RegSelectorMap::read(const char *filename, DETID type){ // use path resolver to find full path to file std::string unresolvedFileName(filename); std::string fullFileName = PathResolver::find_file (unresolvedFileName, "DATAPATH"); - //log << MSG::DEBUG << "PathResolver found " << fullFileName << endreq; + //log << MSG::DEBUG << "PathResolver found " << fullFileName << endmsg; if (fullFileName == "") { - //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endreq; + //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endmsg; std::cerr << "RegSelectorMap: FATAL: Could not find input file in DATAPATH" << unresolvedFileName<< std::endl; return StatusCode::FAILURE; } diff --git a/DetectorDescription/RegionSelector/src/obsolete.icc b/DetectorDescription/RegionSelector/src/obsolete.icc index 6646c3713ee..d8124943ae2 100644 --- a/DetectorDescription/RegionSelector/src/obsolete.icc +++ b/DetectorDescription/RegionSelector/src/obsolete.icc @@ -20,12 +20,12 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); @@ -33,7 +33,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::WARNING ) (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -49,27 +49,27 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, case LAR: // Liquid Argon Calorimeter verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax); m_larData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "LAR verifyOutput" << endreq; larData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "LAR verifyOutput" << endmsg; larData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TTEM: // Liquid Argon Trigger Tower EM Calorimeter verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax); m_ttemData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "TTEM verifyOutput" << endreq; ttemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "TTEM verifyOutput" << endmsg; ttemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax); m_tthecData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "TTHEC verifyOutput" << endreq; tthecData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "TTHEC verifyOutput" << endmsg; tthecData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax); m_ttfcalemData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "FCALEM verifyOutput" << endreq; ttfcalemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "FCALEM verifyOutput" << endmsg; ttfcalemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax); m_ttfcalhadData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endreq; ttfcalhadData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endmsg; ttfcalhadData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TILE: // Tile Calorimeters break; @@ -87,7 +87,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID - << " got " << outputROBIDList.size() << " ROB IDs" << endreq; + << " got " << outputROBIDList.size() << " ROB IDs" << endmsg; } } @@ -118,24 +118,24 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl; // if(m_msgOutputLevel <= MSG::WARNING ) - // (*m_log) << MSG::WARNING << " This method is obsolete - please replace" << endreq; + // (*m_log) << MSG::WARNING << " This method is obsolete - please replace" << endmsg; if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -143,7 +143,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -169,7 +169,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -187,18 +187,18 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -225,7 +225,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -247,20 +247,20 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -269,7 +269,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -295,7 +295,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -311,7 +311,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl; @@ -319,13 +319,13 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -353,7 +353,7 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -371,18 +371,18 @@ void RegSelSvc::DetROBHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -428,14 +428,14 @@ void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetDisabledHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -444,7 +444,7 @@ void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -470,7 +470,7 @@ void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetDisabledHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -489,12 +489,12 @@ void RegSelSvc::getDisabledLayers(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && layers.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input layers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input layers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } layers.clear(); @@ -503,7 +503,7 @@ void RegSelSvc::getDisabledLayers(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -539,25 +539,25 @@ void RegSelSvc::getDisabledLayers(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && barrellayers.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input barrellayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input barrellayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } barrellayers.clear(); if(m_msgOutputLevel <= MSG::DEBUG && endAlayers.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input endAlayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input endAlayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } endAlayers.clear(); if(m_msgOutputLevel <= MSG::DEBUG && endClayers.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input endClayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input endClayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } endClayers.clear(); @@ -566,7 +566,7 @@ void RegSelSvc::getDisabledLayers(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -609,7 +609,7 @@ void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -637,7 +637,7 @@ void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetDisabledHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -657,16 +657,16 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // if(m_msgOutputLevel <= MSG::WARNING ) - // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq; + // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -674,7 +674,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::WARNING ) (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -692,27 +692,27 @@ void RegSelSvc::DetHashIDList(DETID detectorID, case LAR: // Liquid Argon Calorimeter verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax); m_larData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "LAR hashID verifyOutput" << endreq; larDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "LAR hashID verifyOutput" << endmsg; larDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); break; case TTEM: // Liquid Argon Trigger Tower EM Calorimeter verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax); m_ttemData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTEM hashID verifyOutput" << endreq; ttemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTEM hashID verifyOutput" << endmsg; ttemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); break; case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax); m_tthecData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; tthecDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; tthecDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); break; case FCALEM: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax); m_ttfcalemData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; ttfcalemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; ttfcalemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); break; case FCALHAD: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax); m_ttfcalhadData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; ttfcalhadDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; ttfcalhadDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList); break; case TILE: // Tile Calorimeters verifyInputs(TILE, etaMin, etaMax, phiMin, phiMax); @@ -724,7 +724,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -745,17 +745,17 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // if(m_msgOutputLevel <= MSG::WARNING ) - // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq; + // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg; // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -764,7 +764,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -811,7 +811,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -832,17 +832,17 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // if(m_msgOutputLevel <= MSG::WARNING ) - // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq; + // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg; // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -851,7 +851,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -893,7 +893,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -909,7 +909,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if ( roi.isFullscan() ) return DetHashIDList( detectorID, IDList ); @@ -917,12 +917,12 @@ void RegSelSvc::DetHashIDList(DETID detectorID, // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl; // if(m_msgOutputLevel <= MSG::WARNING ) - // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq; + // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -966,7 +966,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -985,14 +985,14 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -1001,7 +1001,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1043,7 +1043,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -1056,7 +1056,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if ( roi.isFullscan() ) return DetHashIDList( detectorID, layer, *IDList ); @@ -1065,7 +1065,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -1109,7 +1109,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -1130,14 +1130,14 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -1190,12 +1190,12 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -1203,7 +1203,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::WARNING ) (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1222,27 +1222,27 @@ void RegSelSvc::DetHashIDList(DETID detectorID, case LAR: // Liquid Argon Calorimeter verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax); m_larData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "LAR hashID verifyOutput sampling " << sampling << endreq; larDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "LAR hashID verifyOutput sampling " << sampling << endmsg; larDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); break; case TTEM: // Liquid Argon Trigger Tower EM Calorimeter verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax); m_ttemData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTEM hashID verifyOutput sampling " << sampling << endreq; ttemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTEM hashID verifyOutput sampling " << sampling << endmsg; ttemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); break; case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax); m_tthecData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "TTEC hashID verifyOutput sampling " << sampling << endreq; tthecDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "TTEC hashID verifyOutput sampling " << sampling << endmsg; tthecDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); break; case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax); m_ttfcalemData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "FCALEM hashID verifyOutput sampling " << sampling << endreq; ttfcalemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "FCALEM hashID verifyOutput sampling " << sampling << endmsg; ttfcalemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); break; case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax); m_ttfcalhadData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList)); - //log<< MSG::DEBUG << "FCALHAD hashID verifyOutput sampling " << sampling << endreq; ttfcalhadDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); + //log<< MSG::DEBUG << "FCALHAD hashID verifyOutput sampling " << sampling << endmsg; ttfcalhadDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList); break; case TILE: // Tile Calorimeters break; @@ -1252,7 +1252,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -1269,12 +1269,12 @@ void RegSelSvc::DetHashIDList(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } IDList->clear(); @@ -1282,7 +1282,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::WARNING ) (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1295,7 +1295,7 @@ void RegSelSvc::DetHashIDList(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID - << " got " << IDList->size() << " hash IDs" << endreq; + << " got " << IDList->size() << " hash IDs" << endmsg; } } @@ -1317,12 +1317,12 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); @@ -1330,7 +1330,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::WARNING ) (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1345,27 +1345,27 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, case LAR: // Liquid Argon Calorimeter verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax); m_larData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "LAR verifyOutput" << endreq; larData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "LAR verifyOutput" << endmsg; larData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TTEM: // Liquid Argon Trigger Tower EM Calorimeter verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax); m_ttemData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "TTEM verifyOutput" << endreq; ttemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "TTEM verifyOutput" << endmsg; ttemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax); m_tthecData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "TTHEC verifyOutput" << endreq; tthecData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "TTHEC verifyOutput" << endmsg; tthecData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax); m_ttfcalemData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "FCALEM verifyOutput" << endreq; ttfcalemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "FCALEM verifyOutput" << endmsg; ttfcalemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax); m_ttfcalhadData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList); - //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endreq; ttfcalhadData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); + //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endmsg; ttfcalhadData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList); break; case TILE: // Tile Calorimeters verifyInputs(TILE, etaMin, etaMax, phiMin, phiMax); @@ -1393,7 +1393,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID - << " got " << outputROBIDList.size() << " ROB IDs" << endreq; + << " got " << outputROBIDList.size() << " ROB IDs" << endmsg; } } @@ -1413,14 +1413,14 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); @@ -1429,7 +1429,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1457,7 +1457,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID - << " got " << outputROBIDList.size() << " ROB IDs" << endreq; + << " got " << outputROBIDList.size() << " ROB IDs" << endmsg; } } @@ -1477,14 +1477,14 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); @@ -1493,7 +1493,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1521,7 +1521,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID - << " got " << outputROBIDList.size() << " ROB IDs" << endreq; + << " got " << outputROBIDList.size() << " ROB IDs" << endmsg; } } @@ -1540,14 +1540,14 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer, static bool first = true; if ( first ) { first = false; - (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq; + (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg; } // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl; if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){ if(m_msgOutputLevel <= MSG::WARNING ) - (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq; + (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg; } outputROBIDList.clear(); @@ -1556,7 +1556,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer, (*m_log) << MSG::WARNING << " bad roi parameter to regionselector" << "zMin=" << zMin << "\tzMax=" << zMax << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax - << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq; + << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg; return; } @@ -1582,7 +1582,7 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer, if(m_msgOutputLevel <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID - << " got " << outputROBIDList.size() << " ROB IDs" << endreq; + << " got " << outputROBIDList.size() << " ROB IDs" << endmsg; } } diff --git a/Event/EventBookkeeperMetaData/src/EventBookkeeper.cxx b/Event/EventBookkeeperMetaData/src/EventBookkeeper.cxx index 7aa88c4c1f3..816881bd8af 100644 --- a/Event/EventBookkeeperMetaData/src/EventBookkeeper.cxx +++ b/Event/EventBookkeeperMetaData/src/EventBookkeeper.cxx @@ -284,10 +284,10 @@ void EventBookkeeper::PrintToMsg(MsgStream &log, const std::string& indent) { if(log.level()==MSG::DEBUG){ - log<<MSG::DEBUG<<indent<<m_name<<" "<<m_inputstream<<" "<<m_outputstream<<" "<<m_logic<<" "<<m_cycle<<" ("<<m_childrenEB->size()<<" children) "<<": "<<m_description<<" ==> "<<m_nAcceptedEvents<<" "<<m_nWeightedAcceptedEvents<<endreq; + log<<MSG::DEBUG<<indent<<m_name<<" "<<m_inputstream<<" "<<m_outputstream<<" "<<m_logic<<" "<<m_cycle<<" ("<<m_childrenEB->size()<<" children) "<<": "<<m_description<<" ==> "<<m_nAcceptedEvents<<" "<<m_nWeightedAcceptedEvents<<endmsg; } else{ - log<<MSG::INFO<<indent<<m_name<<": "<<m_description<<" ==> "<<m_nAcceptedEvents<<endreq; + log<<MSG::INFO<<indent<<m_name<<": "<<m_description<<" ==> "<<m_nAcceptedEvents<<endmsg; } return; diff --git a/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.cxx b/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.cxx index 216c2940823..3e811eb976c 100755 --- a/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.cxx +++ b/Event/EventCommonAthenaPool/src/INav4MomAssocsCnv.cxx @@ -51,7 +51,7 @@ INav4MomAssocsCnv::createPersistent( INav4MomAssocs* transCont ) INav4MomAssocs_PERS *persObj = m_tpConverter_p3.createPersistent( transCont, log ); - log << MSG::DEBUG << "::createPersistent [Success]" << endreq; + log << MSG::DEBUG << "::createPersistent [Success]" << endmsg; return persObj; } diff --git a/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.cxx b/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.cxx index 8e4dbe248cf..3f2b750d6c9 100644 --- a/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.cxx +++ b/Event/EventCommonAthenaPool/src/INav4MomLinkContainerCnv.cxx @@ -28,7 +28,7 @@ INav4MomLinkContainer_PERS* INav4MomLinkContainerCnv::createPersistent( INav4Mom INav4MomLinkContainer_PERS *persObj = m_TPConverter.createPersistent( transCont, log ); // Write a debug message out - log << MSG::DEBUG << "Success" << endreq; + log << MSG::DEBUG << "Success" << endmsg; return persObj; } diff --git a/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.cxx b/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.cxx index 316a6f646d2..91f5403a46c 100644 --- a/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.cxx +++ b/Event/EventCommonAthenaPool/src/IParticleLinkContainerCnv.cxx @@ -35,7 +35,7 @@ IParticleLinkContainer_PERS* IParticleLinkContainerCnv::createPersistent( IParti IParticleLinkContainer_PERS *persObj = m_TPConverter.createPersistent( transCont, log ); // Write a debug message out - log << MSG::DEBUG << "Success" << endreq; + log << MSG::DEBUG << "Success" << endmsg; return persObj; } diff --git a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p1.cxx b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p1.cxx index 31be18656f5..3506494ad3a 100755 --- a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p1.cxx +++ b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p1.cxx @@ -47,11 +47,11 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, { log << MSG::DEBUG << "Loading INav4MomAssocs from persistent state..." - << endreq; + << endmsg; if ( 0 == m_storeGate ) { log << MSG::ERROR - << "NULL pointer to StoreGateSvc !!" << endreq - << "Cannot do anything !!" <<endreq; + << "NULL pointer to StoreGateSvc !!" << endmsg + << "Cannot do anything !!" <<endmsg; throw std::runtime_error("NULL pointer to StoreGateSvc !!"); } @@ -65,7 +65,7 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, << "Could not build DataLink<INav4MomAssocs> from [" << *itr << "] !!" - << endreq; + << endmsg; } else { transObj->m_assocStores[*itr] = link; } @@ -83,8 +83,8 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, const std::string& objKey = objLink.first; const std::string& assKey = assLink.first; - log << MSG::DEBUG << "\tobjLink=" << objKey << ", " << objLink.second << endreq; - log << MSG::DEBUG << "\tassLink=" << assKey << ", " << assLink.second << endreq; + log << MSG::DEBUG << "\tobjLink=" << objKey << ", " << objLink.second << endmsg; + log << MSG::DEBUG << "\tassLink=" << assKey << ", " << assLink.second << endmsg; if ( collections.find(objKey) == collections.end() ) { collections[objKey] = 0; @@ -93,13 +93,13 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, log << MSG::ERROR << "Could not retrieve INavigable4MomentumCollection at : " << objKey - << endreq; + << endmsg; throw std::runtime_error("Could not retrieve an INavigable4MomentumCollection"); } else { log << MSG::DEBUG << "Successfully retrieve INav4MomCollection at : " << objKey - << endreq; + << endmsg; } } @@ -110,13 +110,13 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, log << MSG::ERROR << "Could not retrieve INavigable4MomentumCollection at : " << assKey - << endreq; + << endmsg; throw std::runtime_error("Could not retrieve an INavigable4MomentumCollection"); } else { log << MSG::DEBUG << "Successfully retrieve INav4MomCollection at : " << assKey - << endreq; + << endmsg; } } @@ -127,7 +127,7 @@ INav4MomAssocsCnv_p1::persToTrans( const INav4MomAssocs_p1* persObj, log << MSG::DEBUG << "Loaded INav4MomAssocs from persistent state [OK]" - << endreq; + << endmsg; return; } @@ -138,7 +138,7 @@ INav4MomAssocsCnv_p1::transToPers( const INav4MomAssocs* transObj, { log << MSG::DEBUG << "Creating persistent state of INav4MomAssocs..." - << endreq; + << endmsg; // first store the underlying association stores for ( std::map<std::string, DataLink<INav4MomAssocs> >::const_iterator itr = transObj->m_assocStores.begin(); @@ -166,7 +166,7 @@ INav4MomAssocsCnv_p1::transToPers( const INav4MomAssocs* transObj, log << MSG::DEBUG << "Created persistent state of INav4MomAssocs [OK]" - << endreq; + << endmsg; return; } diff --git a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p2.cxx b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p2.cxx index bb103ea67da..ea33e9ca418 100644 --- a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p2.cxx +++ b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p2.cxx @@ -50,7 +50,7 @@ INav4MomAssocsCnv_p2::persToTrans( const INav4MomAssocs_p2* pers, { msg << MSG::DEBUG << "Loading INav4MomAssocs from persistent state..." - << endreq; + << endmsg; // retrieve underlying association stores trans->m_assocStores.clear(); @@ -84,7 +84,7 @@ INav4MomAssocsCnv_p2::persToTrans( const INav4MomAssocs_p2* pers, msg << MSG::DEBUG << "Loaded INav4MomAssocs from persistent state [OK]" - << endreq; + << endmsg; return; } @@ -95,7 +95,7 @@ INav4MomAssocsCnv_p2::transToPers( const INav4MomAssocs* trans, { msg << MSG::DEBUG << "Creating persistent state of INav4MomAssocs..." - << endreq; + << endmsg; pers->m_assocStores.resize( trans->m_assocStores.size() ); std::size_t j = 0; @@ -139,7 +139,7 @@ INav4MomAssocsCnv_p2::transToPers( const INav4MomAssocs* trans, msg << MSG::DEBUG << "Created persistent state of INav4MomAssocs [OK]" - << endreq; + << endmsg; return; } diff --git a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p3.cxx b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p3.cxx index 4d1435d1da1..4075d03c16e 100755 --- a/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p3.cxx +++ b/Event/EventCommonTPCnv/src/INav4MomAssocsCnv_p3.cxx @@ -45,7 +45,7 @@ typedef INav4MomAssocs::object_link INav4MomLink_t; #define LOG_MSG(log,lvl,msg) \ log << lvl; \ - if( log.level() <= lvl ) log << lvl << msg << endreq + if( log.level() <= lvl ) log << lvl << msg << endmsg void INav4MomAssocsCnv_p3::persToTrans( const INav4MomAssocs_p3* pers, diff --git a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc index 38e3b219358..d7a666dca91 100644 --- a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc +++ b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc @@ -93,7 +93,7 @@ std::cout<<"start overlayContainer"<<std::endl; outputContainer->removeCollection(p_ovl.hashId()); if (outputContainer->addCollection(out_coll, p_ovl.hashId()).isFailure() ) { - parent->msg(MSG::WARNING) << "overlay addCollection failed " << endreq; + parent->msg(MSG::WARNING) << "overlay addCollection failed " << endmsg; } } @@ -101,7 +101,7 @@ std::cout<<"start overlayContainer"<<std::endl; /** Copy the complete collection from ovl to output, hopefully preserving the "most derived" type of its raw data */ if ( outputContainer->addCollection(coll_ovl, coll_id).isFailure() ) { - parent->msg(MSG::WARNING) << "add mc Collection failed " << endreq; + parent->msg(MSG::WARNING) << "add mc Collection failed " << endmsg; } } @@ -178,7 +178,7 @@ std::cout<<"start overlayContainer"<<std::endl; outputContainer->removeCollection(p_ovl.hashId()); if (outputContainer->addCollection(out_coll, p_ovl.hashId()).isFailure() ) { - parent->msg(MSG::WARNING) << "overlay addCollection failed " << endreq; + parent->msg(MSG::WARNING) << "overlay addCollection failed " << endmsg; } } @@ -186,7 +186,7 @@ std::cout<<"start overlayContainer"<<std::endl; /** Copy the complete collection from ovl to output, hopefully preserving the "most derived" type of its raw data */ if ( outputContainer->addCollection(coll_ovl, coll_id).isFailure() ) { - parent->msg(MSG::WARNING) << "add mc Collection failed " << endreq; + parent->msg(MSG::WARNING) << "add mc Collection failed " << endmsg; } } } diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsContainerCnv.cxx b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsContainerCnv.cxx index 51d7f646195..567fa55c51c 100644 --- a/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsContainerCnv.cxx +++ b/Event/xAOD/xAODCaloRingsAthenaPool/src/xAODCaloRingsContainerCnv.cxx @@ -56,7 +56,7 @@ xAODCaloRingsContainerCnv::createPersistent( xAOD::CaloRingsContainer* trans ) { SG::VIEW_ELEMENTS ); // Prepare the objects to be written out: - //msg() << MSG::INFO << "before loop." << endreq; + //msg() << MSG::INFO << "before loop." << endmsg; //for( xAOD::CaloRings *cr : *result ) { // std::cout << "Rings on transient: "; // for ( xAOD::RingSet *rs : *cr ) { diff --git a/Event/xAOD/xAODTrigMinBias/Root/TrigT2MbtsBits_v1.cxx b/Event/xAOD/xAODTrigMinBias/Root/TrigT2MbtsBits_v1.cxx index d0798d6b9ed..14f9dc28c35 100644 --- a/Event/xAOD/xAODTrigMinBias/Root/TrigT2MbtsBits_v1.cxx +++ b/Event/xAOD/xAODTrigMinBias/Root/TrigT2MbtsBits_v1.cxx @@ -57,7 +57,7 @@ namespace xAOD { for(;itr != itr_end; ++itr) { log << MSG::DEBUG << (*itr) << " "; } - log << MSG::DEBUG << " }" << endreq; + log << MSG::DEBUG << " }" << endmsg; itr = m_triggerTimes.begin(); itr_end = m_triggerTimes.end(); @@ -65,7 +65,7 @@ namespace xAOD { for(;itr != itr_end; ++itr) { log << MSG::DEBUG << (*itr) << " "; } - log << MSG::DEBUG << " }" << endreq; + log << MSG::DEBUG << " }" << endmsg; } #endif // 0 diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/AFP_PileUpTool.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/AFP_PileUpTool.cxx index 3c4978667f4..2f370ed1261 100644 --- a/ForwardDetectors/AFP/AFP_Digitization/src/AFP_PileUpTool.cxx +++ b/ForwardDetectors/AFP/AFP_Digitization/src/AFP_PileUpTool.cxx @@ -115,8 +115,8 @@ StatusCode AFP_PileUpTool::initialize() { ATH_MSG_DEBUG ( "AFP_PileUpTool::initialize() called" ); - ATH_MSG_DEBUG ( " CollectionEff: " << m_CollectionEff << endreq -// << " ScalePixel: " << m_ScalePixel << endreq + ATH_MSG_DEBUG ( " CollectionEff: " << m_CollectionEff << endmsg +// << " ScalePixel: " << m_ScalePixel << endmsg ); if (m_atRndmGenSvc.retrieve().isFailure()) { diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCnv_p1.cxx index 6895c0b7d99..de2a92bbe01 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCnv_p1.cxx @@ -10,7 +10,7 @@ void AFP_RawDataCnv_p1::persToTrans(const AFP_RawData_p1* persObj, AFP_RawData* transObj, MsgStream &log) { - log << MSG::DEBUG << "In AFP_RawDataCnv_p1:persToTrans called" << endreq; + log << MSG::DEBUG << "In AFP_RawDataCnv_p1:persToTrans called" << endmsg; transObj->SetZero_PMF(); transObj->Set_DiscConf (persObj->HitDiscConfig); @@ -29,7 +29,7 @@ AFP_RawData* transObj, MsgStream &log) { void AFP_RawDataCnv_p1::transToPers(const AFP_RawData* transObj, AFP_RawData_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "In AFP_RawDataCnv_p1:transToPers called" << endreq; + log << MSG::DEBUG << "In AFP_RawDataCnv_p1:transToPers called" << endmsg; persObj->HitDiscConfig = transObj->Get_DiscConf(); persObj->Link = transObj->Get_link(); diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCollectionCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCollectionCnv_p1.cxx index a1b482ae984..863cbde200b 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCollectionCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataCollectionCnv_p1.cxx @@ -11,7 +11,7 @@ void AFP_RawDataCollectionCnv_p1::transToPers(const AFP_RawDataCollection* transColl, AFP_RawDataCollection_p1* persColl, MsgStream& log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataCollectionCnv_p1::transToPers" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataCollectionCnv_p1::transToPers" << endmsg; // Invoke vector converter from the base template AFP_RawDataCollection_Cnvp1_base_t::transToPers( transColl, persColl, log ); @@ -29,7 +29,7 @@ void AFP_RawDataCollectionCnv_p1::transToPers(const AFP_RawDataCollection* trans void AFP_RawDataCollectionCnv_p1::persToTrans(const AFP_RawDataCollection_p1* persColl, AFP_RawDataCollection* transColl, MsgStream& log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataCollectionCnv_p1::persToTrans" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataCollectionCnv_p1::persToTrans" << endmsg; // Invoke vector converter from the base template diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataContainerCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataContainerCnv_p1.cxx index 4511f2aca2c..bf4a9d00f7e 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataContainerCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_RawDataContainerCnv_p1.cxx @@ -8,7 +8,7 @@ void AFP_RawDataContainerCnv_p1::transToPers(const AFP_RawDataContainer* transCont, AFP_RawDataContainer_p1* persCont, MsgStream& log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataContainerCnv_p1::transToPers" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataContainerCnv_p1::transToPers" << endmsg; // Invoke vector converter from the base template AFP_RawDataContainer_Cnvp1_base_t::transToPers( transCont, persCont, log ); @@ -26,7 +26,7 @@ void AFP_RawDataContainerCnv_p1::transToPers(const AFP_RawDataContainer* transCo void AFP_RawDataContainerCnv_p1::persToTrans(const AFP_RawDataContainer_p1* persCont, AFP_RawDataContainer* transCont, MsgStream& log) { -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataContainerCnv_p1::persToTrans" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In AFP_RawDataContainerCnv_p1::persToTrans" << endmsg; // Invoke vector converter from the base template diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDLocRecoEventCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDLocRecoEventCnv_p1.cxx index 8b95aac6ee1..500174f9ea2 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDLocRecoEventCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDLocRecoEventCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_SIDLocRecoEventCnv_p1::persToTrans(const AFP_SIDLocRecoEvent_p1* persObj, AFP_SIDLocRecoEvent* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SIDLocRecoEventCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_SIDLocRecoEventCnv_p1::persToTrans called " << endmsg; transObj->m_iAlgoNum = persObj->m_iAlgoNum; transObj->m_nStationID = persObj->m_nStationID; @@ -34,7 +34,7 @@ void AFP_SIDLocRecoEventCnv_p1::persToTrans(const AFP_SIDLocRecoEvent_p1* persOb void AFP_SIDLocRecoEventCnv_p1::transToPers(const AFP_SIDLocRecoEvent* transObj, AFP_SIDLocRecoEvent_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SIDLocRecoEventCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_SIDLocRecoEventCnv_p1::transToPers called " << endmsg; persObj->m_iAlgoNum = transObj->m_iAlgoNum; persObj->m_nStationID = transObj->m_nStationID; diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDSimHitCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDSimHitCnv_p1.cxx index 54b544318eb..ec09498969a 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDSimHitCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SIDSimHitCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_SIDSimHitCnv_p1::persToTrans(const AFP_SIDSimHit_p1* persObj, AFP_SIDSimHit* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SIDSimHitCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_SIDSimHitCnv_p1::persToTrans called " << endmsg; transObj->m_nHitID=persObj->m_nHitID; transObj->m_nTrackID=persObj->m_nTrackID; @@ -39,7 +39,7 @@ void AFP_SIDSimHitCnv_p1::persToTrans(const AFP_SIDSimHit_p1* persObj, AFP_SIDSi void AFP_SIDSimHitCnv_p1::transToPers(const AFP_SIDSimHit* transObj, AFP_SIDSimHit_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SIDSimHitCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_SIDSimHitCnv_p1::transToPers called " << endmsg; persObj->m_nHitID=transObj->m_nHitID; persObj->m_nTrackID=transObj->m_nTrackID; diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SiDigiCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SiDigiCnv_p1.cxx index 3d89c1823e5..0971ed23341 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SiDigiCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_SiDigiCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_SiDigiCnv_p1::persToTrans(const AFP_SiDigi_p1* persObj, AFP_SiDigi* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SiDigiCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_SiDigiCnv_p1::persToTrans called " << endmsg; transObj->m_fADC=persObj->m_fADC; @@ -27,7 +27,7 @@ void AFP_SiDigiCnv_p1::persToTrans(const AFP_SiDigi_p1* persObj, AFP_SiDigi* tra void AFP_SiDigiCnv_p1::transToPers(const AFP_SiDigi* transObj, AFP_SiDigi_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_SiDigiCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_SiDigiCnv_p1::transToPers called " << endmsg; persObj->m_fADC=transObj->m_fADC; persObj->m_fTDC=transObj->m_fTDC; diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDDigiCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDDigiCnv_p1.cxx index 5e0e08805f1..9e3c9561b10 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDDigiCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDDigiCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_TDDigiCnv_p1::persToTrans(const AFP_TDDigi_p1* persObj, AFP_TDDigi* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDDigiCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_TDDigiCnv_p1::persToTrans called " << endmsg; transObj->m_fADC=persObj->m_fADC; @@ -26,7 +26,7 @@ void AFP_TDDigiCnv_p1::persToTrans(const AFP_TDDigi_p1* persObj, AFP_TDDigi* tra void AFP_TDDigiCnv_p1::transToPers(const AFP_TDDigi* transObj, AFP_TDDigi_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDDigiCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_TDDigiCnv_p1::transToPers called " << endmsg; persObj->m_fADC=transObj->m_fADC; persObj->m_fTDC=transObj->m_fTDC; diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDLocRecoEventCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDLocRecoEventCnv_p1.cxx index 4361caee8ff..f28817cec83 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDLocRecoEventCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDLocRecoEventCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_TDLocRecoEventCnv_p1::persToTrans(const AFP_TDLocRecoEvent_p1* persObj, AFP_TDLocRecoEvent* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDLocRecoEventCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_TDLocRecoEventCnv_p1::persToTrans called " << endmsg; transObj->m_iAlgoNum = persObj->m_iAlgoNum; transObj->m_nStationID = persObj->m_nStationID; @@ -28,7 +28,7 @@ void AFP_TDLocRecoEventCnv_p1::persToTrans(const AFP_TDLocRecoEvent_p1* persObj, void AFP_TDLocRecoEventCnv_p1::transToPers(const AFP_TDLocRecoEvent* transObj, AFP_TDLocRecoEvent_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDLocRecoEventCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_TDLocRecoEventCnv_p1::transToPers called " << endmsg; persObj->m_iAlgoNum = transObj->m_iAlgoNum; persObj->m_nStationID = transObj->m_nStationID; diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDSimHitCnv_p1.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDSimHitCnv_p1.cxx index 39873036668..a4d269cf205 100644 --- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDSimHitCnv_p1.cxx +++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/AFP_TDSimHitCnv_p1.cxx @@ -13,7 +13,7 @@ void AFP_TDSimHitCnv_p1::persToTrans(const AFP_TDSimHit_p1* persObj, AFP_TDSimHit* transObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDSimHitCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "AFP_TDSimHitCnv_p1::persToTrans called " << endmsg; transObj->m_nHitID=persObj->m_nHitID; transObj->m_nTrackID=persObj->m_nTrackID; @@ -36,7 +36,7 @@ void AFP_TDSimHitCnv_p1::persToTrans(const AFP_TDSimHit_p1* persObj, AFP_TDSimHi void AFP_TDSimHitCnv_p1::transToPers(const AFP_TDSimHit* transObj, AFP_TDSimHit_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "AFP_TDSimHitCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "AFP_TDSimHitCnv_p1::transToPers called " << endmsg; persObj->m_nHitID=transObj->m_nHitID; persObj->m_nTrackID=transObj->m_nTrackID; diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDBasicKalman.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDBasicKalman.cxx index 2913d116d42..43590cd79e2 100644 --- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDBasicKalman.cxx +++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDBasicKalman.cxx @@ -238,19 +238,19 @@ StatusCode AFP_SIDBasicKalman::Execute() if( DoubleHole1 > 1 || DoubleHole2 != 0) continue ; - LogStream << MSG::DEBUG << "Found new track candidate with parameters:" << endreq; + LogStream << MSG::DEBUG << "Found new track candidate with parameters:" << endmsg; LogStream << MSG::DEBUG << "Hit ID's : "; vector<Int_t>::const_iterator iter2; for (iter2= HID.begin(); iter2!= HID.end(); iter2++) LogStream << MSG::DEBUG << (*iter2) << "\t"; - LogStream << endreq; + LogStream << endmsg; - LogStream << MSG::DEBUG << "Filtered parameters : X, DX, Y, DY, chi2" << endreq; + LogStream << MSG::DEBUG << "Filtered parameters : X, DX, Y, DY, chi2" << endmsg; vector< CLHEP::HepVector >::const_iterator iter3; vector< Float_t >::const_iterator iter4 = chik.begin(); - LogStream << MSG::DEBUG << (*iter1).fSeedX << "\t" << (*iter1).fSeedDX << "\t" << (*iter1).fSeedY << "\t" << (*iter1).fSeedDY << "\t" << 0 << endreq; + LogStream << MSG::DEBUG << (*iter1).fSeedX << "\t" << (*iter1).fSeedDX << "\t" << (*iter1).fSeedY << "\t" << (*iter1).fSeedDY << "\t" << 0 << endmsg; for (iter3=xk.begin(); iter3!= xk.end(); iter3++) { - LogStream << MSG::DEBUG << (*iter3)[0] << "\t" << (*iter3)[1] << "\t" << (*iter3)[2] << "\t" << (*iter3)[3] << "\t" << (*iter4) << endreq; + LogStream << MSG::DEBUG << (*iter3)[0] << "\t" << (*iter3)[1] << "\t" << (*iter3)[2] << "\t" << (*iter3)[3] << "\t" << (*iter4) << endmsg; iter4++; } @@ -261,16 +261,16 @@ StatusCode AFP_SIDBasicKalman::Execute() Float_t Chi2Sum = 0; - LogStream << MSG::DEBUG << "Smoothed parameters : X, DX, Y, DY, chi2" << endreq; + LogStream << MSG::DEBUG << "Smoothed parameters : X, DX, Y, DY, chi2" << endmsg; vector< CLHEP::HepVector >::const_reverse_iterator iter5; vector< Float_t >::const_reverse_iterator iter6 = chikS.rbegin(); for (iter5=xkS.rbegin(); iter5!= xkS.rend(); ++iter5) { - LogStream << MSG::DEBUG << (*iter5)[0] << "\t" << (*iter5)[1] << "\t" << (*iter5)[2] << "\t" << (*iter5)[3] << "\t" << (*iter6) << endreq; + LogStream << MSG::DEBUG << (*iter5)[0] << "\t" << (*iter5)[1] << "\t" << (*iter5)[2] << "\t" << (*iter5)[3] << "\t" << (*iter6) << endmsg; Chi2Sum += (*iter6); ++iter6; } - LogStream << endreq; + LogStream << endmsg; ////////////////////////////////////////// @@ -300,13 +300,13 @@ StatusCode AFP_SIDBasicKalman::Execute() if (m_listResults.size()!=0) { list<SIDRESULT>::const_iterator iter7; - LogStream << MSG::INFO << "Filtered tracks parameters : X, DX, Y, DY, Z, quality: " << endreq; + LogStream << MSG::INFO << "Filtered tracks parameters : X, DX, Y, DY, Z, quality: " << endmsg; for (iter7=m_listResults.begin(); iter7!=m_listResults.end(); iter7++) { LogStream << MSG::INFO << std::fixed << std::setprecision(6) \ - << (*iter7).x_pos << "\t" << (*iter7).x_slope << "\t" << (*iter7).y_pos << "\t" << (*iter7).y_slope <<"\t"<< (*iter7).z_pos << "\t" << (*iter7).fChi2 << endreq; + << (*iter7).x_pos << "\t" << (*iter7).x_slope << "\t" << (*iter7).y_pos << "\t" << (*iter7).y_slope <<"\t"<< (*iter7).z_pos << "\t" << (*iter7).fChi2 << endmsg; } - LogStream << endreq; + LogStream << endmsg; } @@ -804,10 +804,10 @@ void AFP_SIDBasicKalman::HistFinalize() void AFP_SIDBasicKalman::GetData() { MsgStream LogStream(Athena::getMessageSvc(), "AFP_SIDBasicKalman::GetData()"); - LogStream << MSG::DEBUG << "begin AFP_SIDBasicKalman::GetData()" << endreq; + LogStream << MSG::DEBUG << "begin AFP_SIDBasicKalman::GetData()" << endmsg; ///// ///// - LogStream << MSG::DEBUG << "end AFP_SIDBasicKalman::GetData()" << endreq; + LogStream << MSG::DEBUG << "end AFP_SIDBasicKalman::GetData()" << endmsg; } diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocReco.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocReco.cxx index 95d704444ec..914a5674118 100644 --- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocReco.cxx +++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocReco.cxx @@ -97,13 +97,13 @@ StatusCode AFP_SIDLocReco::initialize() //write AFP_GeometryReader to StoreGate /*if (StatusCode::SUCCESS!=service("DetectorStore",m_pDetStore)) { - LogStream << MSG::ERROR << "Detector store not found" << endreq; + LogStream << MSG::ERROR << "Detector store not found" << endmsg; return StatusCode::FAILURE; } sc = m_pDetStore->record(m_pGeometryReader, m_strKeyGeometryForReco); if(sc.isFailure()) { - LogStream << MSG::ERROR << "m_pGeometryReader: unable to record to StoreGate" << endreq; + LogStream << MSG::ERROR << "m_pGeometryReader: unable to record to StoreGate" << endmsg; return sc; }*/ @@ -144,7 +144,7 @@ StatusCode AFP_SIDLocReco::execute() // const McEventCollection* mcTru = 0; // sc = m_storeGate->retrieve(mcTru,"TruthEvent"); // if(sc.isFailure() || !mcTru){ - // LogStream << MSG::DEBUG << "Container "<< "TruthEvent" <<" NOT FOUND !!!!!!!" << endreq; + // LogStream << MSG::DEBUG << "Container "<< "TruthEvent" <<" NOT FOUND !!!!!!!" << endmsg; // // return StatusCode::FAILURE; // } diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocReco.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocReco.cxx index 7d1aa47e405..bd193c0b422 100644 --- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocReco.cxx +++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocReco.cxx @@ -78,24 +78,24 @@ StatusCode AFP_TDLocReco::initialize() //read geometry /*if(ReadGeometryDetCS()) { - LogStream<<MSG::DEBUG<<"Geometry loaded successfully"<<endreq; + LogStream<<MSG::DEBUG<<"Geometry loaded successfully"<<endmsg; } else { - LogStream<<MSG::FATAL<<"Could not load geometry"<<endreq; + LogStream<<MSG::FATAL<<"Could not load geometry"<<endmsg; return StatusCode::FAILURE; }*/ //write AFP_GeometryReader to StoreGate /*if (StatusCode::SUCCESS!=service("DetectorStore",m_pDetStore)) { - LogStream << MSG::ERROR << "Detector store not found" << endreq; + LogStream << MSG::ERROR << "Detector store not found" << endmsg; return StatusCode::FAILURE; } sc = m_pDetStore->record(m_pGeometryReader, m_strKeyGeometryForReco); if(sc.isFailure()) { - LogStream << MSG::ERROR << "m_pGeometryReader: unable to record to StoreGate" << endreq; + LogStream << MSG::ERROR << "m_pGeometryReader: unable to record to StoreGate" << endmsg; return sc; }*/ @@ -136,7 +136,7 @@ StatusCode AFP_TDLocReco::execute() const McEventCollection* mcTru = 0; sc = m_storeGate->retrieve(mcTru,"TruthEvent"); if(sc.isFailure() || !mcTru){ - LogStream << MSG::DEBUG << "Container "<< "TruthEvent" <<" NOT FOUND !!!!!!!" << endreq; + LogStream << MSG::DEBUG << "Container "<< "TruthEvent" <<" NOT FOUND !!!!!!!" << endmsg; return StatusCode::FAILURE; } */ diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDZVertex.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDZVertex.cxx index 0f47e82cc55..b1ce8781292 100644 --- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDZVertex.cxx +++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDZVertex.cxx @@ -119,10 +119,10 @@ StatusCode AFP_TDZVertex::Finalize(list<TDRESULT>* pListResults) void AFP_TDZVertex::GetData() { MsgStream LogStream(Athena::getMessageSvc(), "AFP_TDZVertex::GetData()"); - LogStream << MSG::DEBUG << "begin AFP_TDZVertex::GetData()" << endreq; + LogStream << MSG::DEBUG << "begin AFP_TDZVertex::GetData()" << endmsg; ///// ///// - LogStream << MSG::DEBUG << "end AFP_TDZVertex::GetData()" << endreq; + LogStream << MSG::DEBUG << "end AFP_TDZVertex::GetData()" << endmsg; } diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx index acb734e7a68..25afe696d35 100644 --- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx +++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx @@ -115,16 +115,16 @@ StatusCode ALFA_BeamTransport::initialize() //----------------------------------------------------------------------------------------- m_log.setLevel(outputLevel()); - m_log << MSG::INFO << name() << " initialize()" << endreq; + m_log << MSG::INFO << name() << " initialize()" << endmsg; /* // retrieve the StoreGate Service (delete if not needed) StatusCode sc= service("StoreGateSvc",m_sgSvc); if (sc.isFailure()) - m_log << MSG::ERROR << "Could not retrieve StoreGateSvc!" << endreq; + m_log << MSG::ERROR << "Could not retrieve StoreGateSvc!" << endmsg; else - m_log << MSG::INFO << "StoreGateSvc retrieved!" << endreq; + m_log << MSG::INFO << "StoreGateSvc retrieved!" << endmsg; */ - m_log << MSG::INFO << "initialize() successful in " << name() << endreq; + m_log << MSG::INFO << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -160,24 +160,24 @@ StatusCode ALFA_BeamTransport::execute() //Load event info const EventInfo* mcInfoptr; if ( evtStore()->retrieve(mcInfoptr, m_infokey).isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve EventInfo" << endreq; + msg(MSG::ERROR) << "Could not retrieve EventInfo" << endmsg; return StatusCode::FAILURE; } else{ run_number=mcInfoptr->event_ID()->run_number(); evt_number=mcInfoptr->event_ID()->event_number(); - msg(MSG::DEBUG) << "run: " << run_number << " event: " << evt_number << endreq; + msg(MSG::DEBUG) << "run: " << run_number << " event: " << evt_number << endmsg; } const McEventCollection* mcCollptr; if ( evtStore()->retrieve(mcCollptr, m_key).isFailure() ) { - msg(MSG::WARNING) << "Could not retrieve McEventCollection: " << m_key << endreq; + msg(MSG::WARNING) << "Could not retrieve McEventCollection: " << m_key << endmsg; return StatusCode::SUCCESS; } else { // Loop over all events in McEventCollectio - msg(MSG::INFO) << "successful load of HepMC info" << endreq; + msg(MSG::INFO) << "successful load of HepMC info" << endmsg; for (McEventCollection::const_iterator itr = mcCollptr->begin(); itr!=mcCollptr->end(); ++itr) { std::cout<<"loop"<<std::endl; HepMC::GenEvent* evt=(*itr); @@ -213,7 +213,7 @@ StatusCode ALFA_BeamTransport::execute() } - msg(MSG::INFO) << "after running the process function" << endreq; + msg(MSG::INFO) << "after running the process function" << endmsg; } //----------------------------------------------------------------------------------------- @@ -264,7 +264,7 @@ int ALFA_BeamTransport::AddHepMCData(HepMC::GenEvent* evt) //if(m_PosRP1.x()!=-99 && m_PosRP3.x()!=-99) //At the moment we are loosing bothparticles if one of the particles get lost in the beam pipe { - msg(MSG::INFO) << "Add transproted particle into HepMC event record" << endreq; + msg(MSG::INFO) << "Add transproted particle into HepMC event record" << endmsg; //Add Data for HepMC Collection @@ -518,7 +518,7 @@ int ALFA_BeamTransport::TransportSelectedParticle(HepMC::GenEvent* evt, int evt_ //from here the transported particles are added to HepMC - msg(MSG::INFO) << "Add transproted particle into HepMC event record Beam 1" << endreq; + msg(MSG::INFO) << "Add transproted particle into HepMC event record Beam 1" << endmsg; //Add Data for HepMC Collection for(int i=0;i<(int)PosAtRP1.size();i++){//Beam1 @@ -540,7 +540,7 @@ int ALFA_BeamTransport::TransportSelectedParticle(HepMC::GenEvent* evt, int evt_ } } - msg(MSG::INFO) << "Add transproted particle into HepMC event record Beam 2" << endreq; + msg(MSG::INFO) << "Add transproted particle into HepMC event record Beam 2" << endmsg; for(int i=0;i<(int)PosAtRP3.size();i++){ //Add Data for HepMC Collection diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx index ca36ed5fe9d..56ab0a68bbd 100644 --- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx +++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/ALFA_CLinkAlg.cxx @@ -116,7 +116,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) sc = evtStore()->retrieve(pAuxRawDataColl, EVCOLLNAME_RAWDATA); if(sc.isFailure() || !pAuxRawDataColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_RAWDATA<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_RAWDATA<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_RAWDATAEVCOLLECTION, pAuxRawDataColl)); @@ -126,7 +126,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_DigitCollection* pAuxDigitColl; sc = evtStore()->retrieve(pAuxDigitColl, EVCOLLNAME_DIGIT); if(sc.isFailure() || !pAuxDigitColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_DIGIT<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_DIGIT<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_DIGITCOLLECTION, pAuxDigitColl)); @@ -135,7 +135,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_ODDigitCollection* pAuxODDigitColl; sc = evtStore()->retrieve(pAuxODDigitColl, EVCOLLNAME_ODDIGIT); if(sc.isFailure() || !pAuxODDigitColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_ODDIGIT<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_ODDIGIT<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_ODDIGITCOLLECTION, pAuxODDigitColl)); @@ -144,7 +144,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_LocRecEvCollection* pAuxLocRecEvColl; sc = evtStore()->retrieve(pAuxLocRecEvColl, EVCOLLNAME_LOCREC); if(sc.isFailure() || !pAuxLocRecEvColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCREC<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCREC<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_LOCRECEVCOLLECTION, pAuxLocRecEvColl)); @@ -153,7 +153,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_LocRecODEvCollection* pAuxLocRecODEvColl; sc = evtStore()->retrieve(pAuxLocRecODEvColl, EVCOLLNAME_LOCRECOD); if(sc.isFailure() || !pAuxLocRecODEvColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECOD<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECOD<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_LOCRECODEVCOLLECTION, pAuxLocRecODEvColl)); @@ -162,7 +162,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_LocRecCorrEvCollection* pAuxLocRecCorrEvColl; sc = evtStore()->retrieve(pAuxLocRecCorrEvColl, EVCOLLNAME_LOCRECCORR); if(sc.isFailure() || !pAuxLocRecCorrEvColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECCORR<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECCORR<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_LOCRECCORREVCOLLECTION, pAuxLocRecCorrEvColl)); @@ -171,7 +171,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) const ALFA_LocRecCorrODEvCollection* pAuxLocRecCorrODEvColl; sc = evtStore()->retrieve(pAuxLocRecCorrODEvColl, EVCOLLNAME_LOCRECCORROD); if(sc.isFailure() || !pAuxLocRecCorrODEvColl) { - msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECCORROD<<"' not found" << endreq; + msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_LOCRECCORROD<<"' not found" << endmsg; //return StatusCode::FAILURE; } else CHECK(pDataEvent->AddLink(EDVT_LOCRECCORRODEVCOLLECTION, pAuxLocRecCorrODEvColl)); @@ -180,7 +180,7 @@ StatusCode ALFA_CLinkAlg::LoadAllEventData(ALFA_CLinkEvent* pDataEvent) //const ALFA_GloRecEvCollection* pAuxGloRecEvColl; //sc = evtStore()->retrieve(pAuxGloRecEvColl, EVCOLLNAME_GLOREC); //if(sc.isFailure() || !pAuxGloRecEvColl) { - // msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_GLOREC<<"' not found" << endreq; + // msg(MSG::WARNING) << "Container '"<<EVCOLLNAME_GLOREC<<"' not found" << endmsg; // return StatusCode::FAILURE; //} //else CHECK(pDataEvent->AddLink(EDVT_GLORECEVCOLLECTION, pAuxGloRecEvColl)); @@ -196,7 +196,7 @@ StatusCode ALFA_CLinkAlg::AddCOOLFolderCallback(const string& Folder) const DataHandle<CondAttrListCollection> DataPtr; sc=detStore()->regFcn(&ALFA_CLinkAlg::COOLUpdate, this, DataPtr, Folder, true); if(sc!=StatusCode::SUCCESS){ - msg(MSG::ERROR) << "Cannot register COOL callback for folder '"<<Folder<<"'" << endreq; + msg(MSG::ERROR) << "Cannot register COOL callback for folder '"<<Folder<<"'" << endmsg; } return sc; @@ -212,35 +212,35 @@ StatusCode ALFA_CLinkAlg::COOLUpdate(IOVSVC_CALLBACK_ARGS_K(keys)) for(iter=keys.begin();iter!=keys.end();iter++){ if((*iter)==DCSCOLLNAME_BLM){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_BLM<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_BLM<<"'" << endmsg; m_CurrentDCSId.ullBlmID=CalcDCSId(EDCSI_BLM); } else if((*iter)==DCSCOLLNAME_HVCHANNEL){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_HVCHANNEL<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_HVCHANNEL<<"'" << endmsg; m_CurrentDCSId.ullHVChannelID=CalcDCSId(EDCSI_HVCHANNEL); } else if((*iter)==DCSCOLLNAME_LOCALMONITORING){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_LOCALMONITORING<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_LOCALMONITORING<<"'" << endmsg; m_CurrentDCSId.ullLocalMonitoringID=CalcDCSId(EDCSI_LOCALMONITORING); } else if((*iter)==DCSCOLLNAME_MOVEMENT){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_MOVEMENT<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_MOVEMENT<<"'" << endmsg; m_CurrentDCSId.ullMovementID=CalcDCSId(EDCSI_MOVEMENT); } else if((*iter)==DCSCOLLNAME_RADMON){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_RADMON<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_RADMON<<"'" << endmsg; m_CurrentDCSId.ullRadMonID=CalcDCSId(EDCSI_RADMON); } else if((*iter)==DCSCOLLNAME_TRIGGERRATES){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_TRIGGERRATES<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_TRIGGERRATES<<"'" << endmsg; m_CurrentDCSId.ullTriggerRatesID=CalcDCSId(EDCSI_TRIGGERRATES); } else if((*iter)==DCSCOLLNAME_FECONFIGURATION){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_FECONFIGURATION<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_FECONFIGURATION<<"'" << endmsg; m_CurrentDCSId.ullFEConfigurationID=CalcDCSId(EDCSI_FECONFIGURATION); } else if((*iter)==DCSCOLLNAME_TRIGGERSETTINGS){ - msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_TRIGGERSETTINGS<<"'" << endreq; + msg(MSG::DEBUG) << " IOV/COOL Notification '"<<DCSCOLLNAME_TRIGGERSETTINGS<<"'" << endmsg; m_CurrentDCSId.ullTriggerSettingsID=CalcDCSId(EDCSI_TRIGGERSETTINGS); } } @@ -290,7 +290,7 @@ unsigned long long ALFA_CLinkAlg::CalcDCSId(eDCSItem eItem) const CondAttrListCollection* pAttrListCol=NULL; CHECK(detStore()->retrieve(pAttrListCol,Folder)); if(!m_iovSvc->getKeyInfo(Folder,Foldername,Tag,Range,bRetrieved,ullBytesRead,fReadTime)) { - msg(MSG::ERROR)<<"Couldn't get IOV data about folder: "<<Folder<<endreq; + msg(MSG::ERROR)<<"Couldn't get IOV data about folder: "<<Folder<<endmsg; return 0; } @@ -435,7 +435,7 @@ StatusCode ALFA_CLinkAlg::FillXAOD_TrackingData(xAOD::ALFADataContainer* pxAODCo } else { - msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_LOCREC <<"' or '"<<EVCOLLNAME_LOCRECOD<<"' collection"<<endreq; + msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_LOCREC <<"' or '"<<EVCOLLNAME_LOCRECOD<<"' collection"<<endmsg; //return StatusCode::FAILURE; } @@ -498,7 +498,7 @@ StatusCode ALFA_CLinkAlg::FillXAOD_TrackingData(xAOD::ALFADataContainer* pxAODCo } else { - msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_LOCRECCORR <<"' or '"<<EVCOLLNAME_LOCRECCORROD<<"' collection"<<endreq; + msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_LOCRECCORR <<"' or '"<<EVCOLLNAME_LOCRECCORROD<<"' collection"<<endmsg; //return StatusCode::FAILURE; } @@ -578,7 +578,7 @@ StatusCode ALFA_CLinkAlg::FillXAOD_HeaderData(xAOD::ALFADataContainer* pxAODCont } else { - msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_RAWDATA <<"' collection"<<endreq; + msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_RAWDATA <<"' collection"<<endmsg; //return StatusCode::FAILURE; } } @@ -602,13 +602,13 @@ StatusCode ALFA_CLinkAlg::FillXAOD_HeaderData(xAOD::ALFADataContainer* pxAODCont } else { - msg(MSG::ERROR) << "Index exceed array size for [RPotID, nPlateID, nFiberID]= ["<<nPotID<<", "<<nPlateID<<", "<<nFiberID<<"]"<<endreq; + msg(MSG::ERROR) << "Index exceed array size for [RPotID, nPlateID, nFiberID]= ["<<nPotID<<", "<<nPlateID<<", "<<nFiberID<<"]"<<endmsg; //return StatusCode::FAILURE; } } } else{ - msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_DIGIT <<"' collection"<<endreq; + msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_DIGIT <<"' collection"<<endmsg; //return StatusCode::FAILURE; } @@ -638,14 +638,14 @@ StatusCode ALFA_CLinkAlg::FillXAOD_HeaderData(xAOD::ALFADataContainer* pxAODCont } else { - msg(MSG::ERROR) << "Index exceed array size for [RPotID, nPlateID, nFiberID, nSideID]= ["<<nPotID<<", "<<nPlateID<<", "<<nFiberID<<", "<<nSideID<<"]"<<endreq; + msg(MSG::ERROR) << "Index exceed array size for [RPotID, nPlateID, nFiberID, nSideID]= ["<<nPotID<<", "<<nPlateID<<", "<<nFiberID<<", "<<nSideID<<"]"<<endmsg; //return StatusCode::FAILURE; } } } else { - msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_ODDIGIT <<"' collection"<<endreq; + msg(MSG::WARNING) << "Cannot find '"<< EVCOLLNAME_ODDIGIT <<"' collection"<<endmsg; //return StatusCode::FAILURE; } diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.cxx index 6c387fe0b41..498c3f18610 100644 --- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.cxx +++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_CLinkEventCnv.cxx @@ -8,19 +8,19 @@ ALFA_CLinkEvent_PERS* ALFA_CLinkEventCnv::createPersistent(ALFA_CLinkEvent* transCont) { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_CLinkEventCnv_p1"); - //LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv::createPersistent (AthenaPOOL)"<<endreq; + //LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv::createPersistent (AthenaPOOL)"<<endmsg; ALFA_CLinkEventCnv_p1 TPConverter; ALFA_CLinkEvent_PERS *persObj = TPConverter.createPersistent( transCont, LogStream ); - //LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv::createPersistent (AthenaPOOL)"<<endreq; + //LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv::createPersistent (AthenaPOOL)"<<endmsg; return persObj; } ALFA_CLinkEvent* ALFA_CLinkEventCnv::createTransient() { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_CLinkEventCnv_p1"); - //LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv::createTransient (AthenaPOOL)"<<endreq; + //LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv::createTransient (AthenaPOOL)"<<endmsg; ALFA_CLinkEventCnv_p1 TPConverter_p1; @@ -35,7 +35,7 @@ ALFA_CLinkEvent* ALFA_CLinkEventCnv::createTransient() throw std::runtime_error("Unsupported persistent version of Data container"); } - //LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv::createTransient (AthenaPOOL)"<<endreq; + //LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv::createTransient (AthenaPOOL)"<<endmsg; return trans_cont; } diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.cxx index 8c8dc2532b6..582b3655672 100755 --- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.cxx +++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv.cxx @@ -9,12 +9,12 @@ ALFA_RawDataContainer_PERS* ALFA_RawDataContainerCnv::createPersistent(ALFA_RawD // std::cout << " Container, cago bello T->P " << std::endl; MsgStream log(msgSvc(), "ALFA_RawDataContainerCnv"); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv::createPersistent" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv::createPersistent" << endmsg; ALFA_RawDataContainerCnv_p1 TPConverter; ALFA_RawDataContainer_PERS* persCont = TPConverter.createPersistent(transCont, log); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endmsg; return persCont; } @@ -22,7 +22,7 @@ if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Cont ALFA_RawDataContainer* ALFA_RawDataContainerCnv::createTransient() { MsgStream log(msgSvc(), "ALFA_RawDataContainerCnv"); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv::createTransient" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv::createTransient" << endmsg; // std::cout << "Container, bello cago P->T " << std::endl; diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.cxx index 2c3dacfdb24..7d43870dc66 100644 --- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.cxx +++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/ALFA_RawDataContainerCnv_charge.cxx @@ -7,12 +7,12 @@ ALFA_RawDataContainer_charge_PERS* ALFA_RawDataContainerCnv_charge::createPersistent(ALFA_RawDataContainer_charge* transCont) { MsgStream log(msgSvc(), "ALFA_RawDataContainerCnv_charge"); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge::createPersistent" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge::createPersistent" << endmsg; ALFA_RawDataContainerCnv_charge_p1 TPConverter; ALFA_RawDataContainer_charge_PERS* persCont = TPConverter.createPersistent(transCont, log); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endmsg; return persCont; } @@ -20,7 +20,7 @@ if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Cont ALFA_RawDataContainer_charge* ALFA_RawDataContainerCnv_charge::createTransient() { MsgStream log(msgSvc(), "ALFA_RawDataContainerCnv_charge"); -if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge::createTransient" << endreq; +if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge::createTransient" << endmsg; ALFA_RawDataContainerCnv_charge_p1 TPConverter_p1; ALFA_RawDataContainer_charge* transCont(0); diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx index d7585219b0e..98dcfeb0fe5 100644 --- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx +++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/ALFA_Raw2Digit.cxx @@ -91,15 +91,15 @@ StatusCode ALFA_Raw2Digit::initialize() StatusCode sc = mapping(); - if (sc.isFailure()) { msg (MSG::FATAL) << " Could not open mapping " << endreq; return sc; } - else msg (MSG::DEBUG) << " mapping is fine " << endreq; + if (sc.isFailure()) { msg (MSG::FATAL) << " Could not open mapping " << endmsg; return sc; } + else msg (MSG::DEBUG) << " mapping is fine " << endmsg; // sc = service("THistSvc", m_histSvc); // retrieve ThistSvc ... // if(sc.isFailure()) // { -// msg(MSG::FATAL) << "Unable to retrieve pointer to THistSvc" << endreq; +// msg(MSG::FATAL) << "Unable to retrieve pointer to THistSvc" << endmsg; // return sc; // } @@ -177,7 +177,7 @@ StatusCode ALFA_Raw2Digit::execute() ATH_MSG_DEBUG ("ALFA_Raw2Digit: BEGINING of execute"); m_nEvents++; - msg(MSG::DEBUG) << "event # "<< m_nEvents << endreq; + msg(MSG::DEBUG) << "event # "<< m_nEvents << endmsg; // m_toFile << "Event " << m_nEvents << std::endl; // retrieve the RawData RDO container from the TDS @@ -185,27 +185,27 @@ StatusCode ALFA_Raw2Digit::execute() StatusCode sc_read = evtStore()->retrieve(container, m_ALFA_RawDataCollectionKey); if ( sc_read != StatusCode::SUCCESS ) { - msg(MSG::ERROR) << "ALFA_Raw2Digit: Could not find container" << endreq; + msg(MSG::ERROR) << "ALFA_Raw2Digit: Could not find container" << endmsg; return StatusCode::SUCCESS; } else if ( sc_read == StatusCode::SUCCESS ) { - msg(MSG::DEBUG) << "ALFA_Raw2Digit: Raw data container retrieved" << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: Raw data container retrieved" << endmsg; } - msg(MSG::DEBUG) << "MD record_collection()" << endreq; + msg(MSG::DEBUG) << "MD record_collection()" << endmsg; StatusCode sc = recordCollection(); if (sc.isFailure()) { - msg(MSG::WARNING) << "ALFA_Raw2Digit: recordCollection failed" << endreq; + msg(MSG::WARNING) << "ALFA_Raw2Digit: recordCollection failed" << endmsg; return StatusCode::SUCCESS; } - msg(MSG::DEBUG) << "OD record_collection()" << endreq; + msg(MSG::DEBUG) << "OD record_collection()" << endmsg; sc = recordODCollection(); if (sc.isFailure()) { - msg(MSG::WARNING) << "ALFA_Raw2Digit, recordODCollection failed" << endreq; + msg(MSG::WARNING) << "ALFA_Raw2Digit, recordODCollection failed" << endmsg; return StatusCode::SUCCESS; } @@ -238,7 +238,7 @@ StatusCode ALFA_Raw2Digit::execute() for(;RawData_Collection_Beg!=RawData_Collection_End; ++RawData_Collection_Beg) { mbID = ((*RawData_Collection_Beg)->GetMBId_POT()); - msg(MSG::DEBUG) << "ALFA_Raw2Digit: MBId POT= " << mbID << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: MBId POT= " << mbID << endmsg; // std::cout << "******* Time stamp = " << (*RawData_Collection_Beg)->GetTimeStamp_POT() << std::endl; // time_t rawtime = (*RawData_Collection_Beg)->GetTimeStamp_POT(); @@ -255,7 +255,7 @@ StatusCode ALFA_Raw2Digit::execute() charge_2[mbID-1] = ((*RawData_Collection_Beg)->Get_ADC2_POT()); for (unsigned int i=0;i<16;i++) { trigger_pattern_b[mbID-1][i] = ((*RawData_Collection_Beg)->Get_pattern_POT())[i]; -// msg(MSG::ERROR) << " pattern: bit " << i << ", value = "<< trigger_pattern_b[mbID-1][i] << " in MB = " << mbID-1 << endreq; +// msg(MSG::ERROR) << " pattern: bit " << i << ", value = "<< trigger_pattern_b[mbID-1][i] << " in MB = " << mbID-1 << endmsg; } // loop over collection start @@ -264,7 +264,7 @@ StatusCode ALFA_Raw2Digit::execute() for(;p_RawData_Beg!=p_RawData_End; ++p_RawData_Beg) { -// msg(MSG::DEBUG) << " all, pmfId = " << (*p_RawData_Beg)->GetPMFId_PMF() << ", MBId = " << (*p_RawData_Beg)->GetMBId_PMF() << endreq; +// msg(MSG::DEBUG) << " all, pmfId = " << (*p_RawData_Beg)->GetPMFId_PMF() << ", MBId = " << (*p_RawData_Beg)->GetMBId_PMF() << endmsg; if ((*p_RawData_Beg)->GetPMFId_PMF()>0 && ((*p_RawData_Beg)->GetWordId_PMF())<24) { @@ -274,16 +274,16 @@ StatusCode ALFA_Raw2Digit::execute() else WordId_count=0; if (WordId_count==1){ - msg(MSG::DEBUG) << " pmfId = " << (*p_RawData_Beg)->GetPMFId_PMF() << ", MBId = " << (*p_RawData_Beg)->GetMBId_PMF() <<endreq; + msg(MSG::DEBUG) << " pmfId = " << (*p_RawData_Beg)->GetPMFId_PMF() << ", MBId = " << (*p_RawData_Beg)->GetMBId_PMF() <<endmsg; } -// msg(MSG::DEBUG) << " WordId_count " << WordId_count << endreq; +// msg(MSG::DEBUG) << " WordId_count " << WordId_count << endmsg; for (unsigned int i=0;i<16;i++) { if ((*p_RawData_Beg)->Get_Chan(i)!=100) { - msg(MSG::DEBUG) <<"ALFA_Raw2Digit, maroc chanel # = " << (*p_RawData_Beg)->Get_Chan(i)<< endreq; + msg(MSG::DEBUG) <<"ALFA_Raw2Digit, maroc chanel # = " << (*p_RawData_Beg)->Get_Chan(i)<< endmsg; fibID = (*p_RawData_Beg)->Get_Chan(i); @@ -299,9 +299,9 @@ StatusCode ALFA_Raw2Digit::execute() layer_b[mbID-1][m_plate] = true; fiber_b[mbID-1][m_plate][m_fiber] = true; -// msg(MSG::ERROR) << " bim ho, lumi = " << lumi_block << ", pot = "<< mbID-1 << ", plate " << m_plate << endreq; +// msg(MSG::ERROR) << " bim ho, lumi = " << lumi_block << ", pot = "<< mbID-1 << ", plate " << m_plate << endmsg; n_hits_lay[mbID-1][m_plate] = n_hits_lay[mbID-1][m_plate] + 1; -// msg(MSG::ERROR) << " number of hits " << n_hits_lay[mbID-1][m_plate] << endreq; +// msg(MSG::ERROR) << " number of hits " << n_hits_lay[mbID-1][m_plate] << endmsg; // m_digitCollection->push_back(new ALFA_Digit(m_pot,m_plate,m_fiber)); m_digitCollection->push_back(new ALFA_Digit(mbID-1,m_plate,m_fiber)); @@ -309,7 +309,7 @@ StatusCode ALFA_Raw2Digit::execute() // changed by Petr - 19.12.2012 ----------------------------- // MapChan = maroc2mapmt[m_pot][fibID]; MapChan = maroc2mapmt[m_pot][m_plate][fibID]; - msg(MSG::DEBUG) << "pot = " << m_pot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endreq; + msg(MSG::DEBUG) << "pot = " << m_pot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endmsg; // PMFvsMAPMT[m_pot]->Fill(MapChan,pmfID-1); // PMFvsMAROC[m_pot]->Fill(fibID,pmfID-1); @@ -317,12 +317,12 @@ StatusCode ALFA_Raw2Digit::execute() // ChanPlot(m_pot,fibID,chan_i,chan_j); // ChanPlot(m_pot,m_plate,fibID,chan_i,chan_j); // MapmtHit[m_pot][pmfID-1]->Fill(chan_i,chan_j); - msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endreq; + msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg; pmf_chan_hit_counter[m_pot][pmfID-1][fibID]++; hit_counter[m_pot]++; - msg(MSG::DEBUG) << "ALFA_Raw2Digit: new digit (softsim numbering-starting from 0) in the collection, pot = " << m_pot << ", plate = " << m_plate << ", fiber = " << m_fiber << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: new digit (softsim numbering-starting from 0) in the collection, pot = " << m_pot << ", plate = " << m_plate << ", fiber = " << m_fiber << endmsg; } else { @@ -334,7 +334,7 @@ StatusCode ALFA_Raw2Digit::execute() // changed by Petr - 19.12.2012 ----------------------------- commented, is it needed by ODs? TODO: to correct MapChan for OD case // MapChan = maroc2mapmt[m_ODpot][fibID]; -// msg(MSG::DEBUG) << " pot = " << m_ODpot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endreq; +// msg(MSG::DEBUG) << " pot = " << m_ODpot << ", pmf = " << pmfID-1 << ", maroc = " << fibID << ", mapmt = " << MapChan << endmsg; if (m_ODfiber!=98) { @@ -343,7 +343,7 @@ StatusCode ALFA_Raw2Digit::execute() // m_ODdigitCollection->push_back(new ALFA_ODDigit(m_ODpot,m_ODside,m_ODplate,m_ODfiber)); m_ODdigitCollection->push_back(new ALFA_ODDigit(mbID-1,m_ODside,m_ODplate,m_ODfiber)); -// msg(MSG::DEBUG) << "pot, side, plate, fiber = " << m_ODpot << ", " << m_ODside << ", " << m_ODplate << ", " << m_ODfiber << endreq; +// msg(MSG::DEBUG) << "pot, side, plate, fiber = " << m_ODpot << ", " << m_ODside << ", " << m_ODplate << ", " << m_ODfiber << endmsg; } @@ -354,12 +354,12 @@ StatusCode ALFA_Raw2Digit::execute() // changed by Petr - 19.12.2012 ----------------------------- commented, is it needed by ODs? TODO: to correct ChanPlot for OD case // ChanPlot(m_ODpot,fibID,chan_i,chan_j); // MapmtHit[m_ODpot][pmfID-1]->Fill(chan_i,chan_j); - msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endreq; + msg(MSG::DEBUG) << "fibID = " << fibID << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg; pmf_chan_hit_counter[m_ODpot][pmfID-1][fibID]++; hit_counter[m_ODpot]++; - msg(MSG::DEBUG) << "ALFA_Raw2Digit: new OD digit (softsim numbering-starting from 0) in the collection, pot = " << m_ODpot << ", side = " << m_ODside << ", plate = " << m_ODplate << ", fiber = " << m_ODfiber << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: new OD digit (softsim numbering-starting from 0) in the collection, pot = " << m_ODpot << ", side = " << m_ODside << ", plate = " << m_ODplate << ", fiber = " << m_ODfiber << endmsg; } } // */ @@ -367,15 +367,15 @@ StatusCode ALFA_Raw2Digit::execute() } //if (PFM!=0) else { - msg(MSG::DEBUG) << "ALFA_Raw2Digit: More than n Raw Data " <<endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: More than n Raw Data " <<endmsg; break; } } // loop raw data - msg(MSG::DEBUG) << "ALFA_Raw2Digit: finish loop over raw data " << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: finish loop over raw data " << endmsg; } // loop collection - msg(MSG::DEBUG) << "ALFA_Raw2Digit: finish loop over collection " << endreq; + msg(MSG::DEBUG) << "ALFA_Raw2Digit: finish loop over collection " << endmsg; // m_tree->Fill(); @@ -482,26 +482,26 @@ StatusCode ALFA_Raw2Digit::finalize() StatusCode ALFA_Raw2Digit::recordCollection() { - msg(MSG::DEBUG) << " ALFA_Digitization::recordCollection " << endreq; + msg(MSG::DEBUG) << " ALFA_Digitization::recordCollection " << endmsg; m_digitCollection = new ALFA_DigitCollection(); StatusCode sc = evtStore()->record(m_digitCollection, m_key_DigitCollection); - if (sc.isFailure()) { msg (MSG::FATAL) << " MD - Could not record the empty digit collection in StoreGate " << endreq; return sc; } - else msg (MSG::DEBUG) << " MD - Digit collection is recorded in StoreGate " << endreq; + if (sc.isFailure()) { msg (MSG::FATAL) << " MD - Could not record the empty digit collection in StoreGate " << endmsg; return sc; } + else msg (MSG::DEBUG) << " MD - Digit collection is recorded in StoreGate " << endmsg; return sc; } StatusCode ALFA_Raw2Digit::recordODCollection() { - msg(MSG::DEBUG) << " ALFA_Digitization::recordODCollection " << endreq; + msg(MSG::DEBUG) << " ALFA_Digitization::recordODCollection " << endmsg; m_ODdigitCollection = new ALFA_ODDigitCollection(); StatusCode sc = evtStore()->record(m_ODdigitCollection, m_key_ODDigitCollection); - if (sc.isFailure()) { msg (MSG::FATAL) << " OD - Could not record the empty digit collection in StoreGate " << endreq; return sc; } - else msg (MSG::DEBUG) << " OD - Digit collection is recorded in StoreGate " << endreq; + if (sc.isFailure()) { msg (MSG::FATAL) << " OD - Could not record the empty digit collection in StoreGate " << endmsg; return sc; } + else msg (MSG::DEBUG) << " OD - Digit collection is recorded in StoreGate " << endmsg; return sc; } @@ -527,7 +527,7 @@ StatusCode ALFA_Raw2Digit::mapping() // mapname = "./mapping/motheboard2detector.dat"; // inDet.open(mapname.c_str()); -// msg(MSG::DEBUG) << "file name " << mapname.c_str() << endreq; +// msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg; // for (unsigned int i=0;i<64;i++) { // inDet >> MBnum >> DETnum; // mb2det[MBnum] = DETnum; @@ -551,19 +551,19 @@ StatusCode ALFA_Raw2Digit::mapping() mapname += s.str(); mapname += ".dat"; - msg(MSG::DEBUG) << "file name " << mapname.c_str() << endreq; + msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg; // ************ std::string filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch); if(filePath.length() == 0) { - msg(MSG::FATAL) << " the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" not found in Datapath." << endreq; + msg(MSG::FATAL) << " the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" not found in Datapath." << endmsg; throw std::runtime_error("FATAL: mapping MD maroc-mapmt not found in Datapath."); } else { - msg(MSG::DEBUG) << "DEBUG: the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" found in Datapath." << endreq; - msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endreq; + msg(MSG::DEBUG) << "DEBUG: the mapping file MD maroc-mapmt \"" << mapname.c_str() << "\" found in Datapath." << endmsg; + msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg; } // ************** @@ -576,8 +576,8 @@ StatusCode ALFA_Raw2Digit::mapping() for (unsigned int i=0;i<1280;i++){ // inChan >> MarChan >> MapChan >> FibChan; inChan >> iLayer >> MarChan >> MapChan >> FibChan; -// msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endreq; - msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, layer = " << iLayer << ", maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endreq; +// msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endmsg; + msg(MSG::DEBUG) << i << " maroc_mapmt_fiber, layer = " << iLayer << ", maroc = " << MarChan << ", map = "<< MapChan << ", fib = " << FibChan << endmsg; if ((MarChan < 0) || (MarChan > 63)) { @@ -608,7 +608,7 @@ StatusCode ALFA_Raw2Digit::mapping() } else { - msg(MSG::ERROR) << "the file " << mapname.c_str() << " was not open" << endreq; + msg(MSG::ERROR) << "the file " << mapname.c_str() << " was not open" << endmsg; return StatusCode::FAILURE; } @@ -616,19 +616,19 @@ StatusCode ALFA_Raw2Digit::mapping() mapname = "PMF_LAYER_MD"; mapname += s.str(); mapname += ".dat"; - msg(MSG::DEBUG) << "file name " << mapname.c_str() << endreq; + msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg; // ************ filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch); if(filePath.length() == 0) { - msg(MSG::FATAL) << " the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" not found in Datapath." << endreq; + msg(MSG::FATAL) << " the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" not found in Datapath." << endmsg; throw std::runtime_error("FATAL: mapping PMF_LAYER_MD not found in Datapath."); } else { - msg(MSG::DEBUG) << "DEBUG: the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" found in Datapath." << endreq; - msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endreq; + msg(MSG::DEBUG) << "DEBUG: the mapping file PMF_LAYER_MD \"" << mapname.c_str() << "\" found in Datapath." << endmsg; + msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg; } // ************** @@ -638,7 +638,7 @@ StatusCode ALFA_Raw2Digit::mapping() for (unsigned int i=0;i<20;i++) { inPMF >> PMFNum >> LAYNum; - msg(MSG::DEBUG) << i << " pmf2layer, pmf = " << PMFNum << ", layer = "<< LAYNum << endreq; + msg(MSG::DEBUG) << i << " pmf2layer, pmf = " << PMFNum << ", layer = "<< LAYNum << endmsg; if ((PMFNum < 0) || ( PMFNum > 22)) { @@ -654,7 +654,7 @@ StatusCode ALFA_Raw2Digit::mapping() } else { - msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endreq; + msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endmsg; return StatusCode::FAILURE; } @@ -662,19 +662,19 @@ StatusCode ALFA_Raw2Digit::mapping() mapname="OD_MAP"; mapname += s.str(); mapname+=".dat"; - msg(MSG::DEBUG) << "file name " << mapname.c_str() << endreq; + msg(MSG::DEBUG) << "file name " << mapname.c_str() << endmsg; // ************ filePath = PathResolver::find_file(mapname.c_str(),"DATAPATH", PathResolver::RecursiveSearch); if(filePath.length() == 0) { - msg(MSG::FATAL) << " the mapping file OD_MAP \"" << mapname.c_str() << "\" not found in Datapath." << endreq; + msg(MSG::FATAL) << " the mapping file OD_MAP \"" << mapname.c_str() << "\" not found in Datapath." << endmsg; throw std::runtime_error("FATAL: mapping OD_MAP not found in Datapath."); } else { - msg(MSG::DEBUG) << "DEBUG: the mapping file OD_MAP \"" << mapname.c_str() << "\" found in Datapath." << endreq; - msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endreq; + msg(MSG::DEBUG) << "DEBUG: the mapping file OD_MAP \"" << mapname.c_str() << "\" found in Datapath." << endmsg; + msg(MSG::DEBUG) << "DEBUG: filePath = " << filePath.c_str() << endmsg; } // ************** @@ -688,7 +688,7 @@ StatusCode ALFA_Raw2Digit::mapping() for(unsigned int jch=0; jch<32; jch++) { inOD >> OD_PMFNum >> OD_Dieter >> OD_LAYNum >> OD_Side >> OD_MaPmtChan >> OD_FibChan; // warning!!! MaPmt, not Maroc! - msg(MSG::DEBUG) << " pmf2layer, OD_PMFNum = " << OD_PMFNum << ", OD_Dieter = "<< OD_Dieter << ", OD_LAYNum = " << OD_LAYNum << ", OD_Side = " << OD_Side << ", OD_MaPmtChan = " << OD_MaPmtChan << ", OD_FibChan = " << OD_FibChan << endreq; + msg(MSG::DEBUG) << " pmf2layer, OD_PMFNum = " << OD_PMFNum << ", OD_Dieter = "<< OD_Dieter << ", OD_LAYNum = " << OD_LAYNum << ", OD_Side = " << OD_Side << ", OD_MaPmtChan = " << OD_MaPmtChan << ", OD_FibChan = " << OD_FibChan << endmsg; if ((OD_PMFNum < 2) || ( OD_PMFNum > 4)) { @@ -716,7 +716,7 @@ StatusCode ALFA_Raw2Digit::mapping() } else { - msg(MSG::DEBUG) << "OD_LAYNum out of bounds" << endreq; + msg(MSG::DEBUG) << "OD_LAYNum out of bounds" << endmsg; } OD_pmf_maroc2fiber[j][OD_PMFNum-1][OD_MarChan] = OD_FibChan-1; @@ -729,7 +729,7 @@ StatusCode ALFA_Raw2Digit::mapping() } else { - msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endreq; + msg(MSG::WARNING) << "the file " << mapname.c_str() << " was not open" << endmsg; return StatusCode::FAILURE; } } @@ -757,6 +757,6 @@ StatusCode ALFA_Raw2Digit::ChanPlot(uint32_t pot_n, uint32_t iLayer, uint32_t Ma chan_j=1; } -// msg(MSG::FATAL) << "in funct: fibID = " << MarChan << ", chan_i " << chan_i << ", chan_j = " << chan_j << endreq; +// msg(MSG::FATAL) << "in funct: fibID = " << MarChan << ", chan_i " << chan_i << ", chan_j = " << chan_j << endmsg; return StatusCode::SUCCESS; } diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx index a32a5ca70ae..7ce27711652 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx @@ -76,7 +76,7 @@ AthAlgorithm(name, pSvcLocator) { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_GloRec::ALFA_GloRec"); - LogStream << MSG::DEBUG << "begin ALFA_GloRec::ALFA_GloRec" << endreq; + LogStream << MSG::DEBUG << "begin ALFA_GloRec::ALFA_GloRec" << endmsg; //////////////////////////////// // ... steerable job options @@ -154,8 +154,8 @@ AthAlgorithm(name, pSvcLocator) ////////////////////////////////////////////////////////// ALFA_GloRec::~ALFA_GloRec() { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_GloRec::~ALFA_GloRec"); - LogStream << MSG::DEBUG << "begin ALFA_GloRec::~ALFA_GloRec" << endreq; - LogStream << MSG::DEBUG << "end ALFA_GloRec::~ALFA_GloRec" << endreq; + LogStream << MSG::DEBUG << "begin ALFA_GloRec::~ALFA_GloRec" << endmsg; + LogStream << MSG::DEBUG << "end ALFA_GloRec::~ALFA_GloRec" << endmsg; } ///////////////////////////////////////////////////////// @@ -165,21 +165,21 @@ ALFA_GloRec::~ALFA_GloRec() { ////////////////////////////////////////////////////////// StatusCode ALFA_GloRec::initialize() { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_GloRec::initialize()"); - LogStream << MSG::DEBUG << "begin ALFA_GloRec::initialize()" << endreq; + LogStream << MSG::DEBUG << "begin ALFA_GloRec::initialize()" << endmsg; - msg(MSG::DEBUG) << "======================================" << endreq; - msg(MSG::DEBUG) << "ALFA_GloRec::initialize - data type " << endreq; - msg(MSG::DEBUG) << "======================================" << endreq; + msg(MSG::DEBUG) << "======================================" << endmsg; + msg(MSG::DEBUG) << "ALFA_GloRec::initialize - data type " << endmsg; + msg(MSG::DEBUG) << "======================================" << endmsg; msg(MSG::DEBUG) << "DataType = " << m_iDataType << endl; TString l_strtmp(m_strTrackPathPatterns); m_TObjArrTrackPathPatterns.Clear(); - msg(MSG::DEBUG) << "==========================================================" << endreq; - msg(MSG::DEBUG) << "ALFA_GloRec::initialize - Path patterns from job options " << endreq; - msg(MSG::DEBUG) << "==========================================================" << endreq; + msg(MSG::DEBUG) << "==========================================================" << endmsg; + msg(MSG::DEBUG) << "ALFA_GloRec::initialize - Path patterns from job options " << endmsg; + msg(MSG::DEBUG) << "==========================================================" << endmsg; m_TObjArrTrackPathPatterns = *(l_strtmp.Tokenize(",")); for(int i = 0; i < m_TObjArrTrackPathPatterns.GetEntries(); i++){ - msg(MSG::DEBUG) << "pattern[" << i << "] = " << ((TObjString*) m_TObjArrTrackPathPatterns.At(i))->GetString().Data() << endreq; + msg(MSG::DEBUG) << "pattern[" << i << "] = " << ((TObjString*) m_TObjArrTrackPathPatterns.At(i))->GetString().Data() << endmsg; } @@ -200,7 +200,7 @@ StatusCode ALFA_GloRec::initialize() { StatusCode ALFA_GloRec::execute() { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_GloRec::execute()"); - LogStream << MSG::DEBUG << "begin ALFA_GloRec::execute()" << endreq; + LogStream << MSG::DEBUG << "begin ALFA_GloRec::execute()" << endmsg; StatusCode sc = StatusCode::SUCCESS; ////////////////////////// @@ -209,7 +209,7 @@ StatusCode ALFA_GloRec::execute() { const EventInfo* eventInfo; sc = evtStore()->retrieve(eventInfo); if (sc.isFailure()) { - msg(MSG::ERROR) << "ALFA_GloRec cannot get event info." << endreq; + msg(MSG::ERROR) << "ALFA_GloRec cannot get event info." << endmsg; return sc; } m_nEvent = eventInfo->event_ID()->event_number(); @@ -223,10 +223,10 @@ StatusCode ALFA_GloRec::execute() { // get truth information ////////////////////////////////////////// if(m_iDataType == 0){ - LogStream << MSG::DEBUG << "truth info()" << endreq; + LogStream << MSG::DEBUG << "truth info()" << endmsg; sc = Truth_info(); if (sc.isFailure()) { - LogStream << MSG::WARNING << "ALFA digi, Truth_info failed" << endreq; + LogStream << MSG::WARNING << "ALFA digi, Truth_info failed" << endmsg; return StatusCode::SUCCESS; } } @@ -237,7 +237,7 @@ StatusCode ALFA_GloRec::execute() { m_pGloRecEvCollection = new ALFA_GloRecEvCollection(); sc = evtStore()->record(m_pGloRecEvCollection, "ALFA_GloRecEvCollection"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not create the empty LocRecEv collection in StoreGate" << endreq; + msg(MSG::ERROR) << "Could not create the empty LocRecEv collection in StoreGate" << endmsg; } @@ -248,7 +248,7 @@ StatusCode ALFA_GloRec::execute() { sc = evtStore()->retrieve(pLocRecCorrCol, m_strLocRecCorrCollectionName); if(sc.isFailure() || !pLocRecCorrCol) { - msg(MSG::ERROR) << "Container "<< m_strLocRecCorrCollectionName <<" NOT FOUND !!!!!!!" << endreq; + msg(MSG::ERROR) << "Container "<< m_strLocRecCorrCollectionName <<" NOT FOUND !!!!!!!" << endmsg; return sc; } @@ -305,7 +305,7 @@ StatusCode ALFA_GloRec::execute() { StatusCode ALFA_GloRec::finalize() { MsgStream LogStream(Athena::getMessageSvc(), "ALFA_GloRec::finalize()"); - LogStream << MSG::DEBUG << "begin ALFA_GloRec::finalize()" << endreq; + LogStream << MSG::DEBUG << "begin ALFA_GloRec::finalize()" << endmsg; WriteHistos(); @@ -330,7 +330,7 @@ StatusCode ALFA_GloRec::Truth_info(){ const McEventCollection* mcTru = 0; StatusCode sc = evtStore()->retrieve(mcTru,m_TruthCollectionName); if(sc.isFailure() || !mcTru){ - msg(MSG::DEBUG) << "Container "<< m_TruthCollectionName <<" NOT FOUND !!!!!!!" << endreq; + msg(MSG::DEBUG) << "Container "<< m_TruthCollectionName <<" NOT FOUND !!!!!!!" << endmsg; return StatusCode::FAILURE; } @@ -384,10 +384,10 @@ StatusCode ALFA_GloRec::Truth_info(){ i++; // ... break the loop if both suitable vertices were found if (m_z_g_pos > 0. && m_z_g_neg < 0.){ - msg(MSG::DEBUG) << "gen px, py, pz = " << m_px_g_pos << " " << m_py_g_pos << " " << m_pz_g_pos << endreq; - msg(MSG::DEBUG) << "prod x, y, z = " << m_x_g_pos << " " << m_y_g_pos << " " << m_z_g_pos << endreq; - msg(MSG::DEBUG) << "gen px, py, pz = " << m_px_g_neg << " " << m_py_g_neg << " " << m_pz_g_neg << endreq; - msg(MSG::DEBUG) << "prod x, y, z = " << m_x_g_neg << " " << m_y_g_neg << " " << m_z_g_neg << endreq; + msg(MSG::DEBUG) << "gen px, py, pz = " << m_px_g_pos << " " << m_py_g_pos << " " << m_pz_g_pos << endmsg; + msg(MSG::DEBUG) << "prod x, y, z = " << m_x_g_pos << " " << m_y_g_pos << " " << m_z_g_pos << endmsg; + msg(MSG::DEBUG) << "gen px, py, pz = " << m_px_g_neg << " " << m_py_g_neg << " " << m_pz_g_neg << endmsg; + msg(MSG::DEBUG) << "prod x, y, z = " << m_x_g_neg << " " << m_y_g_neg << " " << m_z_g_neg << endmsg; break; } } @@ -470,7 +470,7 @@ void ALFA_GloRec::FillTrackCandHistos(AlfaTrackCand * trkcand){ py_g = m_py_g_neg; pz_g = m_pz_g_neg; }else{ - msg(MSG::DEBUG) << "ALFA_GloRec::FillTrackCandHistos : Track candidate neither left nor right !!!" << endreq; + msg(MSG::DEBUG) << "ALFA_GloRec::FillTrackCandHistos : Track candidate neither left nor right !!!" << endmsg; exit(0); } m_th1_xnearuppotresiduals -> Fill(trkcand->GetNearImpactPoint()->x()-trkcand->GetNearLocalHit()->GetX(),1.); diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/AlfaLocalHits.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/AlfaLocalHits.cxx index 30005d979f6..2d103a05dfd 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/AlfaLocalHits.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/AlfaLocalHits.cxx @@ -305,7 +305,7 @@ int AlfaTrackCand::IsLeftTrack(){ && m_trackcandhits->GetPathPattern().Contains("A7L1L")) ){ MsgStream LogStream(Athena::getMessageSvc(), "ALFA_TrackCand::IsLeftTrack"); - LogStream << MSG::DEBUG << "Track candidate is left" << endreq; + LogStream << MSG::DEBUG << "Track candidate is left" << endmsg; return 1; }else{ return 0; @@ -319,7 +319,7 @@ int AlfaTrackCand::IsRightTrack(){ && m_trackcandhits->GetPathPattern().Contains("A7R1L")) ){ MsgStream LogStream(Athena::getMessageSvc(), "ALFA_TrackCand::IsRightTrack"); - LogStream << MSG::DEBUG << "Track candidate is right" << endreq; + LogStream << MSG::DEBUG << "Track candidate is right" << endmsg; return 1; }else{ return 0; @@ -333,7 +333,7 @@ int AlfaTrackCand::IsLowerArmTrack(){ && m_trackcandhits->GetPathPattern().Contains("A7R1L")) ){ MsgStream LogStream(Athena::getMessageSvc(), "ALFA_TrackCand::IsLowerArmTrack"); - LogStream << MSG::DEBUG << "Track candidate is in the lower arm" << endreq; + LogStream << MSG::DEBUG << "Track candidate is in the lower arm" << endmsg; return 1; }else{ return 0; @@ -347,7 +347,7 @@ int AlfaTrackCand::IsUpperArmTrack(){ && m_trackcandhits->GetPathPattern().Contains("A7R1U")) ){ MsgStream LogStream(Athena::getMessageSvc(), "ALFA_TrackCand::IsUpperArmTrack"); - LogStream << MSG::DEBUG << "Track candidate is in the upper arm" << endreq; + LogStream << MSG::DEBUG << "Track candidate is in the upper arm" << endmsg; return 1; }else{ return 0; diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/ForwardRegionFieldSvc.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/ForwardRegionFieldSvc.cxx index 5591fd17855..300aa7384be 100644 --- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/ForwardRegionFieldSvc.cxx +++ b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/ForwardRegionFieldSvc.cxx @@ -449,12 +449,12 @@ std::vector<std::vector<std::string> > MagField::ForwardRegionFieldSvc::loadData std::ifstream file (fileName); if(!file){ std::string datapath = PathResolver::find_file(fileName,"DATAPATH", PathResolver::RecursiveSearch); - LogStream << MSG::DEBUG << "File " << fileName << " not found in run directory, trying to load it from DATAPATH" << endreq; + LogStream << MSG::DEBUG << "File " << fileName << " not found in run directory, trying to load it from DATAPATH" << endmsg; file.open(datapath.c_str()); } if(!file) - LogStream << MSG::FATAL << "Unable to load " << fileName << endreq; + LogStream << MSG::FATAL << "Unable to load " << fileName << endmsg; if(file.is_open()) { @@ -516,7 +516,7 @@ std::vector<std::vector<std::string> > MagField::ForwardRegionFieldSvc::loadData file.ignore(1024, '\n'); // discard commented lines i++; } - LogStream << MSG::INFO << "File " << fileName << " succesfully loaded." << endreq; + LogStream << MSG::INFO << "File " << fileName << " succesfully loaded." << endmsg; file.close(); } return loadedData; @@ -550,7 +550,7 @@ void MagField::ForwardRegionFieldSvc::writeOutTwiss(std::vector<std::vector<std: G4ThreeVector Point; if(!file) - LogStream << MSG::ERROR << "Unable to write to " << fileName.str() << endreq; + LogStream << MSG::ERROR << "Unable to write to " << fileName.str() << endmsg; if(file.is_open()) { diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/SimulationHitCnv_p1.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/SimulationHitCnv_p1.cxx index 2d629b4f78b..b947189eea6 100644 --- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/SimulationHitCnv_p1.cxx +++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/SimulationHitCnv_p1.cxx @@ -13,7 +13,7 @@ void SimulationHitCnv_p1::persToTrans(const SimulationHit_p1* persObj, SimulationHit* transObj, MsgStream &log) { - log << MSG::DEBUG << "SimulationHitCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "SimulationHitCnv_p1::persToTrans called " << endmsg; SimulationHit::StepPoint pre( persObj->m_pre_time,CLHEP::Hep3Vector( persObj->m_pre_position_x, persObj->m_pre_position_y, persObj->m_pre_position_z) , persObj->m_pre_kinetic_energy, CLHEP::Hep3Vector(persObj->m_pre_direction_x, persObj->m_pre_direction_y, persObj->m_pre_direction_z), @@ -31,7 +31,7 @@ void SimulationHitCnv_p1::persToTrans(const SimulationHit_p1* persObj, Simulatio void SimulationHitCnv_p1::transToPers(const SimulationHit* transObj, SimulationHit_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "SimulationHitCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "SimulationHitCnv_p1::transToPers called " << endmsg; persObj->m_pre_time = transObj->m_pre.time; persObj->m_pre_kinetic_energy = transObj->m_pre.kinetic_energy; diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.cxx index 2acdbe79b56..dd2debd2c17 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_DigitContainerCnv.cxx @@ -8,7 +8,7 @@ LUCID_DigitContainer_PERS* LUCID_DigitContainerCnv::createPersistent(LUCID_Digit MsgStream mlog(messageService(), "LUCID_DigitContainerCnv"); - mlog << MSG::DEBUG << "In LUCID_DigitContainerCnv::createPersistent " << endreq; + mlog << MSG::DEBUG << "In LUCID_DigitContainerCnv::createPersistent " << endmsg; LUCID_DigitContainerCnv_p2 converter; LUCID_DigitContainer_PERS* persObj = converter.createPersistent(transCont, mlog); @@ -20,7 +20,7 @@ LUCID_DigitContainer* LUCID_DigitContainerCnv::createTransient() { MsgStream mlog(messageService(), "LUCID_DigitContainer"); - mlog << MSG::DEBUG << "In LUCID_DigitContainerCnv::createTransient " << endreq; + mlog << MSG::DEBUG << "In LUCID_DigitContainerCnv::createTransient " << endmsg; LUCID_DigitContainerCnv_p2 converter_p2; diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.cxx index 2029d4ca4ff..3b985cff2c4 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/src/LUCID_RawDataContainerCnv.cxx @@ -8,7 +8,7 @@ LUCID_RawDataContainer_PERS* LUCID_RawDataContainerCnv::createPersistent(LUCID_R MsgStream mlog(messageService(), "LUCID_RawDataContainerCnv"); - mlog << MSG::DEBUG << "In LUCID_RawDataContainerCnv::createPersistent " << endreq; + mlog << MSG::DEBUG << "In LUCID_RawDataContainerCnv::createPersistent " << endmsg; LUCID_RawDataContainerCnv_p1 converter; LUCID_RawDataContainer_PERS* persObj = converter.createPersistent(transCont, mlog); @@ -20,7 +20,7 @@ LUCID_RawDataContainer* LUCID_RawDataContainerCnv::createTransient() { MsgStream mlog(messageService(), "LUCID_RawDataContainer"); - mlog << MSG::DEBUG << "In LUCID_RawDataContainerCnv::createTransient " << endreq; + mlog << MSG::DEBUG << "In LUCID_RawDataContainerCnv::createTransient " << endmsg; LUCID_RawDataContainerCnv_p1 converter_p1; diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx index 0b3755b12b2..cd7e92d3983 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx @@ -24,7 +24,7 @@ StatusCode LUCID_DigitByteStreamCnv::initialize() { if (StatusCode::SUCCESS != service("ByteStreamCnvSvc", m_ByteStreamEventAccess) || !m_ByteStreamEventAccess) { - if (msgLevel(MSG::FATAL)) msg(MSG::FATAL) << "Can't get ByteStreamEventAccess interface" << endreq; + if (msgLevel(MSG::FATAL)) msg(MSG::FATAL) << "Can't get ByteStreamEventAccess interface" << endmsg; return StatusCode::FAILURE; } @@ -39,7 +39,7 @@ const CLID& LUCID_DigitByteStreamCnv::classID() { StatusCode LUCID_DigitByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress*& pAddr) { - if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_DigitByteStreamCnv::createRep" << endreq; + if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_DigitByteStreamCnv::createRep" << endmsg; RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent(); LUCID_DigitContainer* RDO_container = 0; @@ -49,7 +49,7 @@ StatusCode LUCID_DigitByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress* if (!RDO_container) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can not cast to LUCID_DigitContainer" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can not cast to LUCID_DigitContainer" << endmsg; return StatusCode::RECOVERABLE; } @@ -66,7 +66,7 @@ StatusCode LUCID_DigitByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress* if (sc.isFailure()){ - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Could not convert RawData with to ByteStream " << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Could not convert RawData with to ByteStream " << endmsg; return StatusCode::RECOVERABLE; } @@ -81,7 +81,7 @@ StatusCode LUCID_DigitByteStreamCnv::fillFEA(LUCID_DigitContainer* RDO_container FullEventAssembler<SrcIdMap>::RODDATA* theROD; m_fea.setRodMinorVersion(RodBlockVersion()); - if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << "Setting ROD Minor Version Number to: " << m_RodBlockVersion << endreq; + if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << "Setting ROD Minor Version Number to: " << m_RodBlockVersion << endmsg; LucidRodEncoder_map RDOEncoder_map; @@ -96,7 +96,7 @@ StatusCode LUCID_DigitByteStreamCnv::fillFEA(LUCID_DigitContainer* RDO_container RDOEncoder_map[rodId].addDigit((*it_cont)); } - else if (msgLevel(MSG::WARNING)) msg(MSG::WARNING) << " Digit is empty, skipping digit." << endreq; + else if (msgLevel(MSG::WARNING)) msg(MSG::WARNING) << " Digit is empty, skipping digit." << endmsg; } LucidRodEncoder_map::iterator it_map = RDOEncoder_map.begin(); diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodDecoder.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodDecoder.cxx index 60aa6bba6cd..85bc2476e0b 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodDecoder.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodDecoder.cxx @@ -10,7 +10,7 @@ LUCID_RodDecoder::~LUCID_RodDecoder() {} StatusCode LUCID_RodDecoder::decode(const ROBFragment* robFragment, std::vector<uint32_t>& data_block) { - if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_RodDecoder::decode" << endreq; + if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_RodDecoder::decode" << endmsg; uint32_t ROD_source_ID = robFragment->rod_source_id(); uint32_t ROD_ndata = robFragment->rod_ndata(); @@ -18,17 +18,17 @@ StatusCode LUCID_RodDecoder::decode(const ROBFragment* robFragment, std::vector< if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << std::hex - << " ROD_source_ID: " << ROD_source_ID << endreq - << " getSourceID(): " << getSourceID() << endreq - << " ROD_ndata: " << ROD_ndata << endreq - << " ROD_nstatus: " << ROD_nstatus << endreq + << " ROD_source_ID: " << ROD_source_ID << endmsg + << " getSourceID(): " << getSourceID() << endmsg + << " ROD_ndata: " << ROD_ndata << endmsg + << " ROD_nstatus: " << ROD_nstatus << endmsg << std::dec; if (ROD_source_ID != getSourceID() ) return StatusCode::FAILURE; if (ROD_ndata != 4 && ROD_ndata != 12) return StatusCode::FAILURE; if (ROD_nstatus != 1 ) return StatusCode::FAILURE; - if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " Filling the data_block " << endreq; + if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " Filling the data_block " << endmsg; OFFLINE_FRAGMENTS_NAMESPACE::PointerType vintData; OFFLINE_FRAGMENTS_NAMESPACE::PointerType vintStat; diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodEncoder.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodEncoder.cxx index 1a8a0796192..0bf3f193c88 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodEncoder.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_RodEncoder.cxx @@ -39,20 +39,20 @@ void LUCID_RodEncoder::encode(std::vector<uint32_t>& data_block) { else if (tubeID < 20) { data_word2 |= (isHit << (tubeID - 16)); m_hitcounter2 += isHit; } else if (tubeID < 36) { data_word1 |= (isHit << (tubeID - 20)); m_hitcounter1 += isHit; } else if (tubeID < 40) { data_word3 |= (isHit << (tubeID - 36)); m_hitcounter3 += isHit; } - else if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Unknown tubeID: " << tubeID << endreq; + else if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Unknown tubeID: " << tubeID << endmsg; if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << " tubeID: " << std::setw(10) << tubeID << " npe: " << std::setw(10) << (*digit_it)->getNpe() << " isHit: " << std::setw(10) << isHit - << endreq; + << endmsg; } if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) - << " m_hitcounter0: " << std::setw(10) << m_hitcounter0 << endreq - << " m_hitcounter1: " << std::setw(10) << m_hitcounter1 << endreq - << " m_hitcounter2: " << std::setw(10) << m_hitcounter2 << endreq - << " m_hitcounter3: " << std::setw(10) << m_hitcounter3 << endreq; + << " m_hitcounter0: " << std::setw(10) << m_hitcounter0 << endmsg + << " m_hitcounter1: " << std::setw(10) << m_hitcounter1 << endmsg + << " m_hitcounter2: " << std::setw(10) << m_hitcounter2 << endmsg + << " m_hitcounter3: " << std::setw(10) << m_hitcounter3 << endmsg; data_word0 |= (m_hitcounter0 << 24); data_word1 |= (m_hitcounter1 << 24); @@ -61,10 +61,10 @@ void LUCID_RodEncoder::encode(std::vector<uint32_t>& data_block) { if (msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << std::hex - << " data_word0: " << data_word0 << endreq - << " data_word1: " << data_word1 << endreq - << " data_word2: " << data_word2 << endreq - << " data_word3: " << data_word3 << endreq + << " data_word0: " << data_word0 << endmsg + << " data_word1: " << data_word1 << endmsg + << " data_word2: " << data_word2 << endmsg + << " data_word3: " << data_word3 << endmsg << std::dec; data_block.push_back(data_word0); diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx index f04d9f722cf..7085cc2676a 100644 --- a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx +++ b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx @@ -23,7 +23,7 @@ void LUCID_DigiSettings::Initialize(IMessageSvc* msgSvc) { MsgStream log(m_msgSvc, "LUCID_DigiSettings::initialize"); - log << MSG::INFO << "Initializing" << endreq; + log << MSG::INFO << "Initializing" << endmsg; OverwriteDigiParValues(); } @@ -58,7 +58,7 @@ void LUCID_DigiSettings::OverwriteDigiParValues() { MsgStream log(m_msgSvc, "LUCID_DigiSettings"); - log << MSG::INFO << " OverwriteDigiParValues " << endreq; + log << MSG::INFO << " OverwriteDigiParValues " << endmsg; std::map <std::string, parDouble>::iterator doubleMapIt = m_doubleMap.begin(); std::map <std::string, parInt>::iterator intMapIt = m_intMap.begin(); @@ -74,7 +74,7 @@ void LUCID_DigiSettings::OverwriteDigiParValues() { log << MSG::INFO << " Overwriting: " << doubleMapIt->second.parDescription << " to : " - << doubleMapIt->second.overwriteVal << endreq; + << doubleMapIt->second.overwriteVal << endmsg; } } } @@ -90,7 +90,7 @@ void LUCID_DigiSettings::OverwriteDigiParValues() { log << MSG::INFO << " Overwriting: " << intMapIt->second.parDescription << " to : " - << intMapIt->second.overwriteVal << endreq; + << intMapIt->second.overwriteVal << endmsg; } } } @@ -103,17 +103,17 @@ void LUCID_DigiSettings::Print() const { std::map <std::string, parDouble>::const_iterator doubleMapIt = m_doubleMap.begin(); std::map <std::string, parInt>::const_iterator intMapIt = m_intMap.begin(); - log << MSG::INFO << "===================== Doubles ======================" << endreq; + log << MSG::INFO << "===================== Doubles ======================" << endmsg; for (; doubleMapIt != m_doubleMap.end(); ++doubleMapIt) - log << MSG::INFO << doubleMapIt->second.parDescription << ": " << *(doubleMapIt->second.par) <<endreq; + log << MSG::INFO << doubleMapIt->second.parDescription << ": " << *(doubleMapIt->second.par) <<endmsg; - log << MSG::INFO << "===================== Integers ======================" << endreq; + log << MSG::INFO << "===================== Integers ======================" << endmsg; for (; intMapIt != m_intMap.end(); ++intMapIt) - log << MSG::INFO << intMapIt->second.parDescription << ": " << *(intMapIt->second.par) << endreq; + log << MSG::INFO << intMapIt->second.parDescription << ": " << *(intMapIt->second.par) << endmsg; - log << MSG::INFO << "=====================================================" << endreq; + log << MSG::INFO << "=====================================================" << endmsg; } void LUCID_DigiSettings::SetDigiParDouble(std::string parname, double parval) { diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.cxx index b1edb1c9051..c904743f1ab 100644 --- a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.cxx +++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.cxx @@ -77,12 +77,12 @@ StatusCode LUCID_PileUpTool::initialize() ATH_MSG_DEBUG ( "LUCID_PileUpTool::initialize() called " ); - ATH_MSG_DEBUG ( " numTubes : " << m_numTubes << endreq - << " qdcChannelsPerPE : " << m_qdcChannelsPerPE << endreq - << " qdcPedestal : " << m_qdcPedestal << endreq - << " qdcFedNoiseFactor: " << m_qdcFedNoiseFactor << endreq - << " tdcPmtNoiseFactor: " << m_tdcPmtNoiseFactor << endreq - << " tdcFedNoiseFactor: " << m_tdcFedNoiseFactor << endreq + ATH_MSG_DEBUG ( " numTubes : " << m_numTubes << endmsg + << " qdcChannelsPerPE : " << m_qdcChannelsPerPE << endmsg + << " qdcPedestal : " << m_qdcPedestal << endmsg + << " qdcFedNoiseFactor: " << m_qdcFedNoiseFactor << endmsg + << " tdcPmtNoiseFactor: " << m_tdcPmtNoiseFactor << endmsg + << " tdcFedNoiseFactor: " << m_tdcFedNoiseFactor << endmsg << " fillRootTree : " << m_fillRootTree ); CHECK(m_atRndmGenSvc.retrieve()); diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/LUCID_HitsMoniTool.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/LUCID_HitsMoniTool.cxx index 725306a5351..22213f71458 100644 --- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/LUCID_HitsMoniTool.cxx +++ b/ForwardDetectors/LUCID/LUCID_Monitoring/src/LUCID_HitsMoniTool.cxx @@ -21,7 +21,7 @@ LUCID_HitsMoniTool::~LUCID_HitsMoniTool() {} StatusCode LUCID_HitsMoniTool::bookHistograms() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::bookHistograms " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::bookHistograms " << endmsg; m_LUCID_Histos.clear(); @@ -103,12 +103,12 @@ StatusCode LUCID_HitsMoniTool::bookHistograms() { StatusCode LUCID_HitsMoniTool::fillHistograms() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::fillHistograms " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::fillHistograms " << endmsg; StatusCode sc = evtStore()->retrieve(m_LUCID_RawDataContainer, "Lucid_RawData"); - if (sc.isFailure()) { if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " Could not retireved LUCID_RawDataContainer from StoreGate " << endreq; return sc; } - else if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_RawDataContainer is retireved from StoreGate " << endreq; + if (sc.isFailure()) { if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " Could not retireved LUCID_RawDataContainer from StoreGate " << endmsg; return sc; } + else if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_RawDataContainer is retireved from StoreGate " << endmsg; LUCID_RawDataContainer::const_iterator LUCID_RawData_itr = m_LUCID_RawDataContainer->begin(); LUCID_RawDataContainer::const_iterator LUCID_RawData_end = m_LUCID_RawDataContainer->end(); @@ -126,7 +126,7 @@ StatusCode LUCID_HitsMoniTool::fillHistograms() { << " bxID: " << std::setw(10) << bxID << " tub: " << std::setw(10) << tub << " fire: " << std::setw(10) << isTubeFired - << endreq; + << endmsg; if (isTubeFired) m_LUCID_Histos[bxID]->Fill(tub); } @@ -219,11 +219,11 @@ StatusCode LUCID_HitsMoniTool::fillHistograms() { StatusCode LUCID_HitsMoniTool::procHistograms() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::procHistograms " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " LUCID_HitsMoniTool::procHistograms " << endmsg; if (endOfRun) { - msg(MSG::DEBUG) << " m_nEvents: " << m_nEvents << endreq; + msg(MSG::DEBUG) << " m_nEvents: " << m_nEvents << endmsg; for (int bxID=0; bxID<3; bxID++) m_LUCID_Histos[18+bxID]->Scale(1./m_nEvents); } diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/ZDC_PileUpTool.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/ZDC_PileUpTool.cxx index 969303b5f63..28719a1b8b8 100644 --- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/ZDC_PileUpTool.cxx +++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/ZDC_PileUpTool.cxx @@ -84,9 +84,9 @@ StatusCode ZDC_PileUpTool::initialize() { ATH_MSG_DEBUG ( "ZDC_PileUpTool::initialize() called" ); - ATH_MSG_INFO ( " ScaleStrip: " << m_ScaleStrip << endreq - << " ScalePixel: " << m_ScalePixel << endreq - << " MaxTimeBin: " << m_MaxTimeBin << endreq + ATH_MSG_INFO ( " ScaleStrip: " << m_ScaleStrip << endmsg + << " ScalePixel: " << m_ScalePixel << endmsg + << " MaxTimeBin: " << m_MaxTimeBin << endmsg << " Pedestal : " << m_Pedestal ); if (m_atRndmGenSvc.retrieve().isFailure()) { diff --git a/Generators/BoostAfterburner/src/BoostEvent.cxx b/Generators/BoostAfterburner/src/BoostEvent.cxx index 6a0f509bde3..ca29a1e4b31 100644 --- a/Generators/BoostAfterburner/src/BoostEvent.cxx +++ b/Generators/BoostAfterburner/src/BoostEvent.cxx @@ -25,7 +25,7 @@ StatusCode BoostEvent::initialize() << std::setw(60) << "BetaX " << m_beta_x << "\n" << std::setw(60) << "BetaY " << m_beta_y << "\n" << std::setw(60) << "BetaZ " << m_beta_z << "\n" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -34,7 +34,7 @@ StatusCode BoostEvent::execute() const McEventCollection* input_collection; if ( evtStore()->retrieve(input_collection, m_inkey).isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve truth McEventCollection " << m_inkey << endreq; + msg(MSG::ERROR) << "Could not retrieve truth McEventCollection " << m_inkey << endmsg; return StatusCode::FAILURE; } @@ -47,7 +47,7 @@ StatusCode BoostEvent::execute() } //now loop on particles - msg(MSG::VERBOSE) << "Boosting event with beta=(" << m_beta_x << "," << m_beta_y << "," << m_beta_z << ")" << endreq; + msg(MSG::VERBOSE) << "Boosting event with beta=(" << m_beta_x << "," << m_beta_y << "," << m_beta_z << ")" << endmsg; msg(MSG::VERBOSE) << std::setw(10) << "pt" << std::setw(10) << "E" << std::setw(10) << "eta" @@ -56,7 +56,7 @@ StatusCode BoostEvent::execute() << std::setw(10) << "E'" << std::setw(10) << "eta'" << std::setw(10) << "phi'" - << endreq; + << endmsg; for (McEventCollection::iterator itr = output_collection->begin(); itr!=output_collection->end(); itr++) { @@ -76,7 +76,7 @@ StatusCode BoostEvent::execute() << std::setw(10) << momentum.e() << std::setw(10) << momentum.eta() << std::setw(10) << momentum.phi() - << endreq; + << endmsg; (*particleItr)->set_momentum( momentum ); } @@ -84,7 +84,7 @@ StatusCode BoostEvent::execute() if(evtStore()->record(output_collection, m_outkey).isFailure()) { - msg(MSG::ERROR) << "Could not record boosted McEventCollection " << m_outkey << endreq; + msg(MSG::ERROR) << "Could not record boosted McEventCollection " << m_outkey << endmsg; return StatusCode::FAILURE; } diff --git a/Generators/Charybdis_i/src/CharybdisInterface.cxx b/Generators/Charybdis_i/src/CharybdisInterface.cxx index e68e0a6da24..9ca578cce5d 100644 --- a/Generators/Charybdis_i/src/CharybdisInterface.cxx +++ b/Generators/Charybdis_i/src/CharybdisInterface.cxx @@ -241,7 +241,7 @@ extern "C" void readcharybdisparamint_(int* index, int* parameter) else { - //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endreq; + //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endmsg; } } @@ -305,7 +305,7 @@ extern "C" void readcharybdisparamdbl_(int* index, double* parameter) else { - //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endreq; + //log << MSG:: INFO << " Charybdis Interface -> Incorrect type cast for charybdis variable OR Incorrect index\n" << endmsg; } diff --git a/Generators/EmbeddedTrackGenerator/src/GenPDG_Property.cxx b/Generators/EmbeddedTrackGenerator/src/GenPDG_Property.cxx index dab23c2fd28..ffb34444da5 100644 --- a/Generators/EmbeddedTrackGenerator/src/GenPDG_Property.cxx +++ b/Generators/EmbeddedTrackGenerator/src/GenPDG_Property.cxx @@ -20,12 +20,12 @@ StatusCode GenPDG_Property::initialize(const HepPDT::ParticleDataTable* particle MsgStream log(m_parent->messageService(), m_parent->name() ); const HepPDT::ParticleData* particle_data = particleTable->particle(HepPDT::ParticleID(std::abs( m_pdg_id ))); if (!particle_data) { - log << MSG::FATAL << "GenPDG_Property::initialize(): can't get data for particle with pdg_id=" << std::abs(m_pdg_id) << endreq; + log << MSG::FATAL << "GenPDG_Property::initialize(): can't get data for particle with pdg_id=" << std::abs(m_pdg_id) << endmsg; return StatusCode::FAILURE; } m_mass = particle_data->mass().value(); - log << MSG::DEBUG << "GenPDG_Property::initialize(): got mass=" << m_mass << " for pdg_id=" << m_pdg_id << endreq; + log << MSG::DEBUG << "GenPDG_Property::initialize(): got mass=" << m_mass << " for pdg_id=" << m_pdg_id << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/EvtGen_i/src/EvtDecay.cxx b/Generators/EvtGen_i/src/EvtDecay.cxx index 7c01b9d52ac..a95032e85a0 100644 --- a/Generators/EvtGen_i/src/EvtDecay.cxx +++ b/Generators/EvtGen_i/src/EvtDecay.cxx @@ -79,12 +79,12 @@ EvtDecay::EvtDecay(const std::string& name, ISvcLocator* pSvcLocator):Algorithm( StatusCode EvtDecay::initialize() { MsgStream log(messageService(), name()); - log << MSG::INFO << "EvtDecay initialize" << endreq; + log << MSG::INFO << "EvtDecay initialize" << endmsg; static const bool CREATEIFNOTTHERE(true); StatusCode scRndm = service("AtRndmGenSvc", m_AtRndmGenSvc, CREATEIFNOTTHERE); if (!scRndm.isSuccess() || 0 == m_AtRndmGenSvc) { - log << MSG::ERROR << " Could not initialize Random Number Service" << endreq; + log << MSG::ERROR << " Could not initialize Random Number Service" << endmsg; return scRndm; } m_evtAtRndmGen = new EvtCLHepRandom(m_AtRndmGenSvc,m_randomStreamName); @@ -92,12 +92,12 @@ StatusCode EvtDecay::initialize() { // Open an interface to EvtGen m_myGen = new EvtGen(m_DecayDec.c_str(), m_PdtTable.c_str(), m_evtAtRndmGen); - if (m_userDecFileName =="NONE") log << MSG::INFO << "EvtDecay User did not define his Decay table EvtGen will use standart" << endreq; + if (m_userDecFileName =="NONE") log << MSG::INFO << "EvtDecay User did not define his Decay table EvtGen will use standart" << endmsg; else m_myGen->readUDecay(m_userDecFileName.c_str()); StatusCode sc = service("StoreGateSvc", m_sgSvc); if (sc.isFailure()) { - log << MSG::ERROR << "Could not find StoreGateSvc" << endreq; + log << MSG::ERROR << "Could not find StoreGateSvc" << endmsg; return sc; } @@ -108,11 +108,11 @@ StatusCode EvtDecay::initialize() { StatusCode EvtDecay::execute() { MsgStream log(messageService(), name()); - log << MSG::DEBUG << "EvtDecay executing" << endreq; + log << MSG::DEBUG << "EvtDecay executing" << endmsg; // Retrieve event from Transient Store (Storegate) if ( m_sgSvc->retrieve(m_McEvtColl, m_inputKeyName).isFailure() ) { - log << MSG::ERROR << "Could not retrieve McEventCollection" << endreq; + log << MSG::ERROR << "Could not retrieve McEventCollection" << endmsg; return StatusCode::FAILURE; } @@ -171,7 +171,7 @@ StatusCode EvtDecay::callEvtGen( HepMC::GenEvent* hepMCevt ) { foundGoodB = true; hepMCpart->set_status(899); - log << MSG::DEBUG << "Selected good B is " << id <<endreq; + log << MSG::DEBUG << "Selected good B is " << id <<endmsg; EvtId eid=EvtPDL::evtIdFromStdHep(id); double en =(hepMCpart->momentum()).e(); @@ -187,7 +187,7 @@ StatusCode EvtDecay::callEvtGen( HepMC::GenEvent* hepMCevt ) { m_myGen->generateDecay(part); if ( log.level() <= MSG::DEBUG ) part->printTree(); - log << MSG::DEBUG << "Converting particles" << endreq; + log << MSG::DEBUG << "Converting particles" << endmsg; makeHepMC(part, hepMCevt, hepMCpart); if(part->getNDaug()!=0) hepMCpart->set_status(999); @@ -203,7 +203,7 @@ StatusCode EvtDecay::callEvtGen( HepMC::GenEvent* hepMCevt ) { StatusCode EvtDecay::finalize() { MsgStream log(messageService(), name()); - log << MSG::INFO << "EvtDecay finalized" << endreq; + log << MSG::INFO << "EvtDecay finalized" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx index 7b6ea7bd57c..47b4103bb80 100644 --- a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx +++ b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx @@ -120,42 +120,42 @@ EvtInclusiveDecay::~EvtInclusiveDecay() { StatusCode EvtInclusiveDecay::initialize() { - msg(MSG::INFO) << "EvtInclusiveDecay initialize" << endreq; - msg(MSG::INFO) << "Particle properties definition file = " << m_pdtFile << endreq; - msg(MSG::INFO) << "Main decay file = " << m_decayFile << endreq; - msg(MSG::INFO) << "User decay file = " << m_userDecayFile << endreq; - msg(MSG::INFO) << "Max number of repeated decays = " << m_maxNRepeatedDecays << endreq; - msg(MSG::INFO) << "EvtInclusiveDecay selection parameters:" << endreq; - msg(MSG::INFO) << "* prohibitFinalStateDecay = " << m_prohibitFinalStateDecay << endreq; - msg(MSG::INFO) << "* prohibitReDecay = " << m_prohibitReDecay << endreq; - msg(MSG::INFO) << "* prohibitUnDecay = " << m_prohibitUnDecay << endreq; - msg(MSG::INFO) << "* prohibitRemoveSelfDecay = " << m_prohibitRemoveSelfDecay << endreq; - msg(MSG::INFO) << "* allowAllKnownDecays = " << m_allowAllKnownDecays << endreq; - msg(MSG::INFO) << "* allowDefaultBDecays = " << m_allowDefaultBDecays << endreq; - msg(MSG::INFO) << "Decayed particle status = " << m_decayedStatus << endreq; - msg(MSG::INFO) << "User selection parameters:" << endreq; - msg(MSG::INFO) << "* applyUserSelection = " << m_applyUserSelection << endreq; - msg(MSG::INFO) << "* userSelRequireOppositeSignedMu = " << m_userSelRequireOppositeSignedMu << endreq; - msg(MSG::INFO) << "* userSelMu1MinPt = " << m_userSelMu1MinPt << endreq; - msg(MSG::INFO) << "* userSelMu2MinPt = " << m_userSelMu2MinPt << endreq; - msg(MSG::INFO) << "* userSelMu1MaxEta = " << m_userSelMu1MaxEta << endreq; - msg(MSG::INFO) << "* userSelMu2MaxEta = " << m_userSelMu2MaxEta << endreq; - msg(MSG::INFO) << "* userSelMinDimuMass = " << m_userSelMinDimuMass << endreq; - msg(MSG::INFO) << "* userSelMaxDimuMass = " << m_userSelMaxDimuMass << endreq; + msg(MSG::INFO) << "EvtInclusiveDecay initialize" << endmsg; + msg(MSG::INFO) << "Particle properties definition file = " << m_pdtFile << endmsg; + msg(MSG::INFO) << "Main decay file = " << m_decayFile << endmsg; + msg(MSG::INFO) << "User decay file = " << m_userDecayFile << endmsg; + msg(MSG::INFO) << "Max number of repeated decays = " << m_maxNRepeatedDecays << endmsg; + msg(MSG::INFO) << "EvtInclusiveDecay selection parameters:" << endmsg; + msg(MSG::INFO) << "* prohibitFinalStateDecay = " << m_prohibitFinalStateDecay << endmsg; + msg(MSG::INFO) << "* prohibitReDecay = " << m_prohibitReDecay << endmsg; + msg(MSG::INFO) << "* prohibitUnDecay = " << m_prohibitUnDecay << endmsg; + msg(MSG::INFO) << "* prohibitRemoveSelfDecay = " << m_prohibitRemoveSelfDecay << endmsg; + msg(MSG::INFO) << "* allowAllKnownDecays = " << m_allowAllKnownDecays << endmsg; + msg(MSG::INFO) << "* allowDefaultBDecays = " << m_allowDefaultBDecays << endmsg; + msg(MSG::INFO) << "Decayed particle status = " << m_decayedStatus << endmsg; + msg(MSG::INFO) << "User selection parameters:" << endmsg; + msg(MSG::INFO) << "* applyUserSelection = " << m_applyUserSelection << endmsg; + msg(MSG::INFO) << "* userSelRequireOppositeSignedMu = " << m_userSelRequireOppositeSignedMu << endmsg; + msg(MSG::INFO) << "* userSelMu1MinPt = " << m_userSelMu1MinPt << endmsg; + msg(MSG::INFO) << "* userSelMu2MinPt = " << m_userSelMu2MinPt << endmsg; + msg(MSG::INFO) << "* userSelMu1MaxEta = " << m_userSelMu1MaxEta << endmsg; + msg(MSG::INFO) << "* userSelMu2MaxEta = " << m_userSelMu2MaxEta << endmsg; + msg(MSG::INFO) << "* userSelMinDimuMass = " << m_userSelMinDimuMass << endmsg; + msg(MSG::INFO) << "* userSelMaxDimuMass = " << m_userSelMaxDimuMass << endmsg; // Initialize and print blackList m_blackListSet.insert(m_blackList.begin(),m_blackList.end()); msg(MSG::INFO) << "* blackList; = "; for (std::set<int>::iterator i = m_blackListSet.begin(); i!=m_blackListSet.end(); ++i) msg(MSG::INFO) << (*i) << " "; - msg(MSG::INFO)<< endreq; + msg(MSG::INFO)<< endmsg; // Initialize and print whiteList m_whiteListSet.insert(m_whiteList.begin(),m_whiteList.end()); msg(MSG::INFO) << "* whiteList = "; for (std::set<int>::iterator i = m_whiteListSet.begin(); i!=m_whiteListSet.end(); ++i) msg(MSG::INFO) << (*i) << " "; - msg(MSG::INFO) << endreq; + msg(MSG::INFO) << endmsg; // Obtain random number generator for EvtGen static const bool CREATEIFNOTTHERE(true); @@ -226,7 +226,7 @@ StatusCode EvtInclusiveDecay::execute() { // Print HepMC in tree format if desired (before doing anything) if (m_printHepMCBeforeEvtGen) { - msg(MSG::INFO) << "Printing HepMC record at " << hepMC << " BEFORE running EvtGen:" << endreq; + msg(MSG::INFO) << "Printing HepMC record at " << hepMC << " BEFORE running EvtGen:" << endmsg; if (m_printHepMCHighLightTopLevelDecays) printHepMC(hepMC,&toBeDecayed); else @@ -240,7 +240,7 @@ StatusCode EvtInclusiveDecay::execute() { for (std::set<int>::iterator itb = toBeDecayed.begin(); itb!=toBeDecayed.end(); ++itb) { HepMC::GenParticle* p = hepMC->barcode_to_particle(*itb); if (p==0) { - msg(MSG::ERROR ) << "Overlapping decay tree encountered for barcode " << *itb << endreq; + msg(MSG::ERROR ) << "Overlapping decay tree encountered for barcode " << *itb << endmsg; return StatusCode::FAILURE; } decayParticle(hepMC,p); @@ -261,7 +261,7 @@ StatusCode EvtInclusiveDecay::execute() { //hepMC->weights().write(); // Print HepMC in tree format if desired (after finishing all EvtGen decays) if (m_printHepMCAfterEvtGen) { - msg(MSG::INFO) << "Printing HepMC record at " << hepMC << " AFTER running EvtGen:" << endreq; + msg(MSG::INFO) << "Printing HepMC record at " << hepMC << " AFTER running EvtGen:" << endmsg; if (m_printHepMCHighLightTopLevelDecays) printHepMC(hepMC,&toBeDecayed); else diff --git a/Generators/ExoGraviton_i/src/ExoGraviton.cxx b/Generators/ExoGraviton_i/src/ExoGraviton.cxx index 4d95dc6a7fe..63c1f431947 100644 --- a/Generators/ExoGraviton_i/src/ExoGraviton.cxx +++ b/Generators/ExoGraviton_i/src/ExoGraviton.cxx @@ -123,7 +123,7 @@ extern "C" void readgravparamint_(int* index, int* parameter) *parameter = p.icutoff; } //else - //log << MSG:: INFO << " ExoGraviton Interface -> Incorrect type cast for ExoGraviton variable OR Incorrect index\n" << endreq; + //log << MSG:: INFO << " ExoGraviton Interface -> Incorrect type cast for ExoGraviton variable OR Incorrect index\n" << endmsg; } diff --git a/Generators/FlowAfterburner/src/CheckFlow.cxx b/Generators/FlowAfterburner/src/CheckFlow.cxx index 59ae989ce2e..9c1c076082d 100644 --- a/Generators/FlowAfterburner/src/CheckFlow.cxx +++ b/Generators/FlowAfterburner/src/CheckFlow.cxx @@ -72,11 +72,11 @@ CheckFlow::CheckFlow(const std::string& name, ISvcLocator* pSvcLocator) : StatusCode CheckFlow::initialize(){ StatusCode result = StatusCode::SUCCESS; - msg(MSG::INFO) << ">>> CheckFlow from Initialize" << endreq; + msg(MSG::INFO) << ">>> CheckFlow from Initialize" << endmsg; StatusCode sc = service("StoreGateSvc", m_sgSvc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not find StoreGateSvc" << endreq; + msg(MSG::ERROR) << "Could not find StoreGateSvc" << endmsg; return sc; } @@ -104,7 +104,7 @@ StatusCode CheckFlow::initialize(){ ITHistSvc *rootHistSvc; if (!service("THistSvc", rootHistSvc, true).isSuccess()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } @@ -113,59 +113,59 @@ StatusCode CheckFlow::initialize(){ if ( rootHistSvc->regHist(histPath+m_hgenerated->GetName(), m_hgenerated).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_hgenerated->GetName() << endreq; + << histPath+m_hgenerated->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_b->GetName(), m_b).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_b->GetName() << endreq; + << histPath+m_b->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phi->GetName(), m_phi).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phi->GetName() << endreq; + << histPath+m_phi->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phiR->GetName(), m_phiR).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phiR->GetName() << endreq; + << histPath+m_phiR->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phi_vs_phiR->GetName(), m_phi_vs_phiR).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phi_vs_phiR->GetName() << endreq; + << histPath+m_phi_vs_phiR->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phiv1reco_vs_phiR->GetName(), m_phiv1reco_vs_phiR).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phiv1reco_vs_phiR->GetName() << endreq; + << histPath+m_phiv1reco_vs_phiR->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phiv2reco_vs_phiR->GetName(), m_phiv2reco_vs_phiR).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phiv2reco_vs_phiR->GetName() << endreq; + << histPath+m_phiv2reco_vs_phiR->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phi_vs_phiR_etap->GetName(), m_phi_vs_phiR_etap).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phi_vs_phiR_etap->GetName() << endreq; + << histPath+m_phi_vs_phiR_etap->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_phi_vs_phiR_etan->GetName(), m_phi_vs_phiR_etan).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_phi_vs_phiR_etan->GetName() << endreq; + << histPath+m_phi_vs_phiR_etan->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_v2betapth->GetName(), m_v2betapth).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_v2betapth->GetName() << endreq; + << histPath+m_v2betapth->GetName() << endmsg; if ( rootHistSvc->regHist(histPath+m_ebetapth->GetName(), m_ebetapth).isFailure() ) msg(MSG::WARNING) << "Can't book " - << histPath+m_ebetapth->GetName() << endreq; + << histPath+m_ebetapth->GetName() << endmsg; - msg(MSG::DEBUG) << "Histograms have been booked " << endreq; + msg(MSG::DEBUG) << "Histograms have been booked " << endmsg; m_tesIO = new GenAccessIO(); @@ -177,7 +177,7 @@ StatusCode CheckFlow::execute() { // HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE"); // static HepMC::ParticleDataTable *pp = NULL; // if (pp == NULL) pp = pdg_io.read_particle_data_table(); - msg(MSG::INFO) << ">>> CheckFlow from execute" << endreq; + msg(MSG::INFO) << ">>> CheckFlow from execute" << endmsg; // // Event parameters @@ -198,7 +198,7 @@ StatusCode CheckFlow::execute() { if ( m_sgSvc->retrieve(hijing_pars, "Hijing_event_params").isFailure() ) { // if ( evtStore()->retrieve(hijing_pars, "Hijing_event_params").isFailure() ) { msg(MSG::ERROR) << "Could not retrieve Hijing_event_params" - << endreq; + << endmsg; return StatusCode::FAILURE; } float b = hijing_pars->get_b(); @@ -210,7 +210,7 @@ StatusCode CheckFlow::execute() { // <<" "<<hijing_pars->get_psi(3) // <<hijing_pars->get_psi(4) // <<" "<<hijing_pars->get_psi(5) - // <<" "<<hijing_pars->get_psi(6) << endreq; + // <<" "<<hijing_pars->get_psi(6) << endmsg; // Check cut on impact parameter b if(b<m_bcut_min || b>m_bcut_max) @@ -231,7 +231,7 @@ StatusCode CheckFlow::execute() { std::vector<const HepMC::GenParticle*> particles; StatusCode stat = m_tesIO->getMC(particles, &ifs, m_key); if (stat.isFailure()) { - msg(MSG::ERROR) << "Could not find " << m_key << endreq; + msg(MSG::ERROR) << "Could not find " << m_key << endmsg; return stat; } @@ -245,7 +245,7 @@ StatusCode CheckFlow::execute() { msg(MSG::DEBUG) << " PID = " << pid << " Status = " << p_stat << " Eta = " << rapid << " Phi = " << phi - << " PhiR = " << phiR << endreq; + << " PhiR = " << phiR << endmsg; if( (fabs(rapid) >= m_rapcut_min) && (fabs(rapid) <= m_rapcut_max) && (fabs(pt) >= m_ptcut_min) && (fabs(pt) <= m_ptcut_max) ) { @@ -289,7 +289,7 @@ StatusCode CheckFlow::execute() { msg(MSG::INFO) << " PhiR = " << phiR << " PhiV1Reco = " << phiv1_reco - << " PhiV2Reco = " << phiv2_reco << endreq; + << " PhiV2Reco = " << phiv2_reco << endmsg; // convert phiR (0, 2*pi) to (-pi,pi) range double phiR_v1corr = phiR; @@ -306,7 +306,7 @@ StatusCode CheckFlow::execute() { } StatusCode CheckFlow::finalize() { - msg(MSG::INFO) << ">>> CheckFlow from finalize" << endreq; + msg(MSG::INFO) << ">>> CheckFlow from finalize" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/FlowAfterburner/src/CheckFlow_New.cxx b/Generators/FlowAfterburner/src/CheckFlow_New.cxx index 74bbb46bf88..ddce98e036a 100644 --- a/Generators/FlowAfterburner/src/CheckFlow_New.cxx +++ b/Generators/FlowAfterburner/src/CheckFlow_New.cxx @@ -88,7 +88,7 @@ CheckFlow_New::CheckFlow_New(const std::string& name, ISvcLocator* pSvcLocator) StatusCode CheckFlow_New::initialize(){ StatusCode result = StatusCode::SUCCESS; - msg(MSG::INFO) << ">>> CheckFlow_New from Initialize" << endreq; + msg(MSG::INFO) << ">>> CheckFlow_New from Initialize" << endmsg; float pt_binvals[n_ptbin+1]={0.0,0.25,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,6.0,8.0,12.0,16.0,20.0,30.0,40.0}; float eta_bin_max = 4.0; @@ -96,14 +96,14 @@ StatusCode CheckFlow_New::initialize(){ StatusCode sc = service("StoreGateSvc", m_sgSvc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not find StoreGateSvc" << endreq; + msg(MSG::ERROR) << "Could not find StoreGateSvc" << endmsg; return sc; } ITHistSvc *rootHistSvc; if (!service("THistSvc", rootHistSvc, true).isSuccess()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } @@ -117,7 +117,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"Truth Psi_{%d} distribution;%dPsi_{%d} Truth;events",ihar+1,ihar+1,ihar+1); hist_Psi_n_true [ihar]=new TH1D (name,name1,1000,-M_PI,M_PI); if ( rootHistSvc->regHist(histPath+hist_Psi_n_true[ihar]->GetName(),hist_Psi_n_true[ihar]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_true[ihar]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_true[ihar]->GetName() << endmsg; } hist_Psi_n_true[ihar]->GetXaxis()->CenterTitle(); hist_Psi_n_true[ihar]->GetYaxis()->CenterTitle(); @@ -126,7 +126,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"Reconstructed Psi_{%d} distribution;%dPsi_{%d} Reco;events",ihar+1,ihar+1,ihar+1); hist_Psi_n_reco [ihar]=new TH1D (name,name1,1000,-M_PI,M_PI); if ( rootHistSvc->regHist(histPath+hist_Psi_n_reco[ihar]->GetName(),hist_Psi_n_reco[ihar]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_reco[ihar]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_reco[ihar]->GetName() << endmsg; } hist_Psi_n_reco[ihar]->GetXaxis()->CenterTitle(); hist_Psi_n_reco[ihar]->GetYaxis()->CenterTitle(); @@ -140,7 +140,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"true Psi_{%d} -Psi_{%d};%dPsi_{%d} -%dPsi_{%d} ;events",ihar+1,ihar2+1,ihar+1,ihar+1,ihar2+1,ihar2+1); hist_psi_corr_true [ihar_i]=new TH1D (name,name1,1000,-2*M_PI,2*M_PI); if ( rootHistSvc->regHist(histPath+hist_psi_corr_true[ihar_i]->GetName(),hist_psi_corr_true[ihar_i]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_psi_corr_true[ihar_i]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_psi_corr_true[ihar_i]->GetName() << endmsg; } hist_psi_corr_true[ihar_i]->GetXaxis()->CenterTitle(); hist_psi_corr_true[ihar_i]->GetYaxis()->CenterTitle(); @@ -150,7 +150,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"reco Psi_{%d} -Psi_{%d};%dPsi_{%d} -%dPsi_{%d} ;events",ihar+1,ihar2+1,ihar+1,ihar+1,ihar2+1,ihar2+1); hist_psi_corr_reco [ihar_i]=new TH1D (name,name1,1000,-2*M_PI,2*M_PI); if ( rootHistSvc->regHist(histPath+hist_psi_corr_reco[ihar_i]->GetName(),hist_psi_corr_reco[ihar_i]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_psi_corr_reco[ihar_i]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_psi_corr_reco[ihar_i]->GetName() << endmsg; } hist_psi_corr_reco[ihar_i]->GetXaxis()->CenterTitle(); hist_psi_corr_reco[ihar_i]->GetYaxis()->CenterTitle(); @@ -163,7 +163,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"v%d;v%d;events",ihar+1,ihar+1); hist_vn_ebe [ihar]=new TH1D (name,name1,1000,-0.5,0.5); if ( rootHistSvc->regHist(histPath+hist_vn_ebe[ihar]->GetName(),hist_vn_ebe[ihar]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_vn_ebe[ihar]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_vn_ebe[ihar]->GetName() << endmsg; } hist_vn_ebe[ihar]->GetXaxis()->CenterTitle(); hist_vn_ebe[ihar]->GetYaxis()->CenterTitle(); @@ -172,7 +172,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"%d#Delta#Psi;%d(#Psi_{reco}-#Psi_{Truth});events",ihar+1,ihar+1); hist_Psi_n_ebe [ihar]=new TH1D (name,name1,1000,-M_PI,M_PI); if ( rootHistSvc->regHist(histPath+hist_Psi_n_ebe[ihar]->GetName(),hist_Psi_n_ebe[ihar]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_ebe[ihar]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_ebe[ihar]->GetName() << endmsg; } hist_Psi_n_ebe[ihar]->GetXaxis()->CenterTitle(); hist_Psi_n_ebe[ihar]->GetYaxis()->CenterTitle(); @@ -181,7 +181,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"%d#Delta#Psi (pT weighted);%d(#Psi_{reco}-#Psi_{Truth});events",ihar+1,ihar+1); hist_Psi_n_ebe_pt [ihar]=new TH1D (name,name1,1000,-M_PI,M_PI); if ( rootHistSvc->regHist(histPath+hist_Psi_n_ebe_pt[ihar]->GetName(),hist_Psi_n_ebe_pt[ihar]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_ebe_pt[ihar]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+hist_Psi_n_ebe_pt[ihar]->GetName() << endmsg; } hist_Psi_n_ebe_pt[ihar]->GetXaxis()->CenterTitle(); hist_Psi_n_ebe_pt[ihar]->GetYaxis()->CenterTitle(); @@ -196,7 +196,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"v%d vs pT (eta%d);pT;v%d",ihar+1,ieta,ihar+1); profile_pt_dep [ihar][ieta]=new TProfile (name,name1,n_ptbin,pt_binvals); if ( rootHistSvc->regHist(histPath+profile_pt_dep[ihar][ieta]->GetName(),profile_pt_dep[ihar][ieta]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+profile_pt_dep[ihar][ieta]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+profile_pt_dep[ihar][ieta]->GetName() << endmsg; } profile_pt_dep [ihar][ieta]->GetXaxis()->CenterTitle(); profile_pt_dep [ihar][ieta]->GetYaxis()->CenterTitle(); @@ -207,7 +207,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"v%d vs #eta; (ipt%d)#eta;v%d",ihar+1,ipt,ihar+1); profile_eta_dep [ihar][ipt]=new TProfile (name,name1,2*n_etabin, -eta_bin_max,eta_bin_max); if ( rootHistSvc->regHist(histPath+profile_eta_dep[ihar][ipt]->GetName(),profile_eta_dep[ihar][ipt]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+profile_eta_dep[ihar][ipt]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+profile_eta_dep[ihar][ipt]->GetName() << endmsg; } profile_eta_dep [ihar][ipt]->GetXaxis()->CenterTitle(); profile_eta_dep [ihar][ipt]->GetYaxis()->CenterTitle(); @@ -219,7 +219,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"v%d vs pT (eta%d);pT;v%d",ihar+1,ieta,ihar+1); profile_pt_dep_reco [ihar][ieta]=new TProfile (name,name1,n_ptbin,pt_binvals); if ( rootHistSvc->regHist(histPath+profile_pt_dep_reco[ihar][ieta]->GetName(),profile_pt_dep_reco[ihar][ieta]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+profile_pt_dep_reco[ihar][ieta]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+profile_pt_dep_reco[ihar][ieta]->GetName() << endmsg; } profile_pt_dep_reco [ihar][ieta]->GetXaxis()->CenterTitle(); profile_pt_dep_reco [ihar][ieta]->GetYaxis()->CenterTitle(); @@ -231,7 +231,7 @@ StatusCode CheckFlow_New::initialize(){ sprintf(name1,"v%d vs #eta (pt%d);#eta;v%d",ihar+1,ipt,ihar+1); profile_eta_dep_reco [ihar][ipt]=new TProfile (name,name1,2*n_etabin, -eta_bin_max,eta_bin_max); if ( rootHistSvc->regHist(histPath+profile_eta_dep_reco[ihar][ipt]->GetName(),profile_eta_dep_reco[ihar][ipt]).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+profile_eta_dep_reco[ihar][ipt]->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+profile_eta_dep_reco[ihar][ipt]->GetName() << endmsg; } profile_eta_dep_reco [ihar][ipt]->GetXaxis()->CenterTitle(); profile_eta_dep_reco [ihar][ipt]->GetYaxis()->CenterTitle(); @@ -241,10 +241,10 @@ StatusCode CheckFlow_New::initialize(){ } profile_resolution=new TProfile("profile_resolution","vn resolution;n;resolution",6, 0.5,6.5); if(rootHistSvc->regHist(histPath+profile_resolution->GetName(),profile_resolution).isFailure() ){ - msg(MSG::WARNING) << "Can't book "<< histPath+profile_resolution->GetName() << endreq; + msg(MSG::WARNING) << "Can't book "<< histPath+profile_resolution->GetName() << endmsg; } - msg(MSG::DEBUG) << "Histograms have been booked " << endreq; + msg(MSG::DEBUG) << "Histograms have been booked " << endmsg; m_tesIO = new GenAccessIO(); return result; } @@ -253,7 +253,7 @@ StatusCode CheckFlow_New::initialize(){ StatusCode CheckFlow_New::execute() { MsgStream msglog(messageService(), name()); - msg(MSG::INFO) << ">>> CheckFlow_New from execute" << endreq; + msg(MSG::INFO) << ">>> CheckFlow_New from execute" << endmsg; float pt_binvals[n_ptbin+1]={0.0,0.25,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,6.0,8.0,12.0,16.0,20.0,30.0,40.0}; float eta_bin_max = 4.0; @@ -263,7 +263,7 @@ StatusCode CheckFlow_New::execute() { if ( m_sgSvc->retrieve(hijing_pars, "Hijing_event_params").isFailure() ) { // if ( evtStore()->retrieve(hijing_pars, "Hijing_event_params").isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve Hijing_event_params"<< endreq; + msg(MSG::ERROR) << "Could not retrieve Hijing_event_params"<< endmsg; return StatusCode::FAILURE; } @@ -272,7 +272,7 @@ StatusCode CheckFlow_New::execute() { float Psi_n_reco_pos[6],Psi_n_reco_neg[6]; for(int ihar=0;ihar<6;ihar++){Psi_n[ihar]=hijing_pars->get_psi(ihar+1);} msg(MSG::INFO)<<"SOUMYA "<<hijing_pars->get_psi(1)<<" "<<hijing_pars->get_psi(2)<<" "<<hijing_pars->get_psi(3) - <<hijing_pars->get_psi(4)<<" "<<hijing_pars->get_psi(5)<<" "<<hijing_pars->get_psi(6)<<" "<<b << endreq; + <<hijing_pars->get_psi(4)<<" "<<hijing_pars->get_psi(5)<<" "<<hijing_pars->get_psi(6)<<" "<<b << endmsg; // Check cut on impact parameter b @@ -291,7 +291,7 @@ StatusCode CheckFlow_New::execute() { std::vector<const HepMC::GenParticle*> particles; StatusCode stat = m_tesIO->getMC(particles, &ifs, m_key); if (stat.isFailure()) { - msg(MSG::ERROR) << "Could not find " << m_key << endreq; + msg(MSG::ERROR) << "Could not find " << m_key << endmsg; return stat; } for (std::vector<const HepMC::GenParticle*>::iterator pitr = particles.begin();pitr != particles.end(); pitr++) { @@ -302,7 +302,7 @@ StatusCode CheckFlow_New::execute() { double phi = (*pitr)->momentum().phi(); msg(MSG::DEBUG) << " PID = " << pid << " Status = " << p_stat - << " Eta = " << rapid << " Phi = " << phi<< endreq; + << " Eta = " << rapid << " Phi = " << phi<< endmsg; if( (fabs(rapid) >= m_rapcut_min) && (fabs(rapid) <= m_rapcut_max) && (fabs(pt) >= m_ptcut_min) && (fabs(pt) <= m_ptcut_max) ) { @@ -428,7 +428,7 @@ StatusCode CheckFlow_New::execute() { StatusCode CheckFlow_New::finalize() { MsgStream msglog(messageService(), name()); - msg(MSG::INFO) << ">>> CheckFlow_New from finalize" << endreq; + msg(MSG::INFO) << ">>> CheckFlow_New from finalize" << endmsg; /* for(int ihar=0;ihar<6;ihar++){ diff --git a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx index dcfd4e68e62..229cedebd39 100755 --- a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx +++ b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx @@ -60,7 +60,7 @@ EventBoost::EventBoost( const std::string& name, //______________________________________________________________________________ StatusCode EventBoost::initialize(){ - msg(MSG::INFO) << "Base Class initializing" << endreq; + msg(MSG::INFO) << "Base Class initializing" << endmsg; //Call user job initialization: return GenAnalysis_initialize(); @@ -71,13 +71,13 @@ StatusCode EventBoost::execute() { // MsgStream msglog(messageService(), name()); - msg(MSG::VERBOSE) << "Begin execute()" << endreq; + msg(MSG::VERBOSE) << "Begin execute()" << endmsg; // Read Data from Transient Store const McEventCollection* mcCollptr; if ( sgSvc()->retrieve(mcCollptr, m_genEvtInKey).isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve McEventCollection" << m_genEvtInKey<< endreq; + msg(MSG::ERROR) << "Could not retrieve McEventCollection" << m_genEvtInKey<< endmsg; return StatusCode::FAILURE; } @@ -99,7 +99,7 @@ StatusCode EventBoost::execute() { const McEventCollection* mcCollptrCOPY; if ( sgSvc()->retrieve(mcCollptrCOPY, m_genEvtOutKey).isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve boosted McEventCollection" << m_genEvtOutKey<< endreq; + msg(MSG::ERROR) << "Could not retrieve boosted McEventCollection" << m_genEvtOutKey<< endmsg; return StatusCode::FAILURE; } @@ -147,18 +147,18 @@ StatusCode EventBoost::Analyse_EndEvent() { m_nModifiedTotal += m_nModifiedEvent; m_nFailedTotal += m_nFailedEvent; if ( m_nModifiedEvent+m_nFailedEvent == 0) - msg(MSG::VERBOSE) << "No particles requiring modifications found in event." << endreq; + msg(MSG::VERBOSE) << "No particles requiring modifications found in event." << endmsg; else msg(MSG::DEBUG) << "Modified a total of " <<m_nModifiedEvent<<" particles (" - <<m_nFailedEvent<<" failures)."<< endreq; + <<m_nFailedEvent<<" failures)."<< endmsg; return StatusCode::SUCCESS; } //______________________________________________________________________________ StatusCode EventBoost::GenAnalysis_initialize(){ - msg(MSG::INFO) << "EventBoost initializing" << endreq; + msg(MSG::INFO) << "EventBoost initializing" << endmsg; return StatusCode::SUCCESS; } @@ -167,11 +167,11 @@ StatusCode EventBoost::GenAnalysis_initialize(){ StatusCode EventBoost::GenAnalysis_finalize(){ if ( m_nModifiedTotal+m_nFailedTotal == 0) - msg(MSG::WARNING) << "No particles requiring modifications found during entire job." << endreq; + msg(MSG::WARNING) << "No particles requiring modifications found during entire job." << endmsg; else msg(MSG::INFO) << "Modified a total of " <<m_nModifiedTotal<<" particles (" - <<m_nFailedTotal<<" failures) during job."<< endreq; + <<m_nFailedTotal<<" failures) during job."<< endmsg; return StatusCode::SUCCESS; } @@ -179,7 +179,7 @@ StatusCode EventBoost::GenAnalysis_finalize(){ StatusCode EventBoost::AnalyseGenEvent(HepMC::GenEvent* genEvt) { - msg(MSG::VERBOSE) << "EventBoost begin AnalyseGenEvent()" << endreq; + msg(MSG::VERBOSE) << "EventBoost begin AnalyseGenEvent()" << endmsg; HepMC::GenEvent::particle_iterator p = genEvt->particles_begin(); HepMC::GenEvent::particle_iterator pEnd = genEvt->particles_end(); @@ -197,12 +197,12 @@ StatusCode EventBoost::AnalyseGenEvent(HepMC::GenEvent* genEvt) { for (;it!=itE;++it) { if (!doModification(*it,m_pxsum)) { - msg(MSG::WARNING) << "Problems modifying HepMC record!" << endreq; + msg(MSG::WARNING) << "Problems modifying HepMC record!" << endmsg; ++m_nFailedEvent; } else ++m_nModifiedEvent; } - msg(MSG::DEBUG) << "Difference in total Px momentum = " << m_pxsum << " MeV" <<endreq; + msg(MSG::DEBUG) << "Difference in total Px momentum = " << m_pxsum << " MeV" <<endmsg; if ((m_gaussian_vertex_smearing)||(m_flat_vertex_smearing)) { @@ -229,7 +229,7 @@ StatusCode EventBoost::AnalyseGenEvent(HepMC::GenEvent* genEvt) { Rndm::Numbers FlatVertexModifier_z(randSvc(), Rndm::Flat(m_flat_smearing_boundary_min[2], m_flat_smearing_boundary_max[2])); if ((m_gaussian_vertex_smearing)&&(m_flat_vertex_smearing)) { - msg(MSG::ERROR) << "Bad input settings: cannot smear according to multiple distributions: Gauss & Flat" << endreq; + msg(MSG::ERROR) << "Bad input settings: cannot smear according to multiple distributions: Gauss & Flat" << endmsg; return StatusCode::FAILURE; } @@ -248,7 +248,7 @@ StatusCode EventBoost::AnalyseGenEvent(HepMC::GenEvent* genEvt) { if (m_gaussian_vertex_smearing) { if (!doVertexModification(*vit, m_gauss_rand_x, m_gauss_rand_y, m_gauss_rand_z)) { - msg(MSG::WARNING) << "Problems modifying HepMC record!" << endreq; + msg(MSG::WARNING) << "Problems modifying HepMC record!" << endmsg; ++m_nFailedEvent; } else ++m_nModifiedEvent; @@ -256,7 +256,7 @@ StatusCode EventBoost::AnalyseGenEvent(HepMC::GenEvent* genEvt) { else if (m_flat_vertex_smearing) { if (!doVertexModification(*vit, m_flat_rand_x, m_flat_rand_y, m_flat_rand_z)) { - msg(MSG::WARNING) << "Problems modifying HepMC record!" << endreq; + msg(MSG::WARNING) << "Problems modifying HepMC record!" << endmsg; ++m_nFailedEvent; } else ++m_nModifiedEvent; @@ -320,7 +320,7 @@ bool EventBoost::doVertexModification(HepMC::GenVertex * ver, double rand_x, dou ver->set_position(new_vertex_pos); - msg(MSG::DEBUG) << "Vertex position modified from ("<<vertex.x()<<", "<<vertex.y()<<", "<<vertex.z()<<") to ("<<new_vertex_pos.x()<<", "<<new_vertex_pos.y()<<", "<<new_vertex_pos.z()<<")" << endreq; + msg(MSG::DEBUG) << "Vertex position modified from ("<<vertex.x()<<", "<<vertex.y()<<", "<<vertex.z()<<") to ("<<new_vertex_pos.x()<<", "<<new_vertex_pos.y()<<", "<<new_vertex_pos.z()<<")" << endmsg; return true; @@ -339,7 +339,7 @@ StatusCode EventBoost::EventCopy(const HepMC::GenEvent* evt) const mcEvtColl->push_back(newEvt); if ( sgSvc()->record( mcEvtColl, m_genEvtOutKey ).isFailure() ) { - msg(MSG::ERROR) << "Could not record boosted McEventCollection" << m_genEvtOutKey<< endreq; + msg(MSG::ERROR) << "Could not record boosted McEventCollection" << m_genEvtOutKey<< endmsg; return StatusCode::FAILURE; } diff --git a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx index 4b5d478a9e0..95ec36d68ee 100644 --- a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx +++ b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx @@ -63,14 +63,14 @@ PDFReweightTool::~PDFReweightTool() { StatusCode PDFReweightTool::initialize() { msg(MSG::INFO) << "Initializing PDF Reweighting Tool " - << endreq; + << endmsg; //retrieve StoreGate StatusCode sc = service("StoreGateSvc", m_storeGate); if (sc.isFailure()) { msg(MSG::ERROR) << "Unable to retrieve pointer to StoreGateSvc" - << endreq; + << endmsg; return sc; } @@ -81,7 +81,7 @@ StatusCode PDFReweightTool::initialize() { <<"Reweighting between the different c.m. energies is requested during the event generation... " <<"Usually, it is needed for the existing events. At this moment the run continues but it might fail. " <<"Please, check the tool settings" - << endreq; + << endmsg; } //check #2 @@ -91,7 +91,7 @@ StatusCode PDFReweightTool::initialize() { << "Reweighting between the different c.m. energies is requested. " << "But the proper original and new beam energy values are not set. " << "The corresponding propierty names are: 'OrigBeamEnergy' and 'NewBeamEnergy' " - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -105,7 +105,7 @@ StatusCode PDFReweightTool::initialize() { msg(MSG::ERROR) <<"The original (used or being used in the event generation) PDF set name has to be set. " <<"Check the tool propierty 'OrigPDFSetName' " - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -117,7 +117,7 @@ StatusCode PDFReweightTool::initialize() { <<"the second PDF set name has to be empty (it is not needed). Force 'PDFSetName' = ''. " <<"If none of the above modes are assumed, then make the both propierties false: " <<"'GeneratorUse' and 'DifferentCMEnergies' and re-run " - << endreq; + << endmsg; m_PDFSetName = ""; } @@ -130,11 +130,11 @@ StatusCode PDFReweightTool::initialize() { else { msg(MSG::ERROR) << "OigPDFSetName is too long" - << endreq; + << endmsg; } initpdfsetbynamem_(oldset, pdf_set_name, strlen(pdf_set_name)); - msg(MSG::INFO) << " PDF set "<<m_OrigPDFSetName<<" has been initialized"<< endreq; + msg(MSG::INFO) << " PDF set "<<m_OrigPDFSetName<<" has been initialized"<< endmsg; if(m_PDFSetName != "") { int newset=2; //do not change the number @@ -145,10 +145,10 @@ StatusCode PDFReweightTool::initialize() { { msg(MSG::ERROR) << "PDFSetName is too long" - << endreq;} + << endmsg;} initpdfsetbynamem_(newset, new_pdf_set_name, strlen(new_pdf_set_name)); - msg(MSG::INFO) << " PDF set "<<m_PDFSetName<<" has been initialized"<< endreq; + msg(MSG::INFO) << " PDF set "<<m_PDFSetName<<" has been initialized"<< endmsg; } //the re-weighting 'flavor' is defined. anounce about it. @@ -160,7 +160,7 @@ StatusCode PDFReweightTool::initialize() { <<" TeV to the new energy " << m_NewBeamEnergy <<" TeV will be performed" - << endreq; + << endmsg; } //scenario #2 //this scenario has two possible options: @@ -170,7 +170,7 @@ StatusCode PDFReweightTool::initialize() { msg(MSG::INFO) <<"Event PDF weights will be calculated for this error PDF set - " <<m_OrigPDFSetName - <<endreq; + <<endmsg; } //scenario #3 else { // m_PDFSetName!="" @@ -179,7 +179,7 @@ StatusCode PDFReweightTool::initialize() { << m_OrigPDFSetName <<" will be reweighted to the new error PDF set - " <<m_PDFSetName - <<endreq; + <<endmsg; } return StatusCode::SUCCESS; @@ -189,7 +189,7 @@ StatusCode PDFReweightTool::initialize() { StatusCode PDFReweightTool::execute() { - msg(MSG::DEBUG) << " Execute PDF Reweighting Tool " << endreq; + msg(MSG::DEBUG) << " Execute PDF Reweighting Tool " << endmsg; StatusCode sc; @@ -197,7 +197,7 @@ StatusCode PDFReweightTool::execute() { msg(MSG::WARNING) << "No input McEventCollection is specified. " << "Can't create an output collection for reweighted events. Nothing will be done" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -209,10 +209,10 @@ StatusCode PDFReweightTool::execute() { if( sc.isFailure() ) { msg(MSG::WARNING) << "New MC event container was not recorded in TDS" - << endreq; + << endmsg; return StatusCode::SUCCESS; } - msg(MSG::DEBUG) << "New MC Event Container Was Successfully Recorded" << endreq; + msg(MSG::DEBUG) << "New MC Event Container Was Successfully Recorded" << endmsg; } @@ -224,10 +224,10 @@ StatusCode PDFReweightTool::execute() { if( sc.isFailure() || !mceventTES ) { msg(MSG::WARNING) << "No MC event container found in TDS" - << endreq; + << endmsg; return StatusCode::SUCCESS; } - msg(MSG::DEBUG) << "MC Event Container Was Successfully Retrieved" << endreq; + msg(MSG::DEBUG) << "MC Event Container Was Successfully Retrieved" << endmsg; //loop over the events in a container McEventCollection::const_iterator iter = mceventTES->begin(); @@ -239,7 +239,7 @@ StatusCode PDFReweightTool::execute() { if( sc.isFailure() ) { msg(MSG::WARNING) << "Event PDF re-weighting failed" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -252,7 +252,7 @@ StatusCode PDFReweightTool::execute() { msg(MSG::WARNING) << "Input MC Event Container is not specified. " << "Reweighting won't be performed" - << endreq; + << endmsg; } } else { //runs during event generation @@ -264,7 +264,7 @@ StatusCode PDFReweightTool::execute() { if( sc.isFailure() ) { msg(MSG::WARNING) << "Event PDF re-weighting failed" - << endreq; + << endmsg; return StatusCode::SUCCESS; } } @@ -272,7 +272,7 @@ StatusCode PDFReweightTool::execute() { msg(MSG::WARNING) << "Can't retrieve the current GenEvent. " << "Reweighting can't be performed" - << endreq; + << endmsg; } } @@ -284,13 +284,13 @@ StatusCode PDFReweightTool::execute() { //StatusCode PDFReweightTool::Reweight(const HepMC::GenEvent* evt_orig) { StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { - msg(MSG::DEBUG) << " Reweight PDF " << endreq; + msg(MSG::DEBUG) << " Reweight PDF " << endmsg; //safety check if (!evt) { msg(MSG::WARNING) << " Invalid pointer to a GenEvent. Nothing will be done" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -298,12 +298,12 @@ StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { //safety check if (pdf_info) { - msg(MSG::DEBUG) << " PdfInfo has been retrieved"<< endreq; + msg(MSG::DEBUG) << " PdfInfo has been retrieved"<< endmsg; } else { msg(MSG::WARNING) << " PdfInfo could not be retrieved. Nothing will be done" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -367,7 +367,7 @@ StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { <<" x2="<<m_x2 <<" fl2="<<m_fl2 <<" pdf2="<<m_used_pdf2 - << endreq; + << endmsg; //clear/reset the weight vector @@ -418,7 +418,7 @@ StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { <<" pdf id="<<i <<" x1="<<m_x1<<" fl1="<<m_fl1<<" pdf1="<<f1[fl1+6] <<" x2="<<m_x2<<" fl2="<<m_fl2<<" pdf2="<<f2[fl2+6] - <<endreq; + <<endmsg; //if this is the first PDF from the PDF set (the central value PDF) @@ -450,7 +450,7 @@ StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { msg(MSG::DEBUG) <<" weight = " << weight - << endreq; + << endmsg; //store the weight m_weights_vec.push_back(weight); @@ -467,7 +467,7 @@ StatusCode PDFReweightTool::Reweight(HepMC::GenEvent* evt) { msg(MSG::WARNING) <<" Event weights are going to be re-writed." <<" This option works properly only for the HERWIG samples " - <<endreq; + <<endmsg; double genWeight = evt->weights()[0]; evt->weights().clear(); diff --git a/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx b/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx index 6180ac2aadd..39cba36804d 100644 --- a/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx +++ b/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx @@ -31,16 +31,16 @@ namespace TruthHelper { const DataHandle<McEventCollection> firstMEC; const DataHandle<McEventCollection> lastMEC; if ( (m_sgSvc->retrieve(firstMEC, lastMEC)).isFailure() ) { - log << MSG::ERROR << "Could not retrieve iterators for McEventCollections" << endreq; + log << MSG::ERROR << "Could not retrieve iterators for McEventCollections" << endmsg; } const McEventCollection* mcCollptr(firstMEC); int icount = 0; for ( ; firstMEC!= lastMEC; firstMEC++) icount++; - log << MSG::DEBUG << "Number of McEventCollections= "<< icount << endreq; + log << MSG::DEBUG << "Number of McEventCollections= "<< icount << endmsg; // If there is more than one then do the retrieve with the key if (icount > 1) { - log << MSG::DEBUG << "Key = " << key << endreq; + log << MSG::DEBUG << "Key = " << key << endmsg; return this->getDH(mcCollptr, key); } diff --git a/Generators/GeneratorFilters/src/DecayModeFilter.cxx b/Generators/GeneratorFilters/src/DecayModeFilter.cxx index 3f287e3e83e..3129c5f5aa3 100644 --- a/Generators/GeneratorFilters/src/DecayModeFilter.cxx +++ b/Generators/GeneratorFilters/src/DecayModeFilter.cxx @@ -105,7 +105,7 @@ StatusCode DecayModeFilter::filterFinalize() { << " Double-Bosonic=" << float(m_nDoubleBosonicMode)/nEvents*100 << "%," << " Double-Leptonic=" << float(m_nDoubleLeptonicMode)/nEvents*100 << "%," << " Mixed-Bosonic-Leptonic=" << float(m_nBosonicLeptonicMode)/nEvents*100 << "%"); - ATH_MSG_INFO("Longer decay modes = " << (1 - float(totalFound + m_nDoubleBosonicMode + m_nDoubleLeptonicMode + m_nBosonicLeptonicMode)/nEvents)*100 << "%" << endreq); + ATH_MSG_INFO("Longer decay modes = " << (1 - float(totalFound + m_nDoubleBosonicMode + m_nDoubleLeptonicMode + m_nBosonicLeptonicMode)/nEvents)*100 << "%" << endmsg); return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/DiBjetFilter.cxx b/Generators/GeneratorFilters/src/DiBjetFilter.cxx index 3fb040a1421..3d7ec700876 100644 --- a/Generators/GeneratorFilters/src/DiBjetFilter.cxx +++ b/Generators/GeneratorFilters/src/DiBjetFilter.cxx @@ -74,7 +74,7 @@ StatusCode DiBjetFilter::filterInitialize() { /* Set seed with respect to computer clock time */ m_ranNumGen->SetSeed(0); } - msg(MSG::INFO) << "Initialized" << endreq; + msg(MSG::INFO) << "Initialized" << endmsg; return StatusCode::SUCCESS; } @@ -85,8 +85,8 @@ StatusCode DiBjetFilter::filterFinalize() { if(m_AcceptSomeLightEvents){ delete m_ranNumGen; } - msg(MSG::INFO) << m_NPass << " Events out of " << m_Nevt << " passed the filter" << endreq; - msg(MSG::INFO) << m_SumOfWeigths_Pass << " out of " << m_SumOfWeigths_Evt << " SumOfWeights counter, passed/total" << endreq; + msg(MSG::INFO) << m_NPass << " Events out of " << m_Nevt << " passed the filter" << endmsg; + msg(MSG::INFO) << m_SumOfWeigths_Pass << " out of " << m_SumOfWeigths_Evt << " SumOfWeights counter, passed/total" << endmsg; return StatusCode::SUCCESS; } @@ -104,7 +104,7 @@ StatusCode DiBjetFilter::filterEvent() { msg(MSG::WARNING) << "No xAOD::JetContainer found in TDS " << m_TruthJetContainerName \ << sc.isFailure() << " "<< !truthjetTES - << endreq; + << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/GapJetFilter.cxx b/Generators/GeneratorFilters/src/GapJetFilter.cxx index c70313fad87..38ac11bf299 100644 --- a/Generators/GeneratorFilters/src/GapJetFilter.cxx +++ b/Generators/GeneratorFilters/src/GapJetFilter.cxx @@ -95,32 +95,32 @@ GapJetFilter::filterInitialize() if (sc.isFailure()) { msg(MSG::ERROR) << "Unable to retrieve pointer to StoreGateSvc" - << endreq; + << endmsg; return sc; } //Output settings to screen - msg(MSG::INFO) << "xAOD::JetContainer: " << m_jetContainer << endreq; + msg(MSG::INFO) << "xAOD::JetContainer: " << m_jetContainer << endmsg; //Jet Kinematic Cuts - msg( MSG::INFO) << "Jet 1 Min Pt: " << m_minPt1 <<" Gaudi::Units::GeV"<< endreq; - msg( MSG::INFO) << "Jet 1 Max Pt: " << m_maxPt1 <<" Gaudi::Units::GeV"<< endreq; - msg( MSG::INFO) << "Jet 2 Min Pt: " << m_minPt2 <<" Gaudi::Units::GeV"<< endreq; - msg( MSG::INFO) << "Jet 2 Max Pt: " << m_maxPt2 <<" Gaudi::Units::GeV"<< endreq; + msg( MSG::INFO) << "Jet 1 Min Pt: " << m_minPt1 <<" Gaudi::Units::GeV"<< endmsg; + msg( MSG::INFO) << "Jet 1 Max Pt: " << m_maxPt1 <<" Gaudi::Units::GeV"<< endmsg; + msg( MSG::INFO) << "Jet 2 Min Pt: " << m_minPt2 <<" Gaudi::Units::GeV"<< endmsg; + msg( MSG::INFO) << "Jet 2 Max Pt: " << m_maxPt2 <<" Gaudi::Units::GeV"<< endmsg; //Particle Cuts - msg(MSG::INFO) << "Particle Min Pt: " << m_PtCut <<" Gaudi::Units::MeV" <<endreq; - msg(MSG::INFO) << "Particle Eta: " << m_EtaCut << endreq; - - msg(MSG::INFO) << "Fit param. c0 = " << m_c0 << endreq; - msg(MSG::INFO) << "Fit param. c1 = " << m_c1 << endreq; - msg(MSG::INFO) << "Fit param. c2 = " << m_c2 << endreq; - msg(MSG::INFO) << "Fit param. c3 = " << m_c3 << endreq; - msg(MSG::INFO) << "Fit param. c4 = " << m_c4 << endreq; - msg(MSG::INFO) << "Fit param. c5 = " << m_c5 << endreq; - msg(MSG::INFO) << "Fit param. c6 = " << m_c6 << endreq; - msg(MSG::INFO) << "Fit param. c7 = " << m_c7 << endreq; - msg(MSG::INFO) << "Max. weighted gap = " << m_gapf << endreq; + msg(MSG::INFO) << "Particle Min Pt: " << m_PtCut <<" Gaudi::Units::MeV" <<endmsg; + msg(MSG::INFO) << "Particle Eta: " << m_EtaCut << endmsg; + + msg(MSG::INFO) << "Fit param. c0 = " << m_c0 << endmsg; + msg(MSG::INFO) << "Fit param. c1 = " << m_c1 << endmsg; + msg(MSG::INFO) << "Fit param. c2 = " << m_c2 << endmsg; + msg(MSG::INFO) << "Fit param. c3 = " << m_c3 << endmsg; + msg(MSG::INFO) << "Fit param. c4 = " << m_c4 << endmsg; + msg(MSG::INFO) << "Fit param. c5 = " << m_c5 << endmsg; + msg(MSG::INFO) << "Fit param. c6 = " << m_c6 << endmsg; + msg(MSG::INFO) << "Fit param. c7 = " << m_c7 << endmsg; + msg(MSG::INFO) << "Max. weighted gap = " << m_gapf << endmsg; xsgapf = m_c0*exp(m_c1+m_c2*m_gapf)+m_c3*exp(m_c4+m_c5*m_gapf)+m_c6*pow(m_gapf,m_c7); @@ -152,7 +152,7 @@ GapJetFilter::filterEvent() // Get TruthJets // - msg(MSG::DEBUG) << "get truthJet container" << endreq; + msg(MSG::DEBUG) << "get truthJet container" << endmsg; const xAOD::JetContainer* truthjetTES; sc=m_storeGate->retrieve(truthjetTES, m_jetContainer); if( sc.isFailure() || !truthjetTES ) { @@ -160,11 +160,11 @@ GapJetFilter::filterEvent() << "No xAOD::JetContainer found in TDS " << m_jetContainer << " " << sc.isFailure() << " " << !truthjetTES - << endreq; + << endmsg; return StatusCode::SUCCESS; } msg(MSG::INFO) << "xAOD::JetContainer Size = " - << truthjetTES->size() << endreq; + << truthjetTES->size() << endmsg; // Get a list of all the truth jets @@ -230,9 +230,9 @@ GapJetFilter::filterEvent() } } - msg(MSG::INFO) << "NJets OK? : " << flagNJets << endreq; - msg(MSG::INFO) << "1stJet OK? : " << flag1stJet << endreq; - msg(MSG::INFO) << "2ndJet OK? : " << flag2ndJet << endreq; + msg(MSG::INFO) << "NJets OK? : " << flagNJets << endmsg; + msg(MSG::INFO) << "1stJet OK? : " << flag1stJet << endmsg; + msg(MSG::INFO) << "2ndJet OK? : " << flag2ndJet << endmsg; if (flagNJets != 0 && flag1stJet != 0 && flag2ndJet != 0) { @@ -302,7 +302,7 @@ GapJetFilter::filterEvent() //++m_nFail; setFilterPassed(false); - msg(MSG::INFO) << "drop event" << endreq; + msg(MSG::INFO) << "drop event" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/HTFilter.cxx b/Generators/GeneratorFilters/src/HTFilter.cxx index dcd5315ccea..d25774385a3 100644 --- a/Generators/GeneratorFilters/src/HTFilter.cxx +++ b/Generators/GeneratorFilters/src/HTFilter.cxx @@ -76,7 +76,7 @@ StatusCode HTFilter::filterInitialize() { StatusCode HTFilter::filterFinalize() { (*m_log) << MSG::INFO << "Total efficiency: " << 100.*double(m_passed)/double(m_total) << "% (" - << 100.*double(m_ptfailed)/double(m_total) << "% failed p_T cuts)" << endreq; + << 100.*double(m_ptfailed)/double(m_total) << "% failed p_T cuts)" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/JetFilterWithTruthPhoton.cxx b/Generators/GeneratorFilters/src/JetFilterWithTruthPhoton.cxx index 97a86bda07c..33529a198f0 100644 --- a/Generators/GeneratorFilters/src/JetFilterWithTruthPhoton.cxx +++ b/Generators/GeneratorFilters/src/JetFilterWithTruthPhoton.cxx @@ -63,7 +63,7 @@ JetFilterWithTruthPhoton::JetFilterWithTruthPhoton(const std::string& name, //--------------------------------------------------------------------------- StatusCode JetFilterWithTruthPhoton::filterInitialize() { //--------------------------------------------------------------------------- - msg( MSG:: INFO) << " JetFilterWithTruthPhoton INITIALISING. \n" << endreq; + msg( MSG:: INFO) << " JetFilterWithTruthPhoton INITIALISING. \n" << endmsg; // set up some defaults m_emaxeta=6.0; m_twopi=4*asin(1.); @@ -88,28 +88,28 @@ StatusCode JetFilterWithTruthPhoton::filterInitialize() { } msg( MSG:: INFO) << " JetFilterWithTruthPhoton filtering . \n" - << " Parameters are \n " << endreq; + << " Parameters are \n " << endmsg; if(m_Type){ msg( MSG:: INFO) << " Cone algorithm. \n" << " Pt cut = " << m_UserThresh << ", Number= " << m_UserNumber << - ", Cone size=" << m_Cone << ", Rapidity range " << m_UserEta << "\n " << endreq; + ", Cone size=" << m_Cone << ", Rapidity range " << m_UserEta << "\n " << endmsg; if (m_UserNumber >= 2) { - msg( MSG:: INFO) << " Leading Pt cut = " << m_UserLeadingThresh << "\n" << endreq; + msg( MSG:: INFO) << " Leading Pt cut = " << m_UserLeadingThresh << "\n" << endmsg; } } else { msg( MSG:: INFO) << " GridAlgorithm. \n" << " Pt cut = " << m_UserThresh << ", Number= " << m_UserNumber << ", eta size (units of 0.06) =" << m_Gride <<", phi size (units of 0.06) =" - << m_Gridp << ", Rapidity range " << m_UserEta << " \n "<< endreq; + << m_Gridp << ", Rapidity range " << m_UserEta << " \n "<< endmsg; if (m_UserNumber >= 2) { - msg( MSG:: INFO) << " Leading Pt cut = " << m_UserLeadingThresh << "\n" << endreq; + msg( MSG:: INFO) << " Leading Pt cut = " << m_UserLeadingThresh << "\n" << endmsg; } } - msg( MSG::INFO) << "Truth photon condition pt = " << m_photonEta << " eta = " << m_photonEta << " dR(photon,jet) = " << m_dRphotonjet << endreq; - msg( MSG::INFO) << "Truth photon sum pt = " << m_photonSumPt << " (if negative, photon info is not used in the filter)" << endreq; - msg(MSG::INFO) << "Dijet mass = " << m_massDijet << " (if negative, mjj info is not used in the filter)" << endreq; + msg( MSG::INFO) << "Truth photon condition pt = " << m_photonEta << " eta = " << m_photonEta << " dR(photon,jet) = " << m_dRphotonjet << endmsg; + msg( MSG::INFO) << "Truth photon sum pt = " << m_photonSumPt << " (if negative, photon info is not used in the filter)" << endmsg; + msg(MSG::INFO) << "Dijet mass = " << m_massDijet << " (if negative, mjj info is not used in the filter)" << endmsg; return StatusCode::SUCCESS; } @@ -121,7 +121,7 @@ StatusCode JetFilterWithTruthPhoton::filterFinalize() { //--------------------------------------------------------------------------- StatusCode JetFilterWithTruthPhoton::filterEvent() { //--------------------------------------------------------------------------- - msg( MSG:: INFO) << " JetFilterWithTruthPhoton filtering . \n" << endreq; + msg( MSG:: INFO) << " JetFilterWithTruthPhoton filtering . \n" << endmsg; // Loop over all events in McEventCollection: find particles and fill grid double m_etgrid[m_grphi][m_greta]; // clean it out before we start bool m_etgridused[m_grphi][m_greta]; //will use this to mark off cells after they are added to jets @@ -155,7 +155,7 @@ StatusCode JetFilterWithTruthPhoton::filterEvent() { // std::cout << ip << " "<< ie <<std::endl; // std::cout << " true rap " << (*pitr)->momentum().pseudoRapidity() << "false rap " << (ie+0.5)*m_edeta-m_emaxeta << " True phi " << (*pitr)->momentum().phi() << " false phi " << -m_twopi/2.+(ip+0.5)*m_edphi << std::endl; if( (ie<0) || (ie>= m_greta)){ // its outside the ends so we should not be here - msg( MSG::FATAL) << " Jet too close to end" << endreq; + msg( MSG::FATAL) << " Jet too close to end" << endmsg; return StatusCode::FAILURE; } while(ip<0) @@ -172,7 +172,7 @@ StatusCode JetFilterWithTruthPhoton::filterEvent() { } #if 0 if ((*pitr)->pdg_id() == 22) { - msg(MSG::DEBUG) << "Truth photon pt = " << (*pitr)->momentum().perp() << " eta = " << (*pitr)->momentum().pseudoRapidity() << endreq; + msg(MSG::DEBUG) << "Truth photon pt = " << (*pitr)->momentum().perp() << " eta = " << (*pitr)->momentum().pseudoRapidity() << endmsg; } #endif } @@ -277,7 +277,7 @@ StatusCode JetFilterWithTruthPhoton::filterEvent() { for (int ie0=0; ie0< m_netacell2; ++ie0){ int ie1=ie0-m_netacell+etahigh; if( (ie1<0) || (ie1>= m_greta)){ // its outside the ends so we should not be here - msg(MSG:: FATAL) << " Jet too close to end" << endreq; + msg(MSG:: FATAL) << " Jet too close to end" << endmsg; return StatusCode::FAILURE; } for (int ip0=0; ip0<m_nphicell2; ++ip0){ @@ -336,11 +336,11 @@ StatusCode JetFilterWithTruthPhoton::filterEvent() { } sort(m_Jets.begin(),m_Jets.end(),std::greater<JetFilter::McObj>()); msg(MSG::DEBUG)<< " Summary. " - << " Number of jets found = " << m_Jets.size() << " \n "<< endreq; + << " Number of jets found = " << m_Jets.size() << " \n "<< endmsg; if (m_Jets.size()>0) { - msg(MSG::DEBUG)<< " Highest pt (in GeV) " << (m_Jets[0].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[0].P().pseudoRapidity()<< " Phi "<< m_Jets[0].P().phi() << "\n "<< endreq; - if (m_Jets.size()>1) msg(MSG::DEBUG)<< " Second Highest pt (in GeV) " << (m_Jets[1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[1].P().pseudoRapidity()<< " Phi "<< m_Jets[1].P().phi() << "\n "<< endreq; - msg(MSG::DEBUG) << " Lowest pt (in GeV) " << (m_Jets[m_Jets.size()-1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[m_Jets.size()-1].P().pseudoRapidity() << " Phi " << m_Jets[m_Jets.size()-1].P().phi() << "\n "<< endreq; + msg(MSG::DEBUG)<< " Highest pt (in GeV) " << (m_Jets[0].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[0].P().pseudoRapidity()<< " Phi "<< m_Jets[0].P().phi() << "\n "<< endmsg; + if (m_Jets.size()>1) msg(MSG::DEBUG)<< " Second Highest pt (in GeV) " << (m_Jets[1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[1].P().pseudoRapidity()<< " Phi "<< m_Jets[1].P().phi() << "\n "<< endmsg; + msg(MSG::DEBUG) << " Lowest pt (in GeV) " << (m_Jets[m_Jets.size()-1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[m_Jets.size()-1].P().pseudoRapidity() << " Phi " << m_Jets[m_Jets.size()-1].P().phi() << "\n "<< endmsg; } int isOK = 1; if (m_UserNumber >= 2 && m_UserLeadingThresh > m_UserThresh && !hasLeadingJet) isOK = 0; @@ -366,11 +366,11 @@ StatusCode JetFilterWithTruthPhoton::filterEvent() { #if 0 if (0) { - msg(MSG::DEBUG) << " Summary isOK " << isOK << " Number of jets found = " << m_Jets.size() << " \n "<< endreq; + msg(MSG::DEBUG) << " Summary isOK " << isOK << " Number of jets found = " << m_Jets.size() << " \n "<< endmsg; if (m_Jets.size()>0) { - msg(MSG::DEBUG) << " Highest pt (in GeV) " << (m_Jets[0].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[0].P().pseudoRapidity()<< " Phi "<< m_Jets[0].P().phi() << endreq; - if (m_Jets.size()>1) msg(MSG::DEBUG) << " Second Highest pt (in GeV) " << (m_Jets[1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[1].P().pseudoRapidity()<< " Phi "<< m_Jets[1].P().phi() << endreq; - msg(MSG::DEBUG) << " Lowest pt (in GeV) " << (m_Jets[m_Jets.size()-1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[m_Jets.size()-1].P().pseudoRapidity() << " Phi " << m_Jets[m_Jets.size()-1].P().phi() << endreq; + msg(MSG::DEBUG) << " Highest pt (in GeV) " << (m_Jets[0].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[0].P().pseudoRapidity()<< " Phi "<< m_Jets[0].P().phi() << endmsg; + if (m_Jets.size()>1) msg(MSG::DEBUG) << " Second Highest pt (in GeV) " << (m_Jets[1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[1].P().pseudoRapidity()<< " Phi "<< m_Jets[1].P().phi() << endmsg; + msg(MSG::DEBUG) << " Lowest pt (in GeV) " << (m_Jets[m_Jets.size()-1].P().perp()/Gaudi::Units::GeV) << " Rapidity " <<m_Jets[m_Jets.size()-1].P().pseudoRapidity() << " Phi " << m_Jets[m_Jets.size()-1].P().phi() << endmsg; } } #endif diff --git a/Generators/GeneratorFilters/src/LeadingDiBjetFilter.cxx b/Generators/GeneratorFilters/src/LeadingDiBjetFilter.cxx index 6062e247b8f..0aa78ee6309 100644 --- a/Generators/GeneratorFilters/src/LeadingDiBjetFilter.cxx +++ b/Generators/GeneratorFilters/src/LeadingDiBjetFilter.cxx @@ -77,7 +77,7 @@ StatusCode LeadingDiBjetFilter::filterInitialize() { /* Set seed with respect to computer clock time */ m_ranNumGen->SetSeed(0); } - log << MSG::INFO << "Initialized" << endreq; + log << MSG::INFO << "Initialized" << endmsg; return StatusCode::SUCCESS; } @@ -89,8 +89,8 @@ StatusCode LeadingDiBjetFilter::filterFinalize() { if(m_AcceptSomeLightEvents){ delete m_ranNumGen; } - log << MSG::INFO << m_NPass << " Events out of " << m_Nevt << " passed the filter" << endreq; - log << MSG::INFO << m_SumOfWeigths_Pass << " out of " << m_SumOfWeigths_Evt << " SumOfWeights counter, passed/total" << endreq; + log << MSG::INFO << m_NPass << " Events out of " << m_Nevt << " passed the filter" << endmsg; + log << MSG::INFO << m_SumOfWeigths_Pass << " out of " << m_SumOfWeigths_Evt << " SumOfWeights counter, passed/total" << endmsg; return StatusCode::SUCCESS; } @@ -102,26 +102,26 @@ StatusCode LeadingDiBjetFilter::filterEvent() { bool pass = false; m_Nevt++; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 001" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 001" << endmsg; const xAOD::JetContainer* truthjetTES = 0; // StatusCode sc=m_sgSvc->retrieve( truthjetTES, m_TruthJetContainerName); StatusCode sc=evtStore()->retrieve( truthjetTES, m_TruthJetContainerName); - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 002" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 002" << endmsg; if( sc.isFailure() || !truthjetTES ) { log << MSG::WARNING << "No xAOD::JetContainer found in TDS " << m_TruthJetContainerName \ << sc.isFailure() << " "<< !truthjetTES - << endreq; + << endmsg; return StatusCode::SUCCESS; } - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 003" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 003" << endmsg; bool passLeadJetCut = false; xAOD::JetContainer::const_iterator jitr; double lead_jet_pt = 0.0; double lead_2nd_jet_pt = 0.0; std::vector<xAOD::JetContainer::const_iterator> jets; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 004" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 004" << endmsg; for (jitr = (*truthjetTES).begin(); jitr !=(*truthjetTES).end(); ++jitr) { if( (*jitr)->pt() < m_jetPtMin ) continue; if( fabs( (*jitr)->eta() ) > m_jetEtaMax ) continue; @@ -153,34 +153,34 @@ StatusCode LeadingDiBjetFilter::filterEvent() { } } - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 005" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 005" << endmsg; if(jets.size() > 0) lead_jet_pt = (*jets[0])->pt(); if(jets.size() > 1) lead_2nd_jet_pt=(*jets[1])->pt(); if( lead_jet_pt > m_leadJet_ptMin && lead_jet_pt < m_leadJet_ptMax ) passLeadJetCut = true; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 006" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 006" << endmsg; int bJetCounter = 0; double weight = 1; int n_events_in_collection=0; int n_bHadrons_total=0; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 007" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 007" << endmsg; McEventCollection::const_iterator itr; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 008" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 008" << endmsg; for (itr = events()->begin(); itr!=events()->end(); ++itr) { - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 009" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 009" << endmsg; n_events_in_collection++; const HepMC::GenEvent* genEvt = (*itr); weight = genEvt->weights().front(); HepMC::GenEvent::particle_const_iterator pitr; std::vector< HepMC::GenEvent::particle_const_iterator > bHadrons; - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 010" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 010" << endmsg; for(pitr=genEvt->particles_begin(); pitr!=genEvt->particles_end(); ++pitr ) { if( !isBwithWeakDK( (*pitr)->pdg_id()) ) continue; if( (*pitr)->momentum().perp() < m_bottomPtMin ) continue; if( fabs( (*pitr)->momentum().pseudoRapidity() ) > m_bottomEtaMax) continue; bHadrons.push_back(pitr); } - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 011" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 011" << endmsg; n_bHadrons_total += bHadrons.size(); for(uint i = 0; i < jets.size(); i++){ for(uint j = 0; j < bHadrons.size(); j++){ @@ -195,7 +195,7 @@ StatusCode LeadingDiBjetFilter::filterEvent() { } } - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 012" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 012" << endmsg; m_SumOfWeigths_Evt += weight; pass = (bJetCounter > 1) && passLeadJetCut; @@ -210,7 +210,7 @@ StatusCode LeadingDiBjetFilter::filterEvent() { pass = true; } - // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 013" << endreq; + // if(m_Nevt > 420) log << MSG::INFO << " m_Nevt= " << m_Nevt << " filterEvent point 013" << endmsg; if(pass){ m_NPass++; m_SumOfWeigths_Pass += weight; @@ -218,7 +218,7 @@ StatusCode LeadingDiBjetFilter::filterEvent() { if(m_Nevt < 20 || m_Nevt%100 == 0 || pass) { log << MSG::INFO << " m_Nevt= " << m_Nevt << " n_events_in_collection= " << n_events_in_collection << " 1st,2nd lead_jet_pt= " << lead_jet_pt << " " << lead_2nd_jet_pt << " passLeadJetCut= " << passLeadJetCut - << " n_bHadrons_total= " << n_bHadrons_total << " bJetCounter= " << bJetCounter << " pass= " << pass << " m_NPass= " << m_NPass << endreq; + << " n_bHadrons_total= " << n_bHadrons_total << " bJetCounter= " << bJetCounter << " pass= " << pass << " m_NPass= " << m_NPass << endmsg; } setFilterPassed(pass); return StatusCode::SUCCESS; diff --git a/Generators/GeneratorFilters/src/LeptonPairFilter.cxx b/Generators/GeneratorFilters/src/LeptonPairFilter.cxx index 3d514e8041c..6d4a4e80543 100644 --- a/Generators/GeneratorFilters/src/LeptonPairFilter.cxx +++ b/Generators/GeneratorFilters/src/LeptonPairFilter.cxx @@ -174,7 +174,7 @@ StatusCode LeptonPairFilter::filterEvent() { //Filter automatically passes if number of leptons is different than expected if (!( (nLeptons >= m_nLeptons_Min) && (m_nLeptons_Max < 0 || nLeptons <= m_nLeptons_Max) )) { - log << MSG::INFO <<"# Lep = "<<nLeptons << " Pass" << endreq; + log << MSG::INFO <<"# Lep = "<<nLeptons << " Pass" << endmsg; return StatusCode::SUCCESS; } @@ -199,7 +199,7 @@ StatusCode LeptonPairFilter::filterEvent() { else if(abs(id1)==abs(id2) && id1*id2 > 0) nSFSS+=1; else if(abs(id1)!=abs(id2) && id1*id2 < 0) nOFOS+=1; else if(abs(id1)!=abs(id2) && id1*id2 > 0) nOFSS+=1; - else log << MSG::ERROR << "Couldn't classify lepton pair" << endreq; + else log << MSG::ERROR << "Couldn't classify lepton pair" << endmsg; } } @@ -222,7 +222,7 @@ StatusCode LeptonPairFilter::filterEvent() { //Test if number of lepton pairs satisfies requirements //The maximum requirement is ignored if it is negative //No requirement is made if both min and max values are negative - log << MSG::INFO <<"# Lep " << vLeptonPDGIDs.size() << ", "<< nSFOS << " SFOS, "<<nSFSS<< " SFSS, " << nOFOS << " OFOS, " << nOFSS << " OFSS pairs ," << nPairSum << "summed pairs" << endreq; + log << MSG::INFO <<"# Lep " << vLeptonPDGIDs.size() << ", "<< nSFOS << " SFOS, "<<nSFSS<< " SFSS, " << nOFOS << " OFOS, " << nOFSS << " OFSS pairs ," << nPairSum << "summed pairs" << endmsg; if(nSFOS >= m_nSFOS_Min && (m_nSFOS_Max<0 || nSFOS <= m_nSFOS_Max)) passSFOS=true; if(nSFSS >= m_nSFSS_Min && (m_nSFSS_Max<0 || nSFSS <= m_nSFSS_Max)) passSFSS=true; @@ -231,20 +231,20 @@ StatusCode LeptonPairFilter::filterEvent() { if(nPairSum >= m_nPairSum_Min && (m_nPairSum_Max<0 || nPairSum <= m_nPairSum_Max)) passPairSum=true; if(passSFOS && passSFSS && passOFOS && passOFSS && passPairSum){ - log << MSG::INFO <<"Pass" << endreq; + log << MSG::INFO <<"Pass" << endmsg; for (unsigned int i = 0;i<vLeptonPDGIDs.size();i++){ int pdg = vLeptonPDGIDs[i]; double pt = vLeptonPt[i]; double eta = vLeptonEta[i]; log << MSG::DEBUG << pdg << ": Pt = "<<pt<<", Eta = "<<eta << ", Parent PDG: "; for (unsigned int j=0;j<vLeptonParentPDGIDs[i].size();j++) log << MSG::DEBUG << vLeptonParentPDGIDs[i][j]; - log << MSG::DEBUG << endreq; + log << MSG::DEBUG << endmsg; } return StatusCode::SUCCESS; } // if we get here we have failed setFilterPassed(false); - log << MSG::INFO <<"Fail" << endreq; + log << MSG::INFO <<"Fail" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/MultiParticleFilter.cxx b/Generators/GeneratorFilters/src/MultiParticleFilter.cxx index 1c1237296db..22a2a6e6122 100644 --- a/Generators/GeneratorFilters/src/MultiParticleFilter.cxx +++ b/Generators/GeneratorFilters/src/MultiParticleFilter.cxx @@ -54,22 +54,22 @@ MultiParticleFilter::MultiParticleFilter(const std::string& name, ISvcLocator* p StatusCode MultiParticleFilter::filterInitialize() { //--------------------------------------------------------------------------- - msg(MSG:: INFO) << "MultiParticleFilter INITIALISING " << endreq; + msg(MSG:: INFO) << "MultiParticleFilter INITIALISING " << endmsg; if(m_particlePDG.size()==0) - msg(MSG:: ERROR) << "particlePDG[] not set " << endreq; + msg(MSG:: ERROR) << "particlePDG[] not set " << endmsg; if(m_particleStatus.size()==0) - msg( MSG:: ERROR) << "particleStatus[] not set " << endreq; + msg( MSG:: ERROR) << "particleStatus[] not set " << endmsg; for(unsigned int i=0; i<m_particlePDG.size(); i++) - msg(MSG:: INFO) << "particlePDG["<<i<<"] = " << m_particlePDG[i] << endreq; + msg(MSG:: INFO) << "particlePDG["<<i<<"] = " << m_particlePDG[i] << endmsg; for(unsigned int i=0; i<m_particleStatus.size(); i++) - msg( MSG:: INFO) << "particleStatus["<<i<<"] = " << m_particleStatus[i] << endreq; + msg( MSG:: INFO) << "particleStatus["<<i<<"] = " << m_particleStatus[i] << endmsg; - msg(MSG:: INFO) << "ptMinParticle = " << m_ptMinParticle << endreq; - msg(MSG:: INFO) << "ptMaxParticle = " << m_ptMaxParticle << endreq; - msg(MSG:: INFO) << "etaRangeParticle = " << m_etaRangeParticle << endreq; - msg(MSG:: INFO) << "Np = " << m_Np << endreq; + msg(MSG:: INFO) << "ptMinParticle = " << m_ptMinParticle << endmsg; + msg(MSG:: INFO) << "ptMaxParticle = " << m_ptMaxParticle << endmsg; + msg(MSG:: INFO) << "etaRangeParticle = " << m_etaRangeParticle << endmsg; + msg(MSG:: INFO) << "Np = " << m_Np << endmsg; return StatusCode::SUCCESS; @@ -78,7 +78,7 @@ StatusCode MultiParticleFilter::filterInitialize() { //--------------------------------------------------------------------------- StatusCode MultiParticleFilter::filterFinalize() { //--------------------------------------------------------------------------- - msg(MSG:: INFO) << "Total efficiency: " << 100.*double(m_passed)/double(m_total) << "%" << endreq; + msg(MSG:: INFO) << "Total efficiency: " << 100.*double(m_passed)/double(m_total) << "%" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/ParentChildwStatusFilter.cxx b/Generators/GeneratorFilters/src/ParentChildwStatusFilter.cxx index 7bd16abbc0f..cad3c6cc921 100644 --- a/Generators/GeneratorFilters/src/ParentChildwStatusFilter.cxx +++ b/Generators/GeneratorFilters/src/ParentChildwStatusFilter.cxx @@ -63,28 +63,28 @@ ParentChildwStatusFilter::ParentChildwStatusFilter(const std::string& name, StatusCode ParentChildwStatusFilter::filterInitialize() { //--------------------------------------------------------------------------- - msg(MSG:: INFO) << "ParentChildwStatusFilter INITIALISING " << endreq; + msg(MSG:: INFO) << "ParentChildwStatusFilter INITIALISING " << endmsg; if(m_PDGParent.size()==0) - msg(MSG:: ERROR) << "PDGParent[] not set " << endreq; + msg(MSG:: ERROR) << "PDGParent[] not set " << endmsg; if(m_StatusParent.size()==0) - msg( MSG:: ERROR) << "StatusParent[] not set " << endreq; + msg( MSG:: ERROR) << "StatusParent[] not set " << endmsg; if(m_PDGChild.size()==0) - msg(MSG:: ERROR) << "PDGChild[] not set " << endreq; + msg(MSG:: ERROR) << "PDGChild[] not set " << endmsg; for(int i=0;i<int(m_PDGParent.size());i++) - msg(MSG:: INFO) << "PDGParent["<<i<<"] = " << m_PDGParent[i] << endreq; + msg(MSG:: INFO) << "PDGParent["<<i<<"] = " << m_PDGParent[i] << endmsg; for(int i=0;i<int(m_StatusParent.size());i++) - msg( MSG:: INFO) << "StatusParent["<<i<<"] = " << m_StatusParent[i] << endreq; - msg( MSG:: INFO) << "PtMinParent = " << m_PtMinParent << endreq; - msg(MSG:: INFO) << "PtMaxParent = " << m_PtMaxParent << endreq; - msg(MSG:: INFO) << "MassMinParent = " << m_MassMinParent << endreq; - msg( MSG:: INFO) << "MassMaxParent = " << m_MassMaxParent << endreq; - msg( MSG:: INFO) << "EtaRangeParent = " << m_EtaRangeParent << endreq; + msg( MSG:: INFO) << "StatusParent["<<i<<"] = " << m_StatusParent[i] << endmsg; + msg( MSG:: INFO) << "PtMinParent = " << m_PtMinParent << endmsg; + msg(MSG:: INFO) << "PtMaxParent = " << m_PtMaxParent << endmsg; + msg(MSG:: INFO) << "MassMinParent = " << m_MassMinParent << endmsg; + msg( MSG:: INFO) << "MassMaxParent = " << m_MassMaxParent << endmsg; + msg( MSG:: INFO) << "EtaRangeParent = " << m_EtaRangeParent << endmsg; for(int i=0;i<int(m_PDGChild.size());i++) - msg( MSG:: INFO) << "PDGChild["<<i<<"] = " << m_PDGChild[i] << endreq; - msg( MSG:: INFO) << "PtMinChild = " << m_PtMinChild << endreq; - msg( MSG:: INFO) << "EtaRangeChild = " << m_EtaRangeChild << endreq; + msg( MSG:: INFO) << "PDGChild["<<i<<"] = " << m_PDGChild[i] << endmsg; + msg( MSG:: INFO) << "PtMinChild = " << m_PtMinChild << endmsg; + msg( MSG:: INFO) << "EtaRangeChild = " << m_EtaRangeChild << endmsg; return StatusCode::SUCCESS; } @@ -101,7 +101,7 @@ StatusCode ParentChildwStatusFilter::filterEvent() { // Loop over all events in McEventCollection - msg(MSG:: INFO) << " ParentChildwStatusFilter filtering " << endreq; + msg(MSG:: INFO) << " ParentChildwStatusFilter filtering " << endmsg; McEventCollection::const_iterator itr; for (itr = events()->begin(); itr != events()->end(); ++itr) { // Loop over all particles in the event diff --git a/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx b/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx index 9e5c33c8e28..283f92b69b2 100644 --- a/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx +++ b/Generators/GeneratorFilters/src/TTbarPlusHeavyFlavorFilter.cxx @@ -36,13 +36,13 @@ TTbarPlusHeavyFlavorFilter::TTbarPlusHeavyFlavorFilter(const std::string& fname, //--------------------------------------------------------------------------- StatusCode TTbarPlusHeavyFlavorFilter::filterInitialize() { - m_log << MSG::INFO << "Initialized" << endreq; + m_log << MSG::INFO << "Initialized" << endmsg; return StatusCode::SUCCESS; } //--------------------------------------------------------------------------- StatusCode TTbarPlusHeavyFlavorFilter::filterFinalize() { - m_log << MSG::INFO << m_nPass << " Events out of " << m_nPass+m_nFail << " passed the filter" << endreq; + m_log << MSG::INFO << m_nPass << " Events out of " << m_nPass+m_nFail << " passed the filter" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorFilters/src/TrimuMassRangeFilter.cxx b/Generators/GeneratorFilters/src/TrimuMassRangeFilter.cxx index e7e780c7bbd..4830d13446d 100644 --- a/Generators/GeneratorFilters/src/TrimuMassRangeFilter.cxx +++ b/Generators/GeneratorFilters/src/TrimuMassRangeFilter.cxx @@ -64,19 +64,19 @@ StatusCode TrimuMassRangeFilter::filterInitialize() { MsgStream log(messageService(), name()); log << MSG::INFO - << "TrimuMassRangeFilter " << endreq - << " PtCut1 " << m_Ptmin1 << endreq - << " PtCut2 " << m_Ptmin2 << endreq - << " PtCut3 " << m_Ptmin3 << endreq - << " EtaCut1 " << m_EtaRange1 << endreq - << " EtaCut2 " << m_EtaRange2 << endreq - << " EtaCut3 " << m_EtaRange3 << endreq - << " InvMassMin " << m_InvMassMin << endreq - << " InvMassMax " << m_InvMassMax << endreq - << " PartId1 " << m_PartId1 << endreq - << " PartId2 " << m_PartId2 << endreq - << " PartId3 " << m_PartId3 << endreq - << " PartStatus " << m_PartStatus << endreq; + << "TrimuMassRangeFilter " << endmsg + << " PtCut1 " << m_Ptmin1 << endmsg + << " PtCut2 " << m_Ptmin2 << endmsg + << " PtCut3 " << m_Ptmin3 << endmsg + << " EtaCut1 " << m_EtaRange1 << endmsg + << " EtaCut2 " << m_EtaRange2 << endmsg + << " EtaCut3 " << m_EtaRange3 << endmsg + << " InvMassMin " << m_InvMassMin << endmsg + << " InvMassMax " << m_InvMassMax << endmsg + << " PartId1 " << m_PartId1 << endmsg + << " PartId2 " << m_PartId2 << endmsg + << " PartId3 " << m_PartId3 << endmsg + << " PartStatus " << m_PartStatus << endmsg; return StatusCode::SUCCESS; } @@ -93,7 +93,7 @@ StatusCode TrimuMassRangeFilter::filterEvent() { //--------------------------------------------------------------------------- MsgStream log(messageService(), name()); - log << MSG::INFO << " TEST MESSAGE " << endreq; + log << MSG::INFO << " TEST MESSAGE " << endmsg; // Loop over all events in McEventCollection @@ -117,7 +117,7 @@ StatusCode TrimuMassRangeFilter::filterEvent() { log << MSG::INFO << " type1 " << (*pitr1)->pdg_id() << " pT1 " << (*pitr1)->momentum().perp() << " eta1 " << (*pitr1)->momentum().pseudoRapidity() << " phi1 " << (*pitr1)->momentum().phi() - << " stat1 " << (*pitr1)->status() << endreq; + << " stat1 " << (*pitr1)->status() << endmsg; HepMC::GenEvent::particle_const_iterator pitr2 = genEvt->particles_begin(); if( samePDGID12 ){ @@ -138,7 +138,7 @@ StatusCode TrimuMassRangeFilter::filterEvent() { log << MSG::INFO << " type2 " << (*pitr2)->pdg_id() << " pT2 " << (*pitr2)->momentum().perp() << " eta2 " << (*pitr2)->momentum().pseudoRapidity() << " phi2 " << (*pitr2)->momentum().phi() - << " stat2 " << (*pitr2)->status() << endreq; + << " stat2 " << (*pitr2)->status() << endmsg; HepMC::GenEvent::particle_const_iterator pitr3 = genEvt->particles_begin(); if( samePDGID123 ){ @@ -158,7 +158,7 @@ StatusCode TrimuMassRangeFilter::filterEvent() { log << MSG::INFO << " type3 " << (*pitr3)->pdg_id() << " pT3 " << (*pitr3)->momentum().perp() << " eta3 " << (*pitr3)->momentum().pseudoRapidity() << " phi3 " << (*pitr3)->momentum().phi() - << " stat3 " << (*pitr3)->status() << endreq; + << " stat3 " << (*pitr3)->status() << endmsg; if( ( fabs(m_PartId1) != 99999 && fabs(m_PartId2) != 99999 && fabs(m_PartId3) != 99999 ) && ( (*pitr1)->pdg_id() + (*pitr2)->pdg_id() + (*pitr3)->pdg_id() != m_PartId1 + m_PartId2 + m_PartId3 ) ) continue; @@ -169,20 +169,20 @@ StatusCode TrimuMassRangeFilter::filterEvent() { double invMass = vec.m(); - log << MSG::INFO << " Mass " << invMass << endreq; + log << MSG::INFO << " Mass " << invMass << endmsg; if( m_InvMassMin<=invMass && invMass<m_InvMassMax ){ - log << MSG::INFO << "TrimuMassRangeFilter passed : MassMin <= Mass < MassMax " << m_InvMassMin << " <= " << invMass << " < " << m_InvMassMax << endreq;; + log << MSG::INFO << "TrimuMassRangeFilter passed : MassMin <= Mass < MassMax " << m_InvMassMin << " <= " << invMass << " < " << m_InvMassMax << endmsg;; return StatusCode::SUCCESS; } - log << MSG::INFO << "TrimuMassRangeFilter not passed : MassMin <= Mass < MassMax " << m_InvMassMin << " <= " << invMass << " < " << m_InvMassMax << endreq;; + log << MSG::INFO << "TrimuMassRangeFilter not passed : MassMin <= Mass < MassMax " << m_InvMassMin << " <= " << invMass << " < " << m_InvMassMax << endmsg;; }//pitr3 }//pitr2 }//pitr1 }//McEventCollection - log << MSG::INFO << "TrimuMassRangeFilter not passed at all" << endreq;; + log << MSG::INFO << "TrimuMassRangeFilter not passed at all" << endmsg;; //Haven't found anything... setFilterPassed(false); diff --git a/Generators/GeneratorFilters/src/VBFHbbEtaSortingFilter.cxx b/Generators/GeneratorFilters/src/VBFHbbEtaSortingFilter.cxx index d1318b25ac7..aad87c94658 100644 --- a/Generators/GeneratorFilters/src/VBFHbbEtaSortingFilter.cxx +++ b/Generators/GeneratorFilters/src/VBFHbbEtaSortingFilter.cxx @@ -40,17 +40,17 @@ VBFHbbEtaSortingFilter::VBFHbbEtaSortingFilter(const std::string& name, ISvcLoca //--------------------------------------------------------------------------- StatusCode VBFHbbEtaSortingFilter::filterInitialize() { - msg(MSG:: INFO) << "VBFHbbEtaSortingFilter INITIALISING " << endreq; - msg(MSG:: INFO) << "m_MinJetPt = " << m_MinJetPt << endreq; - msg(MSG:: INFO) << "m_MaxJetEta = " << m_MaxJetEta << endreq; + msg(MSG:: INFO) << "VBFHbbEtaSortingFilter INITIALISING " << endmsg; + msg(MSG:: INFO) << "m_MinJetPt = " << m_MinJetPt << endmsg; + msg(MSG:: INFO) << "m_MaxJetEta = " << m_MaxJetEta << endmsg; return StatusCode::SUCCESS; } //--------------------------------------------------------------------------- StatusCode VBFHbbEtaSortingFilter::filterFinalize() { msg(MSG:: INFO) << m_passed_all << " events passed out of " << m_total - << " events : efficiency: " << 100.*double(m_passed_all)/double(m_total) << "%" << endreq; - msg(MSG:: INFO) << " for multiplicity requirement " << m_passed_multiplicity << " events passed" << endreq; + << " events : efficiency: " << 100.*double(m_passed_all)/double(m_total) << "%" << endmsg; + msg(MSG:: INFO) << " for multiplicity requirement " << m_passed_multiplicity << " events passed" << endmsg; return StatusCode::SUCCESS; } diff --git a/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.cxx b/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.cxx index 72a4fea7fec..7f16edbf284 100755 --- a/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.cxx +++ b/Generators/GeneratorObjectsAthenaPool/src/McEventCollectionCnv.cxx @@ -45,7 +45,7 @@ McEventCollectionCnv::createPersistent( McEventCollection* transCont ) McEventCollectionCnv_p5 cnv; McEventCollection_PERS *persObj = cnv.createPersistent( transCont, msg ); - msg << MSG::DEBUG << "::createPersistent [Success]" << endreq; + msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg; return persObj; } @@ -66,7 +66,7 @@ McEventCollection* McEventCollectionCnv::createTransient() bool isPileup(false); if(serviceLocator()->existsService("PileUpEventLoopMgr")) { isPileup=true; - msg << MSG::DEBUG << "Pile run, disable datapool for McEventCollection " << endreq; + msg << MSG::DEBUG << "Pile run, disable datapool for McEventCollection " << endmsg; } if ( compareClassGuid(tr_guid) ) { diff --git a/Generators/Starlight_i/src/Starlight_i.cxx b/Generators/Starlight_i/src/Starlight_i.cxx index be943b7101c..7ea356c1f42 100644 --- a/Generators/Starlight_i/src/Starlight_i.cxx +++ b/Generators/Starlight_i/src/Starlight_i.cxx @@ -100,15 +100,15 @@ StatusCode Starlight_i::genInitialize() // MsgStream log(messageService(), name()); log << MSG::INFO - << "===> January 20 2011 STARLIGHT INTERFACE VERSION. \n" << endreq; + << "===> January 20 2011 STARLIGHT INTERFACE VERSION. \n" << endmsg; log << MSG::INFO - << "===> STARLIGHT INITIALISING. \n" << endreq; + << "===> STARLIGHT INITIALISING. \n" << endmsg; StatusCode sc = service("StoreGateSvc", m_storeGate); if (sc.isFailure()) { log << MSG::WARNING - << "Unable to get pointer to StoreGate Service" << endreq; + << "Unable to get pointer to StoreGate Service" << endmsg; return sc; } @@ -119,7 +119,7 @@ StatusCode Starlight_i::genInitialize() service("AtRndmGenSvc", p_AtRndmGenSvc, CREATEIFNOTTHERE); if (!RndmStatus.isSuccess() || 0 == p_AtRndmGenSvc) { log << MSG::ERROR - << " Could not initialize Random Number Service" << endreq; + << " Could not initialize Random Number Service" << endmsg; return RndmStatus; } @@ -149,7 +149,7 @@ StatusCode Starlight_i::callGenerator() { MsgStream log(messageService(), name()); log << MSG::DEBUG - << " STARLIGHT generating. \n" << endreq; + << " STARLIGHT generating. \n" << endmsg; // Generate event m_event = new upcEvent; @@ -164,10 +164,10 @@ StatusCode Starlight_i::callGenerator() log << MSG::DEBUG << "EVENT: " << m_events << " " << " with " << numberOfVertices << " vertices " - << " and " << numberofTracks << " tracks" << endreq; + << " and " << numberofTracks << " tracks" << endmsg; log << MSG::DEBUG << "VERTEX: "<< 0. << " " << 0. << " " << 0. - << " with " << numberofTracks << " tracks" << endreq; + << " with " << numberofTracks << " tracks" << endmsg; int ipart = 0; std::vector<starlightParticle>::const_iterator part = @@ -179,11 +179,11 @@ StatusCode Starlight_i::callGenerator() << starlightParticleCodes::jetsetToGeant((*part).getCharge() * (*part).getPdgCode()) << " " << (*part).GetPx() << " " << (*part).GetPy() << " "<< (*part).GetPz() << " " << m_events << " " << ipart << " " << 0 << " " - << (*part).getCharge() * (*part).getPdgCode() << endreq; + << (*part).getCharge() * (*part).getPdgCode() << endmsg; } log << MSG::DEBUG - << " Starlight generating done. \n" << endreq; + << " Starlight generating done. \n" << endmsg; return StatusCode::SUCCESS; } @@ -193,7 +193,7 @@ Starlight_i::genFinalize() { MsgStream log(messageService(), name()); log << MSG::DEBUG - << " STARLIGHT Ending. \n" << endreq; + << " STARLIGHT Ending. \n" << endmsg; return StatusCode::SUCCESS; } @@ -203,7 +203,7 @@ Starlight_i::fillEvt(HepMC::GenEvent* evt) { MsgStream log(messageService(), name()); log << MSG::DEBUG - << " STARLIGHT Filing. \n" << endreq; + << " STARLIGHT Filing. \n" << endmsg; // Set the event number evt->set_event_number( m_events ); @@ -240,13 +240,13 @@ Starlight_i::fillEvt(HepMC::GenEvent* evt) e = sqrt(px*px + py*py + pz*pz + mass*mass); } log << MSG::DEBUG - << "saving particle " << ipart << endreq; + << "saving particle " << ipart << endmsg; v1->add_particle_out( new HepMC::GenParticle(CLHEP::HepLorentzVector(px, py, pz, e), pid, 1) ); } log << MSG::DEBUG - << "Saved " << ipart << " tracks " << endreq; + << "Saved " << ipart << " tracks " << endmsg; // Convert cm->mm and GeV->MeV // @@ -274,7 +274,7 @@ bool Starlight_i::set_user_params() inputParametersInstance.configureFromFile(m_configFileName); if (!inputParametersInstance.init()) { log << MSG::WARNING - << "problems initializing input parameters. cannot initialize starlight. " << endreq; + << "problems initializing input parameters. cannot initialize starlight. " << endmsg; return false; } @@ -289,7 +289,7 @@ bool Starlight_i::prepare_params_file() for(CommandVector::iterator i = m_InitializeVector.begin(); i != m_InitializeVector.end(); i++ ) { log << MSG::INFO - << " Command is: " << *i << endreq; + << " Command is: " << *i << endmsg; StringParse mystring(*i); std::string myparam = mystring.piece(1); @@ -425,7 +425,7 @@ bool Starlight_i::prepare_params_file() { log << MSG::ERROR << " ERROR in STARLIGHT INITIALIZATION PARAMETERS " - << myparam << " is an invalid parameter !" << endreq; + << myparam << " is an invalid parameter !" << endmsg; return false; } } diff --git a/Generators/TruthIO/src/HepMCReadFromFile.cxx b/Generators/TruthIO/src/HepMCReadFromFile.cxx index 7ec528a6ba2..6cabf7a0251 100644 --- a/Generators/TruthIO/src/HepMCReadFromFile.cxx +++ b/Generators/TruthIO/src/HepMCReadFromFile.cxx @@ -27,7 +27,7 @@ StatusCode HepMCReadFromFile::initialize() { StatusCode sc = service("StoreGateSvc", m_sgSvc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not find StoreGateSvc" << endreq; + msg(MSG::ERROR) << "Could not find StoreGateSvc" << endmsg; return sc; } @@ -43,14 +43,14 @@ StatusCode HepMCReadFromFile::execute() { McEventCollection* mcEvtColl; if ( m_sgSvc->contains<McEventCollection>(m_mcEventKey) && m_sgSvc->retrieve(mcEvtColl, m_mcEventKey).isSuccess() ) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "found an McEventCollecion in store" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "found an McEventCollecion in store" << endmsg; } else { // McCollection doesn't exist. Create it (empty) - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "create new McEventCollecion in store" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "create new McEventCollecion in store" << endmsg; mcEvtColl = new McEventCollection; StatusCode status = m_sgSvc->record( mcEvtColl, m_mcEventKey ); if (status.isFailure()) { - msg(MSG::ERROR) << "Could not record McEventCollection" << endreq; + msg(MSG::ERROR) << "Could not record McEventCollection" << endmsg; return status; } } diff --git a/Generators/TruthIO/src/ReadHepEvtFromAscii.cxx b/Generators/TruthIO/src/ReadHepEvtFromAscii.cxx index d2230663242..54944999f1b 100644 --- a/Generators/TruthIO/src/ReadHepEvtFromAscii.cxx +++ b/Generators/TruthIO/src/ReadHepEvtFromAscii.cxx @@ -32,12 +32,12 @@ ReadHepEvtFromAscii::ReadHepEvtFromAscii(const std::string& name, ISvcLocator* p StatusCode ReadHepEvtFromAscii::initialize(){ - msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from Initialize" << endreq; + msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from Initialize" << endmsg; StatusCode sc = service("StoreGateSvc", m_sgSvc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not find StoreGateSvc" << endreq; + msg(MSG::ERROR) << "Could not find StoreGateSvc" << endmsg; return sc; } @@ -56,19 +56,19 @@ StatusCode ReadHepEvtFromAscii::initialize(){ } StatusCode ReadHepEvtFromAscii::execute() { - msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from execute" << endreq; + msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from execute" << endmsg; McEventCollection* mcEvtColl; if ( m_sgSvc->contains<McEventCollection>(m_key) && m_sgSvc->retrieve(mcEvtColl, m_key).isSuccess() ) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "found an McEventCollecion in store" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "found an McEventCollecion in store" << endmsg; } else { // McCollection doesn't exist. Create it (empty) - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "create new McEventCollecion in store" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "create new McEventCollecion in store" << endmsg; mcEvtColl = new McEventCollection; StatusCode status = m_sgSvc->record( mcEvtColl, m_key ); if (status.isFailure()) { - msg(MSG::ERROR) << "Could not record McEventCollection" << endreq; + msg(MSG::ERROR) << "Could not record McEventCollection" << endmsg; return status; } } @@ -99,7 +99,7 @@ StatusCode ReadHepEvtFromAscii::execute() { } StatusCode ReadHepEvtFromAscii::finalize() { - msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from finalize" << endreq; + msg(MSG::INFO) << ">>> ReadHepEvtFromAscii from finalize" << endmsg; int ifile=5; closefile_(ifile); diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h index f0c4a148475..437103c0a6d 100644 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/doc/packagedoc.h @@ -562,7 +562,7 @@ for any particular module can then be read in Athena by using the following: float z=distpars[2]; } } else { - log << MSG::ERROR << "Cannot find PixelDisp object" << endreq; + log << MSG::ERROR << "Cannot find PixelDisp object" << endmsg; } </pre> For a concrete example, see the methods CreateModuleNtuple in AlignNtuple.cxx diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AddTRTMomConstr.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AddTRTMomConstr.cxx index 4fef2cd6562..d8f6ef41fb0 100644 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AddTRTMomConstr.cxx +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AddTRTMomConstr.cxx @@ -85,19 +85,19 @@ StatusCode AddTRTMomConstr::initialize() { //retrieve the DetectorStore service StatusCode status=detStore().retrieve() ; if( status.isFailure() ) { - msg(MSG::ERROR) << "DetectorStore service not found !" << endreq; + msg(MSG::ERROR) << "DetectorStore service not found !" << endmsg; return status; }else{ ATH_MSG_DEBUG( "DetectorStore retrieved!" ); } if( detStore()->retrieve(m_trtid).isFailure() ) { - msg (MSG::FATAL) << "Problem retrieving TRTID helper" << endreq; + msg (MSG::FATAL) << "Problem retrieving TRTID helper" << endmsg; return StatusCode::FAILURE; } if (detStore()->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endreq; + msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endmsg; return StatusCode::FAILURE; } @@ -108,19 +108,19 @@ StatusCode AddTRTMomConstr::initialize() { // const IdDictManager* idDictMgr = 0; // status = detStore()->retrieve(idDictMgr, "IdDict"); // if( status.isFailure() ) { -// msg(MSG::ERROR) << "Could not get IdDictManager !" << endreq; +// msg(MSG::ERROR) << "Could not get IdDictManager !" << endmsg; // return status; // } // // Initialize the helper with the dictionary information. // if (idDictMgr) { // if (idDictMgr->initializeHelper(*m_idHelper)) { // Returns 1 if there is a problem -// msg(MSG::ERROR) << "Unable to initialize ID helper." << endreq; +// msg(MSG::ERROR) << "Unable to initialize ID helper." << endmsg; // return StatusCode::FAILURE; // } // } else { // msg(MSG::ERROR) << "IdDictManager pointer is zero. " -// << "Unable to initialize id helper. " << endreq; +// << "Unable to initialize id helper. " << endmsg; // return StatusCode::FAILURE; // } @@ -129,7 +129,7 @@ StatusCode AddTRTMomConstr::initialize() { // get TrackSummaryTool StatusCode sc= m_trackSummaryTool.retrieve(); if (sc.isFailure()) { - msg (MSG::FATAL) << "Cannot get TrackSummaryTool" << endreq; + msg (MSG::FATAL) << "Cannot get TrackSummaryTool" << endmsg; return StatusCode::FAILURE; } @@ -137,7 +137,7 @@ StatusCode AddTRTMomConstr::initialize() { status = m_trackFitter.retrieve(); if (status.isFailure()) { msg (MSG::FATAL) << "Could not find tool " << m_trackFitter - << ". Exiting." << endreq ; + << ". Exiting." << endmsg ; return status ; } else { ATH_MSG_DEBUG( " Got " << m_trackFitter << " as TrackFitter. " ) ; @@ -171,7 +171,7 @@ StatusCode AddTRTMomConstr::execute() { if( !m_trackListOutput.empty() && !m_trackListInput.empty() ) { const TrackCollection* inputtracks ; if( (sgSvc()->retrieve( inputtracks, m_trackListInput) ).isFailure() ) { - msg (MSG::FATAL) << "could not find input track list with name " << m_trackListInput << endreq ; + msg (MSG::FATAL) << "could not find input track list with name " << m_trackListInput << endmsg ; return StatusCode::FAILURE ; } TrackCollection* outputtracks = new TrackCollection( SG::VIEW_ELEMENTS ) ; @@ -196,7 +196,7 @@ StatusCode AddTRTMomConstr::execute() { } if( sgSvc()->record( outputtracks, m_trackListOutput ).isFailure() ) { - msg(MSG::ERROR) << "Failed to record trackcollection with name " << m_trackListOutput << endreq ; + msg(MSG::ERROR) << "Failed to record trackcollection with name " << m_trackListOutput << endmsg ; } m_nTracksProcessed += inputtracks->size() ; m_nTracksAccepted += outputtracks->size() ; @@ -225,7 +225,7 @@ bool AddTRTMomConstr::accept( const Trk::Track& track ) { if( m_selPtMin > 0 && pt < m_selPtMin ) rc = false ; } } else { - msg (MSG::WARNING) << "theta = 0, q/p conversion to p_T failed!" << endreq ; + msg (MSG::WARNING) << "theta = 0, q/p conversion to p_T failed!" << endmsg ; return false ; } @@ -409,7 +409,7 @@ Trk::Track* AddTRTMomConstr::addTRTMomentumConstraint(const Trk::Track* track) { for ( ; it!=itEnd; ++it){ if( !(*it) ) { // log (MSG::WARNING) << "The MeasurementBase set has a void" - // << " member! Skip it.." << endreq; + // << " member! Skip it.." << endmsg; } else { const Trk::RIO_OnTrack* rio = dynamic_cast <const Trk::RIO_OnTrack*>(*it); if (rio != 0) { @@ -452,7 +452,7 @@ Trk::Track* AddTRTMomConstr::addTRTMomentumConstraint(const Trk::Track* track) { // now add z_0 and theta from original track as PseudoMeas to the TRT MeasurementSet const Trk::PseudoMeasurementOnTrack *pmFromSi = createPMfromSi( perTrk ) ; if( !pmFromSi ) { - msg(MSG::ERROR) << "TRTMomConstr() : PseudoMeasurementOnTrack creation failed! " << endreq ; + msg(MSG::ERROR) << "TRTMomConstr() : PseudoMeasurementOnTrack creation failed! " << endmsg ; return NULL ; } ATH_MSG_DEBUG( "TRTMomConstr() : pmFromSi " << *pmFromSi) ; @@ -498,7 +498,7 @@ Trk::Track* AddTRTMomConstr::addTRTMomentumConstraint(const Trk::Track* track) { // define new PM with the momentum constraint from the TRT to pass to Si const Trk::PseudoMeasurementOnTrack *pmFromTRT = createPMfromTRT( perTrk, perTRT ) ; if( !pmFromTRT ) { - msg(MSG::ERROR) << "TRTMomConstr() : PseudoMeasurementOnTrack creation failed! " << endreq ; + msg(MSG::ERROR) << "TRTMomConstr() : PseudoMeasurementOnTrack creation failed! " << endmsg ; return NULL ; } ATH_MSG_DEBUG("TRTMomConstr() : pmFromTRT " << *pmFromTRT ) ; diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AlignWrt.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AlignWrt.cxx index 9fa4a0f708c..8e467839760 100755 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AlignWrt.cxx +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/AlignWrt.cxx @@ -126,31 +126,31 @@ StatusCode InDetAlignWrt::initialize() { if (par_wrtbeam) { if ( m_beamcondsvc.retrieve().isFailure()){ - msg( MSG::ERROR) <<"Cannot get BeamCondSvc - beamspots will not be put in ntuple" << endreq; + msg( MSG::ERROR) <<"Cannot get BeamCondSvc - beamspots will not be put in ntuple" << endmsg; } } if (msgLvl(MSG::DEBUG)) { - if (par_create) msg() << "ID Alignment database structures will be created" << endreq; + if (par_create) msg() << "ID Alignment database structures will be created" << endmsg; if (par_rfile!="") { - if (par_ntuple) msg() << "Alignment constants will be initialised from ntuple: " << par_rfile << endreq; - else msg() << "Alignment constants will be initialised from text file" << par_rfile << endreq; + if (par_ntuple) msg() << "Alignment constants will be initialised from ntuple: " << par_rfile << endmsg; + else msg() << "Alignment constants will be initialised from text file" << par_rfile << endmsg; } if (par_dispfile!="") - msg() << "Alignment constants will be set according to recipe in file " << par_dispfile << endreq; + msg() << "Alignment constants will be set according to recipe in file " << par_dispfile << endmsg; if (par_wrt) msg() << "ID Alignment database structures will be written on run " - << par_wrtrun << " event " << par_wrtevent << endreq; + << par_wrtrun << " event " << par_wrtevent << endmsg; if (par_wfile!="") - msg() << "Structures will be written on file " << par_wfile << endreq; + msg() << "Structures will be written on file " << par_wfile << endmsg; if (par_wrtbeam) msg() << "Beampos information will be written on run " << par_wrtrun - << " event " << par_wrtevent << endreq; + << " event " << par_wrtevent << endmsg; if (par_writetop) msg() << "Toplevel transforms will be read from file " << par_topname - << "and written on run " << par_wrtrun << " event " << par_wrtevent << endreq; + << "and written on run " << par_wrtrun << " event " << par_wrtevent << endmsg; if (!par_wrtiov) - msg() << "IOV writing will be suppressed - only output stream" << endreq; + msg() << "IOV writing will be suppressed - only output stream" << endmsg; } return StatusCode::SUCCESS; @@ -248,7 +248,7 @@ void InDetAlignWrt::doOutput() { if (par_wfile=="") { ATH_MSG_DEBUG( "doOutput for AlignableTransforms" ); if (StatusCode::SUCCESS!=p_iddbtool->outputObjs()) - msg(MSG::ERROR) << "Write of AlignableTransforms fails" << endreq; + msg(MSG::ERROR) << "Write of AlignableTransforms fails" << endmsg; if (par_wrtiov) p_iddbtool->fillDB(par_iovtag,par_run1,par_evt1,par_run2,par_evt2); } else { @@ -301,7 +301,7 @@ void InDetAlignWrt::doMigration() { p_migratetool->writeFile(false,"migrate.check"); // write data to POOL file and optionally IOV if (StatusCode::SUCCESS!=p_migratetool->outputObjs()) - msg(MSG::ERROR) << "Write of AlignableTransform fails" << endreq; + msg(MSG::ERROR) << "Write of AlignableTransform fails" << endmsg; if (par_wrtiov) p_migratetool->fillDB(par_iovtag,par_run1,par_evt1,par_run2,par_evt2); } diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx index b137992804e..1c635c2af4b 100644 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/CreateMisalignAlg.cxx @@ -114,51 +114,51 @@ namespace InDetAlignment // Destructor CreateMisalignAlg::~CreateMisalignAlg(void) { - if (msgLvl(MSG::DEBUG)) msg() << "CreateMisalignAlg destructor called" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "CreateMisalignAlg destructor called" << endmsg; } //__________________________________________________________________________ StatusCode CreateMisalignAlg::initialize() { - if (msgLvl(MSG::DEBUG)) msg() <<"CreateMisalignAlg initialize()" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"CreateMisalignAlg initialize()" << endmsg; if (m_IDAlignDBTool.retrieve().isFailure()) { msg(MSG::FATAL) << "Can not retrieve InDetAlignDBTool " - << m_IDAlignDBTool << endreq; + << m_IDAlignDBTool << endmsg; return StatusCode::FAILURE; - } else msg(MSG::INFO) << "Retrieved InDetAlignDBTool " << m_IDAlignDBTool << endreq; + } else msg(MSG::INFO) << "Retrieved InDetAlignDBTool " << m_IDAlignDBTool << endmsg; if (m_trtaligndbservice.retrieve().isFailure()) { msg(MSG::FATAL) << "Can not retrieve TRTAlignDbService " - << m_trtaligndbservice << endreq; + << m_trtaligndbservice << endmsg; return StatusCode::FAILURE; - } else msg(MSG::INFO) << "Retrieved TRTAlignDbService " << m_trtaligndbservice << endreq; + } else msg(MSG::INFO) << "Retrieved TRTAlignDbService " << m_trtaligndbservice << endmsg; //ID helper // Pixel if (detStore()->retrieve(m_pixelIdHelper, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } // SCT if (detStore()->retrieve(m_sctIdHelper, "SCT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get SCT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get SCT ID helper" << endmsg; return StatusCode::FAILURE; } // TRT if (detStore()->retrieve(m_trtIdHelper, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } if (detStore()->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endreq; + msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endmsg; return StatusCode::FAILURE; } @@ -167,17 +167,17 @@ namespace InDetAlignment //pixel and SCT TRT manager sc = detStore()->retrieve(m_pixelManager, "Pixel"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get PixelManager !" << endreq; + msg(MSG::ERROR) << "Could not get PixelManager !" << endmsg; return sc; } sc = detStore()->retrieve(m_SCT_Manager, "SCT"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get SCT_Manager !" << endreq; + msg(MSG::ERROR) << "Could not get SCT_Manager !" << endmsg; return sc; } sc = detStore()->retrieve(m_TRT_Manager, "TRT"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get TRT_Manager !" << endreq; + msg(MSG::ERROR) << "Could not get TRT_Manager !" << endmsg; return sc; } @@ -186,7 +186,7 @@ namespace InDetAlignment ITHistSvc* hist_svc; sc=service("THistSvc",hist_svc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not find HistService" << endreq; + msg(MSG::ERROR) << "Could not find HistService" << endmsg; return sc; } @@ -196,7 +196,7 @@ namespace InDetAlignment //sc = hist_svc->regTree("/TTree/VisualizationLookup/IdentifierTree", m_VisualizationLookupTree); sc = hist_svc->regTree("/IDENTIFIERTREE/IdentifierTree", m_VisualizationLookupTree); if (sc.isFailure()) { - msg(MSG::ERROR) << "Unable to register TTree : " << "/TTree/VisualizationLookup/IdentifierTree" << endreq; + msg(MSG::ERROR) << "Unable to register TTree : " << "/TTree/VisualizationLookup/IdentifierTree" << endmsg; return sc; } @@ -212,7 +212,7 @@ namespace InDetAlignment if ( !nt ) { // Check if already booked nt = ntupleSvc()->book("/NTUPLES/CREATEMISALIGN/InitialAlignment", CLID_ColumnWiseTuple, "InitialAlignment"); if ( nt ) { - msg(MSG::INFO) << "InitialAlignment ntuple booked." << endreq; + msg(MSG::INFO) << "InitialAlignment ntuple booked." << endmsg; ATH_CHECK( nt->addItem("x" ,m_AlignResults_x) ); ATH_CHECK( nt->addItem("y" ,m_AlignResults_y) ); @@ -232,28 +232,28 @@ namespace InDetAlignment ATH_CHECK( nt->addItem("center_z" ,m_AlignResults_center_z) ); if (sc.isFailure()) { - msg(MSG::ERROR) << "Problems creating InitialAlignment ntuple structure !" << endreq; + msg(MSG::ERROR) << "Problems creating InitialAlignment ntuple structure !" << endmsg; return sc; } } else { // did not manage to book the N tuple.... - msg(MSG::ERROR) << "Failed to book InitialAlignment ntuple." << endreq; + msg(MSG::ERROR) << "Failed to book InitialAlignment ntuple." << endmsg; } } if (m_MisalignmentMode) { - msg(MSG::INFO) << "Misalignment mode chosen: " << m_MisalignmentMode << endreq; + msg(MSG::INFO) << "Misalignment mode chosen: " << m_MisalignmentMode << endmsg; if (m_MisalignmentMode == 1) { - msg(MSG::INFO) << "MisalignmentX : " << m_Misalign_x / CLHEP::micrometer << " micrometer" << endreq; - msg(MSG::INFO) << "MisalignmentY : " << m_Misalign_y / CLHEP::micrometer << " micrometer" << endreq; - msg(MSG::INFO) << "MisalignmentZ : " << m_Misalign_z / CLHEP::micrometer << " micrometer" << endreq; - msg(MSG::INFO) << "MisalignmentAlpha : " << m_Misalign_alpha / CLHEP::mrad << " mrad" << endreq; - msg(MSG::INFO) << "MisalignmentBeta : " << m_Misalign_beta / CLHEP::mrad << " mrad" << endreq; - msg(MSG::INFO) << "MisalignmentGamma : " << m_Misalign_gamma / CLHEP::mrad << " mrad" << endreq; + msg(MSG::INFO) << "MisalignmentX : " << m_Misalign_x / CLHEP::micrometer << " micrometer" << endmsg; + msg(MSG::INFO) << "MisalignmentY : " << m_Misalign_y / CLHEP::micrometer << " micrometer" << endmsg; + msg(MSG::INFO) << "MisalignmentZ : " << m_Misalign_z / CLHEP::micrometer << " micrometer" << endmsg; + msg(MSG::INFO) << "MisalignmentAlpha : " << m_Misalign_alpha / CLHEP::mrad << " mrad" << endmsg; + msg(MSG::INFO) << "MisalignmentBeta : " << m_Misalign_beta / CLHEP::mrad << " mrad" << endmsg; + msg(MSG::INFO) << "MisalignmentGamma : " << m_Misalign_gamma / CLHEP::mrad << " mrad" << endmsg; } else { - msg(MSG::INFO) << "with maximum shift of " << m_Misalign_maxShift / CLHEP::micrometer << " micrometer" <<endreq; + msg(MSG::INFO) << "with maximum shift of " << m_Misalign_maxShift / CLHEP::micrometer << " micrometer" <<endmsg; } } else { - msg(MSG::INFO) << "Dry run, no misalignment will be generated." << endreq; + msg(MSG::INFO) << "Dry run, no misalignment will be generated." << endmsg; } return sc; @@ -287,7 +287,7 @@ namespace InDetAlignment ATH_MSG_INFO( m_ModuleList.size() << " entries in identifier list" ); if (StatusCode::SUCCESS!=GenerateMisaligment()) { - msg(MSG::ERROR) << "GenerateMisalignment failed!" << endreq; + msg(MSG::ERROR) << "GenerateMisalignment failed!" << endmsg; return StatusCode::FAILURE; }; @@ -300,7 +300,7 @@ namespace InDetAlignment //__________________________________________________________________________ StatusCode CreateMisalignAlg::finalize() { - if (msgLvl(MSG::DEBUG)) msg() <<"CreateMisalignAlg finalize()" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"CreateMisalignAlg finalize()" << endmsg; m_ModuleList.clear(); @@ -322,7 +322,7 @@ namespace InDetAlignment m_ModuleList[SCT_ModuleID][1] = module->center()[1]; m_ModuleList[SCT_ModuleID][2] = module->center()[2]; ++nSCT; - msg(MSG::INFO) << "SCT module " << nSCT << endreq; + msg(MSG::INFO) << "SCT module " << nSCT << endmsg; } if (m_sctIdHelper->side((*iter)->identify()) == 0) { // inner side case @@ -336,24 +336,24 @@ namespace InDetAlignment m_HumanReadableID = m_sctIdHelper->barrel_ec(SCT_ModuleID)*(m_HumanReadableID + 10000000); } - msg(MSG::INFO) << "Human Readable ID: " << m_HumanReadableID << endreq; + msg(MSG::INFO) << "Human Readable ID: " << m_HumanReadableID << endmsg; m_VisualizationLookupTree->Fill(); // Syntax is (ID, Level) where Level is from 1 to 3 (3 is single module level) if (msgLvl(MSG::INFO)) { HepGeom::Transform3D InitialAlignment = Amg::EigenTransformToCLHEP(m_IDAlignDBTool->getTrans(SCT_ModuleID,3)); - msg() << "Initial Alignment of module " << m_idHelper->show_to_string(SCT_ModuleID,0,'/') << endreq; - msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endreq; - msg() << endreq; + msg() << "Initial Alignment of module " << m_idHelper->show_to_string(SCT_ModuleID,0,'/') << endmsg; + msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endmsg; + msg() << endmsg; } } // end inner side case } //end loop over SCT elements @@ -377,7 +377,7 @@ namespace InDetAlignment m_ModuleList[Pixel_ModuleID][2] = module->center()[2]; ++nPixel; - msg(MSG::INFO) << "Pixel module " << nPixel << endreq; + msg(MSG::INFO) << "Pixel module " << nPixel << endmsg; // Write out Visualization Lookup Tree m_AthenaHashedID = Pixel_ModuleID.get_identifier32().get_compact(); @@ -389,27 +389,27 @@ namespace InDetAlignment m_HumanReadableID = m_pixelIdHelper->barrel_ec(Pixel_ModuleID)*(m_HumanReadableID + 10000000); } - msg(MSG::INFO) << "Human Readable ID: " << m_HumanReadableID << endreq; + msg(MSG::INFO) << "Human Readable ID: " << m_HumanReadableID << endmsg; m_VisualizationLookupTree->Fill(); if (msgLvl(MSG::INFO)) { HepGeom::Transform3D InitialAlignment = Amg::EigenTransformToCLHEP(m_IDAlignDBTool->getTrans(Pixel_ModuleID,3)); - msg() << "Initial Alignment of module " << m_idHelper->show_to_string(Pixel_ModuleID,0,'/') << endreq; - msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endreq; - msg() << endreq; + msg() << "Initial Alignment of module " << m_idHelper->show_to_string(Pixel_ModuleID,0,'/') << endmsg; + msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endmsg; + msg() << endmsg; } } } else { - msg(MSG::INFO) << "not a valid PIXEL Module ID (setup)" << endreq; + msg(MSG::INFO) << "not a valid PIXEL Module ID (setup)" << endmsg; } } } @@ -435,8 +435,8 @@ namespace InDetAlignment // HepGeom::Point3D<double> module_center = (*iter)->center(); // HepGeom::Point3D<double> module_center_reduced = m_TRT_Manager->getElement(TRTID)->center(); - // msg(MSG::DEBUG) << "center of module: " << module_center.rho()/CLHEP::cm << ";" << module_center.phi() << ";" << module_center.z()/CLHEP::cm << endreq; - // msg(MSG::DEBUG) << "center of reduced module: " << module_center_reduced.rho()/CLHEP::cm << ";" << module_center_reduced.phi() << ";" << module_center_reduced.z()/CLHEP::cm << endreq; + // msg(MSG::DEBUG) << "center of module: " << module_center.rho()/CLHEP::cm << ";" << module_center.phi() << ";" << module_center.z()/CLHEP::cm << endmsg; + // msg(MSG::DEBUG) << "center of reduced module: " << module_center_reduced.rho()/CLHEP::cm << ";" << module_center_reduced.phi() << ";" << module_center_reduced.z()/CLHEP::cm << endmsg; unsigned int nStraws = (*iter)->nStraws(); for (unsigned int l = 0; l<nStraws; l++) { @@ -446,11 +446,11 @@ namespace InDetAlignment trtModulesWithCOG[TRTID].at(2) += strawcenter.z(); /*sumz*/ trtModulesWithCOG[TRTID].at(3) += 1.; /*nStraws*/ - //if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "center of straw " << l << ": " << strawcenter.rho()/CLHEP::cm << ";" << strawcenter.phi() << ";" << strawcenter.z()/CLHEP::cm << endreq; + //if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "center of straw " << l << ": " << strawcenter.rho()/CLHEP::cm << ";" << strawcenter.phi() << ";" << strawcenter.z()/CLHEP::cm << endmsg; } if (msgLvl(MSG::DEBUG)) { - msg() << "this strawlayer has " << nStraws << " straws." << endreq; - msg() << "strawcount of this module: " << trtModulesWithCOG[TRTID].at(3) << endreq; + msg() << "this strawlayer has " << nStraws << " straws." << endmsg; + msg() << "strawcount of this module: " << trtModulesWithCOG[TRTID].at(3) << endmsg; } } @@ -460,7 +460,7 @@ namespace InDetAlignment const Identifier TRTID = iter2->first; double nStraws = iter2->second.at(3); nTRT++; - msg(MSG::INFO) << "TRT module " << nTRT << endreq; + msg(MSG::INFO) << "TRT module " << nTRT << endmsg; m_ModuleList[TRTID] = HepGeom::Point3D<double>(iter2->second.at(0)/nStraws, iter2->second.at(1)/nStraws,iter2->second.at(2)/nStraws); HepGeom::Transform3D InitialAlignment ; @@ -470,22 +470,22 @@ namespace InDetAlignment if ( p ) { if (msgLvl(MSG::INFO)) { InitialAlignment = Amg::EigenTransformToCLHEP(*p) ; - msg() << "Initial Alignment of module " << m_idHelper->show_to_string(TRTID,0,'/') << endreq; - msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endreq; - msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endreq; - msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endreq; - msg() << endreq; + msg() << "Initial Alignment of module " << m_idHelper->show_to_string(TRTID,0,'/') << endmsg; + msg() << "Alignment x = (" << InitialAlignment.getTranslation().x() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment y = (" << InitialAlignment.getTranslation().y() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment z = (" << InitialAlignment.getTranslation().z() / CLHEP::micrometer << ") micron" << endmsg; + msg() << "Alignment x phi = (" << InitialAlignment.getRotation().phiX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment x Theta = (" << InitialAlignment.getRotation().thetaX() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y phi = (" << InitialAlignment.getRotation().phiY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment y Theta = (" << InitialAlignment.getRotation().thetaY() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z phi = (" << InitialAlignment.getRotation().phiZ() / CLHEP::deg << ") degree" << endmsg; + msg() << "Alignment z Theta = (" << InitialAlignment.getRotation().thetaZ() / CLHEP::deg << ") degree" << endmsg; + msg() << endmsg; } } else { if (msgLvl(MSG::INFO)) { - msg()<<"No initial alignment for TRT module " << m_idHelper->show_to_string(TRTID,0,'/') << endreq; - // msg()<<"Let's set the initial alignment for this module ..."<<endreq; + msg()<<"No initial alignment for TRT module " << m_idHelper->show_to_string(TRTID,0,'/') << endmsg; + // msg()<<"Let's set the initial alignment for this module ..."<<endmsg; } //Align the individual modules // // m_trtaligndbservice->setLvl1Align(TRTID,InitialAlignment) ; @@ -502,7 +502,7 @@ namespace InDetAlignment IRndmGenSvc* randsvc; if (StatusCode::SUCCESS!=service("RndmGenSvc",randsvc,true)) { - msg(MSG::WARNING) << "Cannot find RndmGenSvc" << endreq; + msg(MSG::WARNING) << "Cannot find RndmGenSvc" << endmsg; } else { ATH_MSG_DEBUG( "Got RndmGenSvc" ); @@ -544,8 +544,8 @@ namespace InDetAlignment const double maxAngleInner = 2 * asin ( m_Misalign_maxShift_Inner / (2*minRadius)); const double maxDeltaZ = m_Misalign_maxShift; if (msgLvl(MSG::DEBUG)) { - msg() << "maximum deltaPhi = " << maxAngle/CLHEP::mrad << " mrad" << endreq; - msg() << "maximum deltaPhi for 1/r term = " << maxAngleInner/CLHEP::mrad << " mrad" << endreq; + msg() << "maximum deltaPhi = " << maxAngle/CLHEP::mrad << " mrad" << endmsg; + msg() << "maximum deltaPhi for 1/r term = " << maxAngleInner/CLHEP::mrad << " mrad" << endmsg; } for (std::map<Identifier, HepGeom::Point3D<double> >::const_iterator iter = m_ModuleList.begin(); iter != m_ModuleList.end(); ++iter) { @@ -565,7 +565,7 @@ namespace InDetAlignment //module = m_TRT_Manager->getElement(ModuleID); //const InDetDD::TRT_BaseElement *p_TRT_Module = m_TRT_Manager->getElement(iter->second.moduleID()); } else { - msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endreq; + msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endmsg; } //TRT alignment transformations are given in global frame in DB, @@ -624,23 +624,23 @@ namespace InDetAlignment ScaleFactor=m_ScaleTRTEndcap; } } else { - msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endreq; + msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endmsg; } ATH_MSG_INFO( "ID Module " << i << " with ID " << m_idHelper->show_to_string(ModuleID,0,'/') ); if (msgLvl(MSG::DEBUG)) { - msg() << "radius " << r / CLHEP::cm << " centimeter" << endreq; - msg() << "phi " << phi << endreq; - msg() << "z " << z / CLHEP::cm << " centimeter" << endreq; + msg() << "radius " << r / CLHEP::cm << " centimeter" << endmsg; + msg() << "phi " << phi << endmsg; + msg() << "z " << z / CLHEP::cm << " centimeter" << endmsg; if (msgLvl(MSG::VERBOSE)) { - msg() << "localToGlobal transformation:" << endreq; - msg() << "translation: " << localToGlobal.dx() / CLHEP::cm << ";" << localToGlobal.dy() / CLHEP::cm << ";" << localToGlobal.dz() / CLHEP::cm << endreq; - msg() << "rotation: " << endreq; - msg() << localToGlobal.xx() << " " << localToGlobal.xy() << " " << localToGlobal.xz() << endreq; - msg() << localToGlobal.yx() << " " << localToGlobal.yy() << " " << localToGlobal.yz() << endreq; - msg() << localToGlobal.zx() << " " << localToGlobal.zy() << " " << localToGlobal.zz() << endreq; + msg() << "localToGlobal transformation:" << endmsg; + msg() << "translation: " << localToGlobal.dx() / CLHEP::cm << ";" << localToGlobal.dy() / CLHEP::cm << ";" << localToGlobal.dz() / CLHEP::cm << endmsg; + msg() << "rotation: " << endmsg; + msg() << localToGlobal.xx() << " " << localToGlobal.xy() << " " << localToGlobal.xz() << endmsg; + msg() << localToGlobal.yx() << " " << localToGlobal.yy() << " " << localToGlobal.yz() << endmsg; + msg() << localToGlobal.zx() << " " << localToGlobal.zy() << " " << localToGlobal.zz() << endmsg; } } @@ -696,13 +696,13 @@ namespace InDetAlignment Rndm::Numbers RandMisgamma(randsvc, Rndm::Gauss(0.,ScaleFactor*m_Misalign_gamma)); if (msgLvl(MSG::DEBUG)) { - msg() << "JRS ScaleFactor: " << ScaleFactor << endreq; - msg() << "JRS X: " << RandMisX() << endreq; - msg() << "JRS Y: " << RandMisY() << endreq; - msg() << "JRS Z: " << RandMisZ() << endreq; - msg() << "JRS a: " << RandMisalpha() << endreq; - msg() << "JRS b: " << RandMisbeta() << endreq; - msg() << "JRS c: " << RandMisgamma() << endreq; + msg() << "JRS ScaleFactor: " << ScaleFactor << endmsg; + msg() << "JRS X: " << RandMisX() << endmsg; + msg() << "JRS Y: " << RandMisY() << endmsg; + msg() << "JRS Z: " << RandMisZ() << endmsg; + msg() << "JRS a: " << RandMisalpha() << endmsg; + msg() << "JRS b: " << RandMisbeta() << endmsg; + msg() << "JRS c: " << RandMisgamma() << endmsg; } HepGeom::Vector3D<double> shift(RandMisX(), RandMisY(), RandMisZ()); @@ -729,10 +729,10 @@ namespace InDetAlignment } else { //IBL-stave temperature distortion not applied to anything but IBL deltaX = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move this module for IBL temp distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move this module for IBL temp distortion " << endmsg; } - if (msgLvl(MSG::DEBUG)) msg() << "deltaX for this module: " << deltaX/CLHEP::micrometer << " um" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "deltaX for this module: " << deltaX/CLHEP::micrometer << " um" << endmsg; parameterizedTrafo = HepGeom::Translate3D(deltaX,0,0); // translation in x direction } @@ -745,7 +745,7 @@ namespace InDetAlignment if (m_idHelper->is_trt(ModuleID) && abs(m_trtIdHelper->barrel_ec(ModuleID))==2) { //radial mode cannot handle TRT endcap, sorry deltaR = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for radial distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for radial distortion " << endmsg; } else { //deltaR = 0.5 * cos ( 2*phi ) * r/maxRadius * maxDeltaR; deltaR = r/maxRadius * maxDeltaR; //scale linearly in r @@ -755,7 +755,7 @@ namespace InDetAlignment if (m_idHelper->is_trt(ModuleID) && abs(m_trtIdHelper->barrel_ec(ModuleID))==2) { //elliptical mode cannot handle TRT endcap, sorry deltaR = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for elliptical distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for elliptical distortion " << endmsg; } else { // deltaR = 0.5 * cos ( 2*phi ) * r/maxRadius * maxDeltaR; deltaR = cos ( 2*phi ) * r/maxRadius * maxDeltaR; @@ -765,17 +765,17 @@ namespace InDetAlignment if (m_idHelper->is_trt(ModuleID) && abs(m_trtIdHelper->barrel_ec(ModuleID))==2) { //funnel mode cannot handle TRT endcap, sorry deltaR = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for funnel distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for funnel distortion " << endmsg; } else { //deltaR = z/maxLength * maxDeltaR; // linearly in z deltaR = 2. * z/maxLength * maxDeltaR; // linearly in z } } else { - msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endreq; + msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endmsg; deltaR=0; } - if (msgLvl(MSG::DEBUG)) msg() << "deltaR for this module: " << deltaR / CLHEP::micrometer << " um" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "deltaR for this module: " << deltaR / CLHEP::micrometer << " um" << endmsg; parameterizedTrafo = HepGeom::Translate3D(deltaR*cos(phi),deltaR * sin(phi),0.); // translation along R vector } @@ -795,7 +795,7 @@ namespace InDetAlignment if (m_idHelper->is_trt(ModuleID) && abs(m_trtIdHelper->barrel_ec(ModuleID))==2) { //clamshell mode cannot handle TRT endcap, sorry deltaPhi = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for clamshell distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for clamshell distortion " << endmsg; } else { // deltaPhi = 0.5 * cos ( 2*phi ) * maxAngle; deltaPhi = cos ( 2*phi ) * maxAngle; @@ -805,11 +805,11 @@ namespace InDetAlignment deltaPhi = 2*z/maxLength * maxAngle; //deltaPhi = z/maxLength * maxAngle; } else { - msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endreq; + msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endmsg; deltaPhi=0; } - if (msgLvl(MSG::DEBUG)) msg() << "deltaPhi for this module: " << deltaPhi/CLHEP::mrad << " mrad" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "deltaPhi for this module: " << deltaPhi/CLHEP::mrad << " mrad" << endmsg; parameterizedTrafo = HepGeom::RotateZ3D(deltaPhi); // rotation around z axis => in phi } @@ -827,7 +827,7 @@ namespace InDetAlignment if (m_idHelper->is_trt(ModuleID) && abs(m_trtIdHelper->barrel_ec(ModuleID))==2) { //clamshell mode cannot handle TRT endcap, sorry deltaZ = 0.; - if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for skew distortion " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "will not move TRT endcap for skew distortion " << endmsg; } else { deltaZ = cos ( 2*phi ) * maxDeltaZ; @@ -837,17 +837,17 @@ namespace InDetAlignment // deltaZ = z/maxLength * maxDeltaZ; deltaZ = 2. * z/maxLength * maxDeltaZ; } else { - msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endreq; + msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endmsg; deltaZ=0; } - if (msgLvl(MSG::DEBUG)) msg() << "deltaZ for this module: " << deltaZ/CLHEP::micrometer << " um" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "deltaZ for this module: " << deltaZ/CLHEP::micrometer << " um" << endmsg; parameterizedTrafo = HepGeom::Translate3D(0,0,deltaZ); // translation in z direction } else { //no or wrong misalignment selected - msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endreq; + msg(MSG::WARNING) << "Wrong misalignment mode entered, doing nothing." << endmsg; parameterizedTrafo = HepGeom::Transform3D(); // initialized as identity transformation } @@ -855,7 +855,7 @@ namespace InDetAlignment if ( m_MisalignmentMode==21 && m_idHelper->is_trt(ModuleID) && m_trtIdHelper->is_barrel(ModuleID) ) { //curl for TRT barrel - if (msgLvl(MSG::DEBUG)) msg() << "additional rotation for TRT barrel module!" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "additional rotation for TRT barrel module!" << endmsg; HepGeom::Transform3D realLocalToGlobalTRT = HepGeom::Translate3D(center.x(),center.y(),center.z()); //rotate a TRT barrel module by the same angle again, but around its local z axis //this is an approximation to accomodate the impossible curling of TRT segments @@ -864,7 +864,7 @@ namespace InDetAlignment //do the twist! (for TRT barrel) HepGeom::Transform3D realLocalToGlobalTRT = HepGeom::Translate3D(center.x(),center.y(),center.z()); double deltaAlpha = (-2.) * r * maxAngle/maxLength; - if (msgLvl(MSG::DEBUG)) msg() << "TRT barrel module alpha for twist: " << deltaAlpha/CLHEP::mrad << " mrad" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "TRT barrel module alpha for twist: " << deltaAlpha/CLHEP::mrad << " mrad" << endmsg; CLHEP::HepRotation twistForTRTRotation(HepGeom::Vector3D<double>(center.x(),center.y(),center.z()), deltaAlpha ); HepGeom::Transform3D twistForTRT= HepGeom::Transform3D(twistForTRTRotation,HepGeom::Vector3D<double>(0.,0.,0.)); @@ -876,7 +876,7 @@ namespace InDetAlignment HepGeom::Transform3D realLocalToGlobalTRT = HepGeom::Translate3D(center.x(),center.y(),center.z()); double deltaAlpha = (-2.) * maxDeltaR/maxLength; //double deltaAlpha = maxDeltaR/maxLength; - if (msgLvl(MSG::DEBUG)) msg() << "TRT barrel module alpha for funnel: " << deltaAlpha/CLHEP::mrad << " mrad" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "TRT barrel module alpha for funnel: " << deltaAlpha/CLHEP::mrad << " mrad" << endmsg; HepGeom::Vector3D<double> normalVector(center.x(),center.y(),center.z()); HepGeom::Vector3D<double> beamVector(0.,0.,1.); @@ -898,15 +898,15 @@ namespace InDetAlignment } if (msgLvl(MSG::INFO)) { - msg() << "Align Transformation x = (" << alignmentTrafo.getTranslation().x() / CLHEP::micrometer << " um)" << endreq; - msg() << "Align Transformation y = (" << alignmentTrafo.getTranslation().y() / CLHEP::micrometer << " um)" << endreq; - msg() << "Align Transformation z = (" << alignmentTrafo.getTranslation().z() / CLHEP::micrometer << " um)" << endreq; - msg() << "Align Transformation x phi = (" << alignmentTrafo.getRotation().phiX() / CLHEP::deg << ")" << endreq; - msg() << "Align Transformation x Theta = (" << alignmentTrafo.getRotation().thetaX() / CLHEP::deg << ")" << endreq; - msg() << "Align Transformation y phi = (" << alignmentTrafo.getRotation().phiY() / CLHEP::deg << ")" << endreq; - msg() << "Align Transformation y Theta = (" << alignmentTrafo.getRotation().thetaY() / CLHEP::deg << ")" << endreq; - msg() << "Align Transformation z phi = (" << alignmentTrafo.getRotation().phiZ() / CLHEP::deg << ")" << endreq; - msg() << "Align Transformation z Theta = (" << alignmentTrafo.getRotation().thetaZ() / CLHEP::deg << ")" << endreq; + msg() << "Align Transformation x = (" << alignmentTrafo.getTranslation().x() / CLHEP::micrometer << " um)" << endmsg; + msg() << "Align Transformation y = (" << alignmentTrafo.getTranslation().y() / CLHEP::micrometer << " um)" << endmsg; + msg() << "Align Transformation z = (" << alignmentTrafo.getTranslation().z() / CLHEP::micrometer << " um)" << endmsg; + msg() << "Align Transformation x phi = (" << alignmentTrafo.getRotation().phiX() / CLHEP::deg << ")" << endmsg; + msg() << "Align Transformation x Theta = (" << alignmentTrafo.getRotation().thetaX() / CLHEP::deg << ")" << endmsg; + msg() << "Align Transformation y phi = (" << alignmentTrafo.getRotation().phiY() / CLHEP::deg << ")" << endmsg; + msg() << "Align Transformation y Theta = (" << alignmentTrafo.getRotation().thetaY() / CLHEP::deg << ")" << endmsg; + msg() << "Align Transformation z phi = (" << alignmentTrafo.getRotation().phiZ() / CLHEP::deg << ")" << endmsg; + msg() << "Align Transformation z Theta = (" << alignmentTrafo.getRotation().thetaZ() / CLHEP::deg << ")" << endmsg; } // suppress tiny translations that occur due to trafo.inverse*trafo numerics @@ -942,24 +942,24 @@ namespace InDetAlignment if (m_idHelper->is_sct(ModuleID) || m_idHelper->is_pixel(ModuleID)) { if (m_IDAlignDBTool->tweakTrans(ModuleID,3, alignmentTrafoAmg)) { - msg(MSG::INFO) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " successful" << endreq; + msg(MSG::INFO) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " successful" << endmsg; } else { - msg(MSG::ERROR) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " not successful" << endreq; + msg(MSG::ERROR) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " not successful" << endmsg; } } else if (m_idHelper->is_trt(ModuleID)) { if (!m_trtIdHelper->is_barrel(ModuleID) && m_trtIdHelper->phi_module(ModuleID)!=0) { //don't align - there's no trans in the DB for phi sectors other than 0 - if (msgLvl(MSG::DEBUG)) msg() << "TRT endcap phi sector " << m_trtIdHelper->phi_module(ModuleID) << " not aligned" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "TRT endcap phi sector " << m_trtIdHelper->phi_module(ModuleID) << " not aligned" << endmsg; } else { //if (m_trtaligndbservice->tweakTrans(ModuleID,alignmentTrafo).isFailure()) { if (m_trtaligndbservice->tweakAlignTransform(ModuleID,alignmentTrafoAmg,2).isFailure()) { - msg(MSG::ERROR) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " not successful" << endreq; + msg(MSG::ERROR) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " not successful" << endmsg; } else { - msg(MSG::INFO) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " successful" << endreq; + msg(MSG::INFO) << "Update of alignment constants for module " << m_idHelper->show_to_string(ModuleID,0,'/') << " successful" << endmsg; } } } else { - msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endreq; + msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endmsg; } double alpha, beta, gamma; @@ -999,12 +999,12 @@ namespace InDetAlignment m_AlignResults_Identifier_Eta = m_trtIdHelper->straw_layer(ModuleID); } else { - msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endreq; + msg(MSG::WARNING) << "Something fishy, identifier is neither Pixel, nor SCT or TRT!" << endmsg; } // Write out AlignResults ntuple if (StatusCode::SUCCESS!=ntupleSvc()->writeRecord("NTUPLES/CREATEMISALIGN/InitialAlignment")) { - msg(MSG::ERROR) << "Could not write InitialAlignment ntuple." << endreq; + msg(MSG::ERROR) << "Could not write InitialAlignment ntuple." << endmsg; } } // end of module loop @@ -1014,24 +1014,24 @@ namespace InDetAlignment //m_IDAlignDBTool->printDB(2); if (StatusCode::SUCCESS!=m_IDAlignDBTool->outputObjs()) { - msg(MSG::ERROR) << "Writing of AlignableTransforms failed" << endreq; + msg(MSG::ERROR) << "Writing of AlignableTransforms failed" << endmsg; } else { - msg(MSG::INFO) << "AlignableTransforms were written" << endreq; - msg(MSG::INFO) << "Writing database to textfile" << endreq; + msg(MSG::INFO) << "AlignableTransforms were written" << endmsg; + msg(MSG::INFO) << "Writing database to textfile" << endmsg; m_IDAlignDBTool->writeFile(false,m_asciiFileNameBase+"_Si.txt"); - msg(MSG::INFO) << "Writing IoV information to mysql file" << endreq; + msg(MSG::INFO) << "Writing IoV information to mysql file" << endmsg; m_IDAlignDBTool->fillDB("InDetSi_"+m_SQLiteTag,IOVTime::MINRUN,IOVTime::MINEVENT,IOVTime::MAXRUN,IOVTime::MAXEVENT); } if (StatusCode::SUCCESS!=m_trtaligndbservice->streamOutAlignObjects()) { - msg(MSG::ERROR) << "Write of AlignableTransforms (TRT) failed" << endreq; + msg(MSG::ERROR) << "Write of AlignableTransforms (TRT) failed" << endmsg; } else { - msg(MSG::INFO) << "AlignableTransforms for TRT were written" << endreq; - msg(MSG::INFO) << "Writing TRT database to textfile" << endreq; + msg(MSG::INFO) << "AlignableTransforms for TRT were written" << endmsg; + msg(MSG::INFO) << "Writing TRT database to textfile" << endmsg; if ( StatusCode::SUCCESS != m_trtaligndbservice->writeAlignTextFile(m_asciiFileNameBase+"_TRT.txt") ) { ATH_MSG_ERROR( "Failed to write AlignableTransforms (TRT) to txt file " << m_asciiFileNameBase+"_TRT.txt" ); } - msg(MSG::INFO) << "Writing IoV information for TRT to mysql file" << endreq; + msg(MSG::INFO) << "Writing IoV information for TRT to mysql file" << endmsg; if ( StatusCode::SUCCESS != m_trtaligndbservice->registerAlignObjects(m_SQLiteTag+"_TRT",IOVTime::MINRUN,IOVTime::MINEVENT,IOVTime::MAXRUN,IOVTime::MAXEVENT)) { ATH_MSG_ERROR( "Write of AIoV information (TRT) to mysql failed (tag=" << m_SQLiteTag << "_TRT)"); @@ -1057,7 +1057,7 @@ namespace InDetAlignment //__________________________________________________________________________ const Identifier CreateMisalignAlg::reduceTRTID(Identifier id) { - // msg(MSG::DEBUG) << "in CreateMisalignAlg::reduceTRTID" << endreq; + // msg(MSG::DEBUG) << "in CreateMisalignAlg::reduceTRTID" << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "reduceTRTID got Id " << m_idHelper->show_to_string(id,0,'/'); int barrel_ec= m_trtIdHelper->barrel_ec(id); @@ -1079,8 +1079,8 @@ namespace InDetAlignment // only strawlayers 0,4,8,12 are fed into DB for endcap } - // if (msgLvl(MSG::DEBUG)) msg() << " and returns Id " << m_idHelper->show_to_string(m_trtIdHelper->module_id(barrel_ec,phi_module,layer_or_wheel),0,'/') << endreq; - if (msgLvl(MSG::DEBUG)) msg() << " and returns Id " << m_idHelper->show_to_string(m_trtIdHelper->layer_id(barrel_ec,phi_module,layer_or_wheel,strawlayer),0,'/') << endreq; + // if (msgLvl(MSG::DEBUG)) msg() << " and returns Id " << m_idHelper->show_to_string(m_trtIdHelper->module_id(barrel_ec,phi_module,layer_or_wheel),0,'/') << endmsg; + if (msgLvl(MSG::DEBUG)) msg() << " and returns Id " << m_idHelper->show_to_string(m_trtIdHelper->layer_id(barrel_ec,phi_module,layer_or_wheel,strawlayer),0,'/') << endmsg; // return m_trtIdHelper->module_id(barrel_ec,phi_module,layer_or_wheel); return m_trtIdHelper->layer_id(barrel_ec,phi_module,layer_or_wheel,strawlayer); } diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/GeoModelTRT.dev b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/GeoModelTRT.dev index 8574e0307ac..d2f9cb8b396 100755 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/GeoModelTRT.dev +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/GeoModelTRT.dev @@ -4,7 +4,7 @@ // --------- Setting up TRT Geometry --------- -m_log << MSG::INFO << "Starting TRT Geometry" << endreq; +m_log << MSG::INFO << "Starting TRT Geometry" << endmsg; m_managerName = "TRT"; @@ -12,15 +12,15 @@ sc = detStore().retrieve(TRTmanager, m_managerName); if (sc.isFailure() || !TRTmanager) { log << MSG::FATAL << "Could not find the TRT Manager " - << m_managerName << " !" << endreq; + << m_managerName << " !" << endmsg; // return StatusCode::FAILURE; } else { - log << MSG::INFO << "TRT Manager found" << endreq; + log << MSG::INFO << "TRT Manager found" << endmsg; } -// m_log << MSG::INFO << "Retrieving TRT manager OK" << endreq; +// m_log << MSG::INFO << "Retrieving TRT manager OK" << endmsg; -// m_log << MSG::INFO << "TRT manager, getNumTreeTops: " << TRTmanager->getNumTreeTops() << endreq; +// m_log << MSG::INFO << "TRT manager, getNumTreeTops: " << TRTmanager->getNumTreeTops() << endmsg; enum {NMODMAX=3}; // enum {NWHEELMAX=18}; // @@ -40,14 +40,14 @@ for (unsigned int ec=0;ec<2;ec++) { for (unsigned int sLay=0;sLay<TRTmanager->getNumerology()->getNBarrelLayers(mod);sLay++) { imod++; - // m_log << MSG::INFO << "TRT loop indexes: " << ec << "-" << mod << "-" << phi << "-" << sLay << endreq; + // m_log << MSG::INFO << "TRT loop indexes: " << ec << "-" << mod << "-" << phi << "-" << sLay << endmsg; const TRT_BarrelElement * TRTelement = 0; TRTelement = TRTmanager->getBarrelElement(ec,mod,phi,sLay); - if(!TRTelement) log << MSG::FATAL << "null TRT element" << endreq; + if(!TRTelement) log << MSG::FATAL << "null TRT element" << endmsg; const Identifier ident = TRTelement->identify(); @@ -67,9 +67,9 @@ for (unsigned int ec=0;ec<2;ec++) { m_strawlist.push_back(newstraw); - // if(imod<2) m_log << MSG::INFO << "printing straw x,y,z: "<< TRTelement->strawXPos(istraw) << "-" << TRTelement->strawYPos(istraw)<< "-" << TRTelement->strawZPos(istraw) << endreq; + // if(imod<2) m_log << MSG::INFO << "printing straw x,y,z: "<< TRTelement->strawXPos(istraw) << "-" << TRTelement->strawYPos(istraw)<< "-" << TRTelement->strawZPos(istraw) << endmsg; - if(imod<2) m_log << MSG::INFO << "Module coordinates x,y,z: "<< center.x() << " - " << center.y() << " - " << center.z() << endreq; + if(imod<2) m_log << MSG::INFO << "Module coordinates x,y,z: "<< center.x() << " - " << center.y() << " - " << center.z() << endmsg; } @@ -100,9 +100,9 @@ const TRT_EndcapDescriptor * TRTdescriptor; // TRT_EndcapDescriptor * TRTdescriptor; TRTdescriptor=TRTelement->getDescriptor(); -if(iendcap<(TRTmanager->getNumerology()->getNEndcapLayers(whe)+TRTmanager->getNumerology()->getNEndcapLayers(whe+1))) m_log << MSG::INFO << "ENDCAP - printing straw start phi, inner radius, str length: "<< TRTelement->getDescriptor()->startPhi() << " - " << TRTelement->getDescriptor()->innerRadius()<< " - " << TRTelement->getDescriptor()->strawLength() << endreq; +if(iendcap<(TRTmanager->getNumerology()->getNEndcapLayers(whe)+TRTmanager->getNumerology()->getNEndcapLayers(whe+1))) m_log << MSG::INFO << "ENDCAP - printing straw start phi, inner radius, str length: "<< TRTelement->getDescriptor()->startPhi() << " - " << TRTelement->getDescriptor()->innerRadius()<< " - " << TRTelement->getDescriptor()->strawLength() << endmsg; -if(iendcap<(TRTmanager->getNumerology()->getNEndcapLayers(whe)+TRTmanager->getNumerology()->getNEndcapLayers(whe+1))) m_log << MSG::INFO << "ENDCAP - Module coordinates x,y,z: "<< center.x() << " - " << center.y() << " - " << center.z() << endreq; +if(iendcap<(TRTmanager->getNumerology()->getNEndcapLayers(whe)+TRTmanager->getNumerology()->getNEndcapLayers(whe+1))) m_log << MSG::INFO << "ENDCAP - Module coordinates x,y,z: "<< center.x() << " - " << center.y() << " - " << center.z() << endmsg; for (int istraw=1;istraw<=TRTdescriptor->nStraws(); istraw++) { diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/SiDistWriteAlg.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/SiDistWriteAlg.cxx index 53434637916..2fc072305d8 100755 --- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/SiDistWriteAlg.cxx +++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/SiDistWriteAlg.cxx @@ -37,7 +37,7 @@ SiDistWriteAlg::~SiDistWriteAlg() StatusCode SiDistWriteAlg::initialize() { - msg (MSG::DEBUG) << "SiDistWriteAlg::initialize()" << endreq; + msg (MSG::DEBUG) << "SiDistWriteAlg::initialize()" << endmsg; // check StoreGate service available if (evtStore().retrieve().isFailure()) { @@ -48,7 +48,7 @@ StatusCode SiDistWriteAlg::initialize() // get detector store if (detStore().retrieve().isFailure()) { - msg( MSG::FATAL) << "Detector store not found" << endreq; + msg( MSG::FATAL) << "Detector store not found" << endmsg; } @@ -56,7 +56,7 @@ StatusCode SiDistWriteAlg::initialize() if ((StatusCode::SUCCESS!=detStore()->retrieve(m_pixid)) || (StatusCode::SUCCESS!=detStore()->retrieve(m_sctid))) { msg (MSG::ERROR) << "Could not get helpers from detector store" - << endreq; + << endmsg; } ATH_MSG_DEBUG( "Distortion information in TDS at key " << par_distkey ); @@ -92,7 +92,7 @@ bool SiDistWriteAlg::readFile() { std::ifstream infile; infile.open(par_readfile.c_str()); if (!infile) { - msg (MSG::ERROR) << "Problem opening input file" << endreq; + msg (MSG::ERROR) << "Problem opening input file" << endmsg; return false; } // loop over lines in file @@ -120,7 +120,7 @@ bool SiDistWriteAlg::readFile() { ++nadd; } else { msg (MSG::ERROR) << "Problem constructing identifier " << ident << - " / " << identhash << endreq; + " / " << identhash << endmsg; } ++nline; } @@ -133,7 +133,7 @@ bool SiDistWriteAlg::readFile() { ATH_MSG_DEBUG ( "Recorded DetCondCFloat " << par_distkey << " in TDS" ); } else { msg(MSG::ERROR) << "Failed to record DetCondCFloat " << par_distkey << " in TDS" - << endreq; + << endmsg; return false; } return true; @@ -156,7 +156,7 @@ bool SiDistWriteAlg::makeIdent(const std::string& ident, } else if (det==2) { identifier=m_sctid->wafer_id(bec,layer,phi,eta,side); } else { - msg(MSG::ERROR) << "Unknown detector type " << det << endreq; + msg(MSG::ERROR) << "Unknown detector type " << det << endmsg; return false; } // cross check with the supplied identifier compact value @@ -172,6 +172,6 @@ void SiDistWriteAlg::print() { pdist->print2(); } else { msg (MSG::ERROR) << "Unable to retrieve distortion parameters " << - endreq; + endmsg; } } diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraint.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraint.cxx index 25626d210de..9919492da0f 100755 --- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraint.cxx +++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraint.cxx @@ -172,69 +172,69 @@ SurveyConstraint::~SurveyConstraint() StatusCode SurveyConstraint::initialize(){ // Part 1: Get the messaging service, print where you are - msg(MSG::INFO) << "SurveyConstraint initialize()" << endreq; + msg(MSG::INFO) << "SurveyConstraint initialize()" << endmsg; // Get The ToolSvc StatusCode sc = service("ToolSvc",m_toolsvc); if (sc.isFailure()) { - msg(MSG::FATAL) << "Could not find ToolSvc. Exiting." << endreq; + msg(MSG::FATAL) << "Could not find ToolSvc. Exiting." << endmsg; return sc; } - msg(MSG::INFO) << "got ToolSvc" << endreq; + msg(MSG::INFO) << "got ToolSvc" << endmsg; // Get current InDetAlignDataBaseTool from ToolService sc = m_toolsvc->retrieveTool("InDetAlignDBTool",m_aligndbtoolinst,current_IDAlignDBTool); if (sc.isFailure()) { - msg(MSG::FATAL) <<"Could not find InDetAlignDBTool. Exiting."<<endreq; + msg(MSG::FATAL) <<"Could not find InDetAlignDBTool. Exiting."<<endmsg; return sc; } - msg(MSG::INFO) << "got current_IDAlignDBTool" << endreq; - msg(MSG::INFO) << "current_IDAlignDBTool name = " << current_IDAlignDBTool->name() << endreq; + msg(MSG::INFO) << "got current_IDAlignDBTool" << endmsg; + msg(MSG::INFO) << "current_IDAlignDBTool name = " << current_IDAlignDBTool->name() << endmsg; // Get survey InDetAlignDataBaseTool from ToolService sc = m_toolsvc->retrieveTool("InDetAlignDBTool",m_surveydbtoolinst,survey_IDAlignDBTool); if (sc.isFailure()) { - msg(MSG::FATAL) <<"Could not find InDetAlignDBTool. Exiting."<<endreq; + msg(MSG::FATAL) <<"Could not find InDetAlignDBTool. Exiting."<<endmsg; return sc; } - msg(MSG::INFO) << "got survey_IDAlignDBTool" << endreq; + msg(MSG::INFO) << "got survey_IDAlignDBTool" << endmsg; //ID Helper sc = detStore()->retrieve(m_idHelper, "AtlasID" ); if (sc.isFailure()) { - msg(MSG::WARNING) << "Could not get AtlasDetectorID !" << endreq; + msg(MSG::WARNING) << "Could not get AtlasDetectorID !" << endmsg; return StatusCode::SUCCESS; }else{ - if (msgLvl(MSG::DEBUG)) msg() << "Found AtlasDetectorID" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Found AtlasDetectorID" << endmsg; } // get ID helpers from detector store (relying on GeoModel to put them) if ((StatusCode::SUCCESS!=detStore()->retrieve(m_pixid)) || (StatusCode::SUCCESS!=detStore()->retrieve(m_sctid))) { - msg(MSG::FATAL) << "Problem retrieving ID helpers" << endreq; + msg(MSG::FATAL) << "Problem retrieving ID helpers" << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "got ID helpers from detector store (relying on GeoModel to put them)" << endreq; + msg(MSG::INFO) << "got ID helpers from detector store (relying on GeoModel to put them)" << endmsg; // get PixelManager sc = detStore()->retrieve(m_pixelManager, "Pixel"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get PixelManager !" << endreq; + msg(MSG::ERROR) << "Could not get PixelManager !" << endmsg; return sc; } - msg(MSG::INFO) << "got m_pixelManager" << endreq; + msg(MSG::INFO) << "got m_pixelManager" << endmsg; // get SCTManager sc = detStore()->retrieve(m_SCT_Manager, "SCT"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get SCT_Manager !" << endreq; + msg(MSG::ERROR) << "Could not get SCT_Manager !" << endmsg; return sc; } - msg(MSG::INFO) << "got m_SCT_Manager" << endreq; + msg(MSG::INFO) << "got m_SCT_Manager" << endmsg; // random number service if (StatusCode::SUCCESS!=service("RndmGenSvc",randsvc,true)) - msg(MSG::ERROR) << "Cannot find RndmGenSvc" << endreq; + msg(MSG::ERROR) << "Cannot find RndmGenSvc" << endmsg; // Protection against singular weight matrix if (m_surveywfile==""){ @@ -264,7 +264,7 @@ StatusCode SurveyConstraint::initialize(){ if(m_RotYRandSCTB<1.E-7) m_RotYRandSCTB=1.E-7; if(m_RotZRandSCTB<1.E-7) m_RotZRandSCTB=1.E-7; } - msg(MSG::INFO) << "now entering SurveyConstraint::setup_SurveyConstraintModules()" << endreq; + msg(MSG::INFO) << "now entering SurveyConstraint::setup_SurveyConstraintModules()" << endmsg; setup_SurveyConstraintModules(); //if (m_surveywfile!="") return StatusCode::SUCCESS; @@ -275,7 +275,7 @@ StatusCode SurveyConstraint::initialize(){ StatusCode SurveyConstraint::finalize() { // Part 1: Get the messaging service, print where you are - msg(MSG::INFO) << "finalize()" << endreq; + msg(MSG::INFO) << "finalize()" << endmsg; std::map<Identifier, SurveyConstraintModule*, std::less<Identifier> >::iterator it; for (it = m_ModuleMap.begin(); it != m_ModuleMap.end(); it++) { @@ -328,21 +328,21 @@ StatusCode SurveyConstraint::computeConstraint(const Identifier& ModuleID, Amg::Vector3D staveangles; std::vector< SurveyConstraintPoint > Stavepoints; mut->getPoints(Stavepoints,SurveyConstraintModule::Stave); - if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Stavepoints.size() " << Stavepoints.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Stavepoints.size() " << Stavepoints.size() << endmsg; // transform GlobalToLocal GlobalToLocal(mut,Stavepoints); // scale z coordinate for (unsigned int iPoint(0); iPoint < Stavepoints.size(); ++iPoint ) { Amg::Vector3D survey = Stavepoints[iPoint].survey(); - if (msgLvl(MSG::DEBUG)) msg() << "Survey Stavepoints before: " << survey.x() << "," << survey.y() << "," << survey.z() << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Survey Stavepoints before: " << survey.x() << "," << survey.y() << "," << survey.z() << endmsg; SurveyConstraintPoint& Stavepoint = Stavepoints[iPoint]; Stavepoint.scaleZ(m_scaleZ); survey = Stavepoints[iPoint].survey(); - if (msgLvl(MSG::DEBUG)) msg() << " and after: " << survey.x() << "," << survey.y() << "," << survey.z() << endreq; + if (msgLvl(MSG::DEBUG)) msg() << " and after: " << survey.x() << "," << survey.y() << "," << survey.z() << endmsg; } - if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Now fitting the 2 Staves" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Now fitting the 2 Staves" << endmsg; double stavemin = _minimizer.findMinimum(Stavepoints,staveangles,stavetrans); @@ -352,11 +352,11 @@ StatusCode SurveyConstraint::computeConstraint(const Identifier& ModuleID, if (msgLvl(MSG::DEBUG)) msg() << "Stavepoints translation and rotations: (" << stavetrans.x() << "," << stavetrans.y() << "," << stavetrans.z() << "," << staveangles.x()/m_scaleZ << "," << staveangles.y()/m_scaleZ << "," << staveangles.z() << ")" << - endreq; + endmsg; if(stavemin < 0.0){ - msg(MSG::FATAL) << "insufficient Points for Stave Fitting" << endreq; + msg(MSG::FATAL) << "insufficient Points for Stave Fitting" << endmsg; return StatusCode::FAILURE; } @@ -386,10 +386,10 @@ StatusCode SurveyConstraint::computeConstraint(const Identifier& ModuleID, //now compute the final parameters: build the 3D residuals between the two sets of MUT points Amg::Vector3D modtrans; Amg::Vector3D modangles; - if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Now fitting the 2 Modules" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SurveyConstraint().computeConstraint: Now fitting the 2 Modules" << endmsg; double modmin = _minimizer.findMinimum(Modulepoints,modangles,modtrans); if(modmin < 0.0){ - msg(MSG::FATAL) << "insufficient Points for Module Fitting" << endreq; + msg(MSG::FATAL) << "insufficient Points for Module Fitting" << endmsg; return StatusCode::FAILURE; } @@ -412,11 +412,11 @@ StatusCode SurveyConstraint::computeConstraint(const Identifier& ModuleID, else if(isSCTB) ierr = getWeightSCTB(//ModuleID, weight); if(ierr != 0){ - msg(MSG::FATAL) << "matrixInvertFail" << endreq; - if(isPixEC) msg(MSG::FATAL) << "for PixEC" << endreq; - else if(isPixB) msg(MSG::FATAL) << "for PixB" << endreq; - else if(isSCTEC) msg(MSG::FATAL) << "for SCTEC" << endreq; - else if(isSCTB) msg(MSG::FATAL) << "for SCTB" << endreq; + msg(MSG::FATAL) << "matrixInvertFail" << endmsg; + if(isPixEC) msg(MSG::FATAL) << "for PixEC" << endmsg; + else if(isPixB) msg(MSG::FATAL) << "for PixB" << endmsg; + else if(isSCTEC) msg(MSG::FATAL) << "for SCTEC" << endmsg; + else if(isSCTB) msg(MSG::FATAL) << "for SCTB" << endmsg; return StatusCode::FAILURE; } @@ -428,7 +428,7 @@ StatusCode SurveyConstraint::computeConstraint(const Identifier& ModuleID, // now get the chi2, add to the vector and the matrix. Amg::MatrixX temp = dparams.transpose() * weight * dparams; - msg(MSG::ERROR) << "Chech that the size of the matrix is a 1,1: " << temp.rows() << ", " << temp.cols() << endreq; + msg(MSG::ERROR) << "Chech that the size of the matrix is a 1,1: " << temp.rows() << ", " << temp.cols() << endmsg; deltachisq = temp(0,0); @@ -489,7 +489,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() newSCT_Module->set_globaltolocal(globaltolocal); m_ModuleMap[SCT_ModuleID] = newSCT_Module; ++nSCT; - if (msgLvl(MSG::DEBUG)) msg() << "new SCT Module " << nSCT << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "new SCT Module " << nSCT << endmsg; @@ -573,7 +573,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() newPixel_Module->set_globaltolocal(globaltolocal); m_ModuleMap[Pixel_ModuleID] = newPixel_Module; ++nPixel; - if (msgLvl(MSG::DEBUG)) msg() << "new Pixel Module " << nPixel << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "new Pixel Module " << nPixel << endmsg; // add Pixel EC SurveyCoords if(abs(m_pixid->barrel_ec(Pixel_ModuleID)) == 2){ @@ -663,20 +663,20 @@ void SurveyConstraint::setup_SurveyConstraintModules() // ******************************************** // Do some tests for first Pixel EC module if (first){ - //if(SurveyTrans == CurrentTrans) msg(MSG::INFO) << "SurveyTrans == CurrentTrans" << endreq; - //if(surveyPoint == currentPoint) msg(MSG::INFO) << "surveyPoint == currentPoint" << endreq; - //if(globalSurveyPoint == globalCurrentPoint) msg(MSG::INFO) << "globalSurveyPoint == globalCurrentPoint" << endreq; + //if(SurveyTrans == CurrentTrans) msg(MSG::INFO) << "SurveyTrans == CurrentTrans" << endmsg; + //if(surveyPoint == currentPoint) msg(MSG::INFO) << "surveyPoint == currentPoint" << endmsg; + //if(globalSurveyPoint == globalCurrentPoint) msg(MSG::INFO) << "globalSurveyPoint == globalCurrentPoint" << endmsg; msg(MSG::INFO) << "Local Coordinates = (" << localSurveyCoords[iCorn][0] << "," - << localSurveyCoords[iCorn][1] << "," << localSurveyCoords[iCorn][2] << ")" << endreq; + << localSurveyCoords[iCorn][1] << "," << localSurveyCoords[iCorn][2] << ")" << endmsg; msg(MSG::INFO) << "Survey Local Coordinates = (" << surveyPoint[0] << "," - << surveyPoint[1] << "," << surveyPoint[2] << ")" << endreq; + << surveyPoint[1] << "," << surveyPoint[2] << ")" << endmsg; msg(MSG::INFO) << "Current Local Coordinates = (" << currentPoint[0] << "," - << currentPoint[1] << "," << currentPoint[2] << ")" << endreq; + << currentPoint[1] << "," << currentPoint[2] << ")" << endmsg; msg(MSG::INFO) << "Survey Global Coordinates = (" << globalSurveyPoint[0] << "," - << globalSurveyPoint[1] << "," << globalSurveyPoint[2] << ")" << endreq; + << globalSurveyPoint[1] << "," << globalSurveyPoint[2] << ")" << endmsg; msg(MSG::INFO) << "Current Global Coordinates = (" << globalCurrentPoint[0] << "," - << globalCurrentPoint[1] << "," << globalCurrentPoint[2] << ")" << endreq; - msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: nModulePoints " << m_ModuleMap[Pixel_ModuleID]->nModulePoints() << endreq; + << globalCurrentPoint[1] << "," << globalCurrentPoint[2] << ")" << endmsg; + msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: nModulePoints " << m_ModuleMap[Pixel_ModuleID]->nModulePoints() << endmsg; first = false; } // ******************************************** @@ -740,7 +740,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() << ", nPixModInMap " << nPixModInMap << ", nPixModEC " << nPixModEC << ", nPixModPointsEC " << nPixModPointsEC - << endreq; + << endmsg; @@ -776,7 +776,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() if (firstB){ std::vector< SurveyConstraintPoint > Testpoints; m_ModuleMap[Pixel_ModuleID]->getPoints(Testpoints,SurveyConstraintModule::Stave); - msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: Stavepoints.size() (from map) " << Testpoints.size() << endreq; + msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: Stavepoints.size() (from map) " << Testpoints.size() << endmsg; firstB = false; } // ******************************************** @@ -793,7 +793,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() << ", nPixModECPixModEC " << nPixModECPixModEC << ", nSameLayer " << nSameLayer << ", nNotIdentical " << nNotIdentical - << endreq; + << endmsg; // Pix B nPixModEC2 = 0;nPixModPixModEC = 0;nPixModECPixModEC = 0;nSameLayer = 0;nNotIdentical = 0; @@ -817,7 +817,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() << ", nPixModBPixModB " << nPixModECPixModEC << ", nSameLayer " << nSameLayer << ", nNotIdentical " << nNotIdentical - << endreq; + << endmsg; // SCT EC nPixModEC2 = 0;nPixModPixModEC = 0;nPixModECPixModEC = 0;nSameLayer = 0;nNotIdentical = 0; @@ -848,7 +848,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() ){ std::vector< SurveyConstraintPoint > Testpoints; m_ModuleMap[SCT_ModuleID]->getPoints(Testpoints,SurveyConstraintModule::Stave); - msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: Stavepoints.size() (from map) " << Testpoints.size() << endreq; + msg(MSG::INFO) << "SurveyConstraint().setup_SurveyConstraintModules: Stavepoints.size() (from map) " << Testpoints.size() << endmsg; } // ******************************************** @@ -859,7 +859,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() << ", nSCTModECSCTModEC " << nPixModECPixModEC << ", nSameLayer " << nSameLayer << ", nNotIdentical " << nNotIdentical - << endreq; + << endmsg; // SCT B nPixModEC2 = 0;nPixModPixModEC = 0;nPixModECPixModEC = 0;nSameLayer = 0;nNotIdentical = 0; @@ -885,7 +885,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() << ", nSCTModBSCTModB " << nPixModECPixModEC << ", nSameLayer " << nSameLayer << ", nNotIdentical " << nNotIdentical - << endreq; + << endmsg; // write out to Condstream1 and write out ntuple or textfile @@ -893,7 +893,7 @@ void SurveyConstraint::setup_SurveyConstraintModules() if(m_ntuple) survey_IDAlignDBTool->writeFile(true,m_surveywfile); else survey_IDAlignDBTool->writeFile(false,m_surveywfile); if (StatusCode::SUCCESS!=survey_IDAlignDBTool->outputObjs()) - msg(MSG::ERROR) << "Write of AlignableTransforms fails" << endreq; + msg(MSG::ERROR) << "Write of AlignableTransforms fails" << endmsg; } } diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraintTestAlg.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraintTestAlg.cxx index bcb98a25dd2..d53c4c0c0a4 100755 --- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraintTestAlg.cxx +++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/SurveyConstraintTestAlg.cxx @@ -38,45 +38,45 @@ AthAlgorithm(name, pSvcLocator), StatusCode SurveyConstraintTestAlg::initialize(){ // Part 1: Get the messaging service, print where you are - msg(MSG::INFO) << "initialize()" << endreq; + msg(MSG::INFO) << "initialize()" << endmsg; // Get The ToolSvc StatusCode sc = service("ToolSvc",m_toolsvc); if (sc.isFailure()) { - msg(MSG::FATAL) << "Could not find ToolSvc. Exiting." << endreq; + msg(MSG::FATAL) << "Could not find ToolSvc. Exiting." << endmsg; return sc; } // Get SurveyConstraint from ToolService sc = m_toolsvc->retrieveTool("SurveyConstraint",SurvConstr); if (sc.isFailure()) { - msg(MSG::FATAL) <<"Could not find SurveyConstraint Tool. Exiting."<<endreq; + msg(MSG::FATAL) <<"Could not find SurveyConstraint Tool. Exiting."<<endmsg; return sc; } // get PixelManager sc = detStore()->retrieve(m_pixelManager, "Pixel"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get PixelManager !" << endreq; + msg(MSG::ERROR) << "Could not get PixelManager !" << endmsg; return sc; } - msg(MSG::INFO) << "got m_pixelManager" << endreq; + msg(MSG::INFO) << "got m_pixelManager" << endmsg; // get SCTManager sc = detStore()->retrieve(m_SCT_Manager, "SCT"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get SCT_Manager !" << endreq; + msg(MSG::ERROR) << "Could not get SCT_Manager !" << endmsg; return sc; } - msg(MSG::INFO) << "got m_SCT_Manager" << endreq; + msg(MSG::INFO) << "got m_SCT_Manager" << endmsg; // get ID helpers from detector store (relying on GeoModel to put them) if ((StatusCode::SUCCESS!=detStore()->retrieve(m_pixid)) || (StatusCode::SUCCESS!=detStore()->retrieve(m_sctid))) { - msg(MSG::FATAL) << "Problem retrieving ID helpers" << endreq; + msg(MSG::FATAL) << "Problem retrieving ID helpers" << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "got ID helpers from detector store (relying on GeoModel to put them)" << endreq; + msg(MSG::INFO) << "got ID helpers from detector store (relying on GeoModel to put them)" << endmsg; // book histograms BookHist(); @@ -95,7 +95,7 @@ return StatusCode::SUCCESS; if ( !nt ) { // Check if already booked nt = ntupleSvc()->book("/NTUPLES/FILE1/InitialAlignment", CLID_ColumnWiseTuple, "InitialAlignment"); if ( nt ) { - msg(MSG::INFO) << "InitialAlignment ntuple booked." << endreq; + msg(MSG::INFO) << "InitialAlignment ntuple booked." << endmsg; sc = nt->addItem("x" , m_AlignResults_x); sc = nt->addItem("y" , m_AlignResults_y); @@ -111,7 +111,7 @@ return StatusCode::SUCCESS; sc = nt->addItem("Eta" , m_AlignResults_Identifier_Eta); } else { // did not manage to book the N tuple.... - msg(MSG::ERROR) << "Failed to book InitialAlignment ntuple." << endreq; + msg(MSG::ERROR) << "Failed to book InitialAlignment ntuple." << endmsg; } } @@ -156,7 +156,7 @@ return StatusCode::SUCCESS; // Write out AlignResults ntuple sc = ntupleSvc()->writeRecord("NTUPLES/FILE1/InitialAlignment"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not write InitialAlignment ntuple." << endreq; + msg(MSG::ERROR) << "Could not write InitialAlignment ntuple." << endmsg; } } // end of module loop @@ -167,7 +167,7 @@ return StatusCode::SUCCESS; StatusCode SurveyConstraintTestAlg::execute() { // Part 1: Get the messaging service, print where you are -msg(MSG::INFO) << "execute()" << endreq; +msg(MSG::INFO) << "execute()" << endmsg; float m_multipl=1.E3; @@ -207,25 +207,25 @@ msg(MSG::INFO) << "execute()" << endreq; if (msgLvl(MSG::DEBUG)) msg() << "Pixel_ModuleID = " << Pixel_ModuleID - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "alignment parameters = (" << dparams[0] << "," << dparams[1] << "," << dparams[2] << "," << dparams[3] << "," << dparams[4] << "," << dparams[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "chi^2 = " << deltachisq - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Vector = (" << DOCA_Vector[0] << "," << DOCA_Vector[1] << "," << DOCA_Vector[2] << "," << DOCA_Vector[3] << "," << DOCA_Vector[4] << "," << DOCA_Vector[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,0) << "," << DOCA_Matrix(2,0) << "," << DOCA_Matrix(3,0) << "," << DOCA_Matrix(4,0) << "," << DOCA_Matrix(5,0) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,1) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,1) << "," << DOCA_Matrix(3,1) << "," << DOCA_Matrix(4,1) << "," << DOCA_Matrix(5,1) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,2) << "," << DOCA_Matrix(3,2) << "," << DOCA_Matrix(4,4) << "," << DOCA_Matrix(5,5) << ")" - << endreq; + << endmsg; //break; } } @@ -242,25 +242,25 @@ msg(MSG::INFO) << "execute()" << endreq; DOCA_Matrix); if (msgLvl(MSG::DEBUG)) msg() << "Pixel Barrel ModuleID = " << Pixel_ModuleID - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "alignment parameters = (" << dparams[0] << "," << dparams[1] << "," << dparams[2] << "," << dparams[3] << "," << dparams[4] << "," << dparams[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "chi^2 = " << deltachisq - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Vector = (" << DOCA_Vector[0] << "," << DOCA_Vector[1] << "," << DOCA_Vector[2] << "," << DOCA_Vector[3] << "," << DOCA_Vector[4] << "," << DOCA_Vector[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,0) << "," << DOCA_Matrix(2,0) << "," << DOCA_Matrix(3,0) << "," << DOCA_Matrix(4,0) << "," << DOCA_Matrix(5,0) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,1) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,1) << "," << DOCA_Matrix(3,1) << "," << DOCA_Matrix(4,1) << "," << DOCA_Matrix(5,1) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,2) << "," << DOCA_Matrix(3,2) << "," << DOCA_Matrix(4,4) << "," << DOCA_Matrix(5,5) << ")" - << endreq; + << endmsg; break; } } @@ -276,25 +276,25 @@ msg(MSG::INFO) << "execute()" << endreq; DOCA_Matrix); if (msgLvl(MSG::DEBUG)) msg() << "SCT_ModuleID = " << SCT_ModuleID - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "alignment parameters = (" << dparams[0] << "," << dparams[1] << "," << dparams[2] << "," << dparams[3] << "," << dparams[4] << "," << dparams[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "chi^2 = " << deltachisq - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Vector = (" << DOCA_Vector[0] << "," << DOCA_Vector[1] << "," << DOCA_Vector[2] << "," << DOCA_Vector[3] << "," << DOCA_Vector[4] << "," << DOCA_Vector[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,0) << "," << DOCA_Matrix(2,0) << "," << DOCA_Matrix(3,0) << "," << DOCA_Matrix(4,0) << "," << DOCA_Matrix(5,0) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,1) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,1) << "," << DOCA_Matrix(3,1) << "," << DOCA_Matrix(4,1) << "," << DOCA_Matrix(5,1) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,2) << "," << DOCA_Matrix(3,2) << "," << DOCA_Matrix(4,4) << "," << DOCA_Matrix(5,5) << ")" - << endreq; + << endmsg; break; } } @@ -311,25 +311,25 @@ msg(MSG::INFO) << "execute()" << endreq; DOCA_Matrix); if (msgLvl(MSG::DEBUG)) msg() << "SCT Barrel ModuleID = " << SCT_ModuleID - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "alignment parameters = (" << dparams[0] << "," << dparams[1] << "," << dparams[2] << "," << dparams[3] << "," << dparams[4] << "," << dparams[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "chi^2 = " << deltachisq - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Vector = (" << DOCA_Vector[0] << "," << DOCA_Vector[1] << "," << DOCA_Vector[2] << "," << DOCA_Vector[3] << "," << DOCA_Vector[4] << "," << DOCA_Vector[5] << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,0) << "," << DOCA_Matrix(2,0) << "," << DOCA_Matrix(3,0) << "," << DOCA_Matrix(4,0) << "," << DOCA_Matrix(5,0) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,1) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,1) << "," << DOCA_Matrix(3,1) << "," << DOCA_Matrix(4,1) << "," << DOCA_Matrix(5,1) << ")" - << endreq; + << endmsg; if (msgLvl(MSG::DEBUG)) msg() << "DOCA_Matrix = (" <<DOCA_Matrix(0,0) << "," << DOCA_Matrix(1,1) << "," << DOCA_Matrix(2,2) << "," << DOCA_Matrix(3,2) << "," << DOCA_Matrix(4,4) << "," << DOCA_Matrix(5,5) << ")" - << endreq; + << endmsg; break; } } @@ -342,13 +342,13 @@ msg(MSG::INFO) << "execute()" << endreq; StatusCode SurveyConstraintTestAlg::finalize() { // Part 1: Get the messaging service, print where you are - msg(MSG::INFO) << "finalize()" << endreq; + msg(MSG::INFO) << "finalize()" << endmsg; msg(MSG::INFO) << "mm = " << CLHEP::mm << ", mrad = " << CLHEP::mrad << ", micrometer = " << CLHEP::micrometer << ", deg = " << CLHEP::deg - << endreq; + << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx index cfaaf4e6f85..ec5c99dac48 100644 --- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx +++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx @@ -101,21 +101,21 @@ StatusCode DetailedIDNtupleTool::initialize() // AG: init truthToTrack if (m_truthToTrack.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_truthToTrack << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_truthToTrack << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved TruthToTrack Tool: " << m_truthToTrack); /* Retrieve extrapolator tool */ if (m_extrapolator.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool "<<m_extrapolator<<endreq; + msg(MSG::FATAL) << "Failed to retrieve tool "<<m_extrapolator<<endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved Extrapolator Tool " << m_extrapolator); // get AlignModuleTool if ( m_alignModuleTool.empty() || m_alignModuleTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " <<m_alignModuleTool<< endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " <<m_alignModuleTool<< endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool " << m_alignModuleTool); @@ -160,7 +160,7 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac ATH_MSG_DEBUG("Retrieving event info."); const xAOD::EventInfo * eventInfo; if (evtStore()->retrieve(eventInfo).isFailure()) - msg(MSG::ERROR) << "Could not retrieve event info." << endreq; + msg(MSG::ERROR) << "Could not retrieve event info." << endmsg; else { m_runNumber = eventInfo->runNumber(); @@ -195,7 +195,7 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac const Trk::Perigee * aMeasPer = (alignTrack->perigeeParameters()); if (aMeasPer==0){ - msg(MSG::ERROR) << "Could not get Trk::Perigee of the alignTrack" << endreq; + msg(MSG::ERROR) << "Could not get Trk::Perigee of the alignTrack" << endmsg; return; } else @@ -234,7 +234,7 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac // get fit quality and chi2 probability of track const Trk::FitQuality * fitQual = alignTrack->fitQuality(); if (fitQual==0) - msg(MSG::ERROR) << "No fit quality assigned to the track" << endreq; + msg(MSG::ERROR) << "No fit quality assigned to the track" << endmsg; else { if (fitQual->chiSquared() > 0. && fitQual->numberDoF() > 0) @@ -259,20 +259,20 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac //HepGeom::Point3D<double> refPoint = measbase->associatedSurface().center(); Amg::Vector3D refPoint = measbase->associatedSurface().center(); const Trk::VertexOnTrack* vot = dynamic_cast<const Trk::VertexOnTrack*> (measbase); - msg(MSG::DEBUG) <<" VoT get from the alignTrack:" << *vot << endreq; + msg(MSG::DEBUG) <<" VoT get from the alignTrack:" << *vot << endmsg; if(!vot) { - msg(MSG::ERROR) << " Seems the pseudo-measuremnt in the alignTrack not exist!" << endreq; - msg(MSG::ERROR) << " this pseudo-measurement has been rejected as outlier in the refitting!" << endreq; + msg(MSG::ERROR) << " Seems the pseudo-measuremnt in the alignTrack not exist!" << endmsg; + msg(MSG::ERROR) << " this pseudo-measurement has been rejected as outlier in the refitting!" << endmsg; return; } - msg(MSG::DEBUG)<<" the pseudo-measurement position: "<< refPoint << endreq; + msg(MSG::DEBUG)<<" the pseudo-measurement position: "<< refPoint << endmsg; const Trk::Track* originalTrack = alignTrack->originalTrack(); //const Trk::MeasuredPerigee * originalMeasPer = dynamic_cast<const Trk::MeasuredPerigee*>(originalTrack->perigeeParameters()); const Trk::Perigee * originalMeasPer = originalTrack->perigeeParameters(); if(!(originalTrack && originalMeasPer)){ - msg(MSG::ERROR) << "No original track!" << endreq; + msg(MSG::ERROR) << "No original track!" << endmsg; } else{ @@ -303,7 +303,7 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac // get fit quality and chi2 probability of original Track const Trk::FitQuality * originalFitQual = originalTrack->fitQuality(); if (originalFitQual==0) - msg(MSG::ERROR) << "No fit quality assigned to the track" << endreq; + msg(MSG::ERROR) << "No fit quality assigned to the track" << endmsg; else { if (originalFitQual->chiSquared() > 0. && originalFitQual->numberDoF() > 0) @@ -326,10 +326,10 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac const Trk::Perigee * originalTrackPerigee = originalTrack->perigeeParameters(); if ( originalTrackPerigee && ((originalTrackPerigee->associatedSurface())) == persf ) { - msg(MSG::DEBUG) << "Perigee of Track is already expressed to given vertex, a copy is returned." << endreq; + msg(MSG::DEBUG) << "Perigee of Track is already expressed to given vertex, a copy is returned." << endmsg; originalPerigeeAtRef = originalTrackPerigee->clone(); } else - msg(MSG::DEBUG) << "Extrapolation to Perigee failed, NULL pointer is returned." << endreq; + msg(MSG::DEBUG) << "Extrapolation to Perigee failed, NULL pointer is returned." << endmsg; } if(originalPerigeeAtRef){ @@ -350,10 +350,10 @@ void DetailedIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrac const Trk::Perigee* alignTrackPerigee = alignTrack->perigeeParameters(); if ( alignTrackPerigee && ((alignTrackPerigee->associatedSurface())) == persf ) { - msg(MSG::DEBUG) << "Perigee of AlignTrack is already expressed to given vertex, a copy is returned." << endreq; + msg(MSG::DEBUG) << "Perigee of AlignTrack is already expressed to given vertex, a copy is returned." << endmsg; PerigeeAtRef = alignTrackPerigee->clone(); } else - msg(MSG::DEBUG) << "Extrapolation to Perigee failed, NULL pointer is returned." << endreq; + msg(MSG::DEBUG) << "Extrapolation to Perigee failed, NULL pointer is returned." << endmsg; } //post-eigen, can simply use the TrackParameters * returned by m_extrapolator->extrapolate? @@ -390,7 +390,7 @@ bool DetailedIDNtupleTool::retrieveTruthInfo(const Trk::AlignTrack * alignTrack) const TrackCollection * RecCollection = NULL; if (evtStore()->retrieve(RecCollection, m_trackCollection).isFailure()) { - if (msgLvl(MSG::DEBUG)) msg() <<"Track collection \"" << m_trackCollection << "\" not found." << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"Track collection \"" << m_trackCollection << "\" not found." << endmsg; return false; } if (RecCollection) @@ -400,7 +400,7 @@ bool DetailedIDNtupleTool::retrieveTruthInfo(const Trk::AlignTrack * alignTrack) // get TrackTruthCollection const TrackTruthCollection * TruthMap = NULL; if (StatusCode::SUCCESS != evtStore()->retrieve(TruthMap,m_tracksTruthName)) { - if (msgLvl(MSG::DEBUG)) msg() << "Cannot find " << m_tracksTruthName << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Cannot find " << m_tracksTruthName << endmsg; return false; } @@ -440,12 +440,12 @@ bool DetailedIDNtupleTool::retrieveTruthInfo(const Trk::AlignTrack * alignTrack) if (genparptr->production_vertex()) { if(genparptr->pdg_id() == 0) { - //msg(MSG::WARNING) <<" Particle with PDG ID = 0! Status "<<genparptr->status()<<" mass "<< genparptr->momentum().m() <<" pt "<<genparptr->momentum().et()<<" eta "<<genparptr->momentum().eta()<<" phi "<<genparptr->momentum().phi()<<" Gen Vertex barcode "<<genparptr->production_vertex()->barcode()<<"Gen Vertex Position x" <<genparptr->production_vertex()->position().x()<< " y "<<genparptr->production_vertex()->position().y()<<" z "<<genparptr->production_vertex()->position().z()<<endreq; + //msg(MSG::WARNING) <<" Particle with PDG ID = 0! Status "<<genparptr->status()<<" mass "<< genparptr->momentum().m() <<" pt "<<genparptr->momentum().et()<<" eta "<<genparptr->momentum().eta()<<" phi "<<genparptr->momentum().phi()<<" Gen Vertex barcode "<<genparptr->production_vertex()->barcode()<<"Gen Vertex Position x" <<genparptr->production_vertex()->position().x()<< " y "<<genparptr->production_vertex()->position().y()<<" z "<<genparptr->production_vertex()->position().z()<<endmsg; } else { const Trk::TrackParameters * generatedTrackPerigee = m_truthToTrack->makePerigeeParameters(genparptr); if (!generatedTrackPerigee) - msg(MSG::WARNING)<< "Unable to extrapolate genparticle to perigee!"<< endreq; + msg(MSG::WARNING)<< "Unable to extrapolate genparticle to perigee!"<< endmsg; else { flag = true; @@ -491,7 +491,7 @@ const Trk::TrackParameters* DetailedIDNtupleTool::perigeeParameter(const Trk::Al break; } if (it == alignTrack->trackStateOnSurfaces()->end()){ - msg(MSG::ERROR) << "Strange there is no perigee of the alignTrack" << endreq; + msg(MSG::ERROR) << "Strange there is no perigee of the alignTrack" << endmsg; return 0; } @@ -499,7 +499,7 @@ const Trk::TrackParameters* DetailedIDNtupleTool::perigeeParameter(const Trk::Al const Trk::TrackParameters* aMeasPer = ((*it)->trackParameters()); if (aMeasPer==0){ - msg(MSG::ERROR) << "Could not get Trk::MeasuredPerigee of the alignTrack" << endreq; + msg(MSG::ERROR) << "Could not get Trk::MeasuredPerigee of the alignTrack" << endmsg; return 0; } return aMeasPer; diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/SimpleIDNtupleTool.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/SimpleIDNtupleTool.cxx index a4bc0786052..987a2f7367f 100644 --- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/SimpleIDNtupleTool.cxx +++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/SimpleIDNtupleTool.cxx @@ -155,21 +155,21 @@ StatusCode SimpleIDNtupleTool::initialize() // retrieve TRT ID helper if ( detStore()->retrieve(m_idHelper, "TRT_ID").isFailure() ) { - msg(MSG::FATAL) << " Cannot retrieve TRT ID Helper " << endreq; + msg(MSG::FATAL) << " Cannot retrieve TRT ID Helper " << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("retrieved TRT ID Helper"); // get TrackSummaryTool if ( m_trackSumTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " <<m_trackSumTool<< endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " <<m_trackSumTool<< endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool " << m_trackSumTool); // get AlignModuleTool if ( m_alignModuleTool.empty() || m_alignModuleTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " <<m_alignModuleTool<< endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " <<m_alignModuleTool<< endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool " << m_alignModuleTool); @@ -208,7 +208,7 @@ void SimpleIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrack) ATH_MSG_DEBUG("Retrieving event info."); const xAOD::EventInfo * eventInfo; if (evtStore()->retrieve(eventInfo).isFailure()) - msg(MSG::ERROR) << "Could not retrieve event info." << endreq; + msg(MSG::ERROR) << "Could not retrieve event info." << endmsg; else { m_runNumber = eventInfo->runNumber(); @@ -229,7 +229,7 @@ void SimpleIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrack) const Trk::Perigee * aMeasPer = (alignTrack->perigeeParameters()); if (aMeasPer==0) - msg(MSG::ERROR) << "Could not get Trk::MeasuredPerigee" << endreq; + msg(MSG::ERROR) << "Could not get Trk::MeasuredPerigee" << endmsg; else { m_d0 = aMeasPer->parameters()[Trk::d0]; @@ -241,9 +241,9 @@ void SimpleIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrack) if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << itrk << ". " - << " Track Parameters (d0, z0, phi0, theta, q/p)" << endreq; + << " Track Parameters (d0, z0, phi0, theta, q/p)" << endmsg; msg(MSG::DEBUG) << " " << m_d0 << ", " << m_z0 << ", " - << m_phi0 << ", " << m_theta << ", " << m_qoverp << endreq; + << m_phi0 << ", " << m_theta << ", " << m_qoverp << endmsg; } m_pt = sqrt((aMeasPer->momentum().x())*(aMeasPer->momentum().x()) @@ -258,7 +258,7 @@ void SimpleIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrack) const Trk::TrackSummary * summary = m_trackSumTool->createSummary((*alignTrack)); if(summary==0) - msg(MSG::ERROR) << "Could not get Trk::TrackSummary" << endreq; + msg(MSG::ERROR) << "Could not get Trk::TrackSummary" << endmsg; else { // hits @@ -301,7 +301,7 @@ void SimpleIDNtupleTool::dumpTrack(int itrk, const Trk::AlignTrack * alignTrack) // get fit quality and chi2 probability of track const Trk::FitQuality * fitQual = alignTrack->fitQuality(); if (fitQual==0) - msg(MSG::ERROR) << "No fit quality assigned to the track" << endreq; + msg(MSG::ERROR) << "No fit quality assigned to the track" << endmsg; else { if (fitQual->chiSquared() > 0. && fitQual->numberDoF() > 0) diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/RefitTracksAndVertex.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/RefitTracksAndVertex.cxx index 088b0389fc9..415b96885d5 100644 --- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/RefitTracksAndVertex.cxx +++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/RefitTracksAndVertex.cxx @@ -266,7 +266,7 @@ Trk::Track* RefitTracksAndVertex::fitSCTOnlyTrack(const Trk::Track* track) { for ( ; it!=itEnd; ++it){ if( !(*it) ) { // log (MSG::WARNING) << "The MeasurementBase set has a void" - // << " member! Skip it.." << endreq; + // << " member! Skip it.." << endmsg; } else { const Trk::RIO_OnTrack* rio = dynamic_cast <const Trk::RIO_OnTrack*>(*it); if (rio != 0) { diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx index ca9b81c10ec..6183b8dba66 100644 --- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx +++ b/InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx @@ -66,11 +66,11 @@ StatusCode BeamCondSvc::initialize() { // service initialisation - get parameters, setup default cache // and register for condDB callbacks if needed - msg(MSG::INFO) << "in initialize()" << endreq; + msg(MSG::INFO) << "in initialize()" << endmsg; // get detector store if (p_detstore.retrieve().isFailure()) { - msg(MSG::FATAL) << "Detector store not found" << endreq; + msg(MSG::FATAL) << "Detector store not found" << endmsg; return StatusCode::FAILURE; } // always init cache to joboption values in case CondDB read fails @@ -81,18 +81,18 @@ StatusCode BeamCondSvc::initialize() const DataHandle<AthenaAttributeList> aptr; if (StatusCode::SUCCESS==p_detstore->regFcn(&BeamCondSvc::update,this, aptr, INDET_BEAMPOS )) { - msg(MSG::DEBUG) << "Registered callback for beam position" << endreq; + msg(MSG::DEBUG) << "Registered callback for beam position" << endmsg; } else { - msg(MSG::ERROR) << "Callback registration failed" << endreq; + msg(MSG::ERROR) << "Callback registration failed" << endmsg; } } else { msg(MSG::INFO) << "Default beamspot parameters will be used (from jobopt) " << - endreq << "Beamspot status " << par_status << - endreq << "Beamspot position (" << par_posx << "," << par_posy << "," << - par_posz << ")" << endreq << "RMS size (" << par_sigx << "," << par_sigy - << "," << par_sigz << ")" << endreq << "Tilt xz yz/radian (" << - par_tiltx << "," << par_tilty << ")" << endreq; + endmsg << "Beamspot status " << par_status << + endmsg << "Beamspot position (" << par_posx << "," << par_posy << "," << + par_posz << ")" << endmsg << "RMS size (" << par_sigx << "," << par_sigy + << "," << par_sigz << ")" << endmsg << "Tilt xz yz/radian (" << + par_tiltx << "," << par_tilty << ")" << endmsg; } return StatusCode::SUCCESS; } @@ -152,7 +152,7 @@ bool BeamCondSvc::fillRec() const { aspec->extend("tiltY","float"); aspec->extend("sigmaXY","float"); if (!aspec->size()) msg(MSG::ERROR) << - "Attribute list specification is empty!" << endreq; + "Attribute list specification is empty!" << endmsg; AthenaAttributeList* alist=new AthenaAttributeList(*aspec); // set status to 1 for now - for future use (*alist)["status"].setValue(par_status); @@ -167,9 +167,9 @@ bool BeamCondSvc::fillRec() const { (*alist)["sigmaXY"].setValue(par_sigxy); // record Beampos object in TDS if (StatusCode::SUCCESS==p_detstore->record(alist, INDET_BEAMPOS )) { - if (msgLvl(MSG::INFO)) msg() << "Recorded Beampos object in TDS" << endreq; + if (msgLvl(MSG::INFO)) msg() << "Recorded Beampos object in TDS" << endmsg; } else { - msg(MSG::ERROR) << "Could not record Beampos object" << endreq; + msg(MSG::ERROR) << "Could not record Beampos object" << endmsg; return false; } return true; @@ -181,7 +181,7 @@ StatusCode BeamCondSvc::update( IOVSVC_CALLBACK_ARGS_P(I,keys) ) { msg() << "update callback invoked for I=" << I << " keys: "; for (std::list<std::string>::const_iterator itr=keys.begin(); itr!=keys.end(); ++itr) msg() << " " << *itr; - msg() << endreq; + msg() << endmsg; // read the Beampos object const AthenaAttributeList* atrlist=0; if (StatusCode::SUCCESS==p_detstore->retrieve(atrlist, INDET_BEAMPOS ) && @@ -204,7 +204,7 @@ StatusCode BeamCondSvc::update( IOVSVC_CALLBACK_ARGS_P(I,keys) ) { catch (coral::AttributeListException& e) { sigxy=0.; if (msgLvl(MSG::DEBUG)) - msg() << "No sigmaXY retrieved from conditions DB, assume 0" << endreq; + msg() << "No sigmaXY retrieved from conditions DB, assume 0" << endmsg; } if (msgLvl(MSG::INFO)) msg() << "Read from condDB" @@ -213,10 +213,10 @@ StatusCode BeamCondSvc::update( IOVSVC_CALLBACK_ARGS_P(I,keys) ) { << " sigma (" << sigx << "," << sigy << "," << sigz << ")" << " tilt (" << tiltx << "," << tilty << ")" << " sigmaXY " << sigxy - << endreq; + << endmsg; initCache(status,posx,posy,posz,sigx,sigy,sigz,sigxy,tiltx,tilty); } else { - msg(MSG::ERROR) << "Problem reading condDB object" << endreq; + msg(MSG::ERROR) << "Problem reading condDB object" << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTCondWrite.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTCondWrite.cxx index 3894a994415..a6e417fd961 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTCondWrite.cxx +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTCondWrite.cxx @@ -42,7 +42,7 @@ StatusCode TRTCondWrite::initialize() { //get Database manager tool if (StatusCode::SUCCESS!=m_caldbtool.retrieve()) { - msg(MSG::FATAL) << "TRTCalDbTool not found" << endreq; + msg(MSG::FATAL) << "TRTCalDbTool not found" << endmsg; return StatusCode::FAILURE; } ATH_MSG_DEBUG(" TRTCalDbTool found "); @@ -50,7 +50,7 @@ StatusCode TRTCondWrite::initialize() { ATH_MSG_DEBUG(" TRT Calibration objects will be created"); if (par_calfile!="") { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << " Constants will read from text file " << par_calfile << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << " Constants will read from text file " << par_calfile << endmsg; } else { ATH_MSG_INFO(" You have supplied no input file "); ATH_MSG_INFO(" Assume you want to check the Db by dumping contents "); @@ -76,7 +76,7 @@ StatusCode TRTCondWrite::execute() { if (par_calfile!="") sc=m_caldbtool->readTextFile(par_calfile); if(sc!=StatusCode::SUCCESS) { msg(MSG::ERROR) << " Could not read TRT Calibration objects from " - << par_calfile << endreq; + << par_calfile << endmsg; return sc; } diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawAlign.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawAlign.cxx index 7ca442b0416..7aece4bc593 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawAlign.cxx +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawAlign.cxx @@ -76,7 +76,7 @@ StatusCode TRTStrawAlign::initialize() { StatusCode sc = AthAlgorithm::detStore()->retrieve(m_trtman,"TRT"); if(sc.isFailure() || m_trtman==0) { - msg(MSG::FATAL) << "Could not find TRT manager " << endreq; + msg(MSG::FATAL) << "Could not find TRT manager " << endmsg; return StatusCode::FAILURE; } @@ -90,55 +90,55 @@ StatusCode TRTStrawAlign::initialize() { //get Database manager tools if (m_doStrawAlign) { if (StatusCode::SUCCESS!=p_caldbtool.retrieve()) { - msg(MSG::FATAL) << "TRTStrawAlignDbTool not found" << endreq; + msg(MSG::FATAL) << "TRTStrawAlignDbTool not found" << endmsg; return StatusCode::FAILURE; } ATH_MSG_DEBUG(" TRTStrawAlignDbTool found "); if (m_doWriteToPOOL && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Straw alignment will be written to POOL file " - << m_outputPOOLFile << endreq; + << m_outputPOOLFile << endmsg; if (m_doRegIOV) { ATH_MSG_INFO("Straw alignment will be registered with IOV"); if (msgLvl(MSG::INFO)) { msg(MSG::INFO) << " run range: " - << m_runRangeBegin << " to " << m_runRangeEnd << endreq; - msg(MSG::INFO) << " version tag: " << m_stawAlignTag << endreq; + << m_runRangeBegin << " to " << m_runRangeEnd << endmsg; + msg(MSG::INFO) << " version tag: " << m_stawAlignTag << endmsg; } } if (m_inputStrawAlignmentTextFile!="" && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Straw Alignment will read from text file " - << m_inputStrawAlignmentTextFile << endreq; + << m_inputStrawAlignmentTextFile << endmsg; if (m_outputStrawAlignmentTextFile!="" && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Straw Alignment will be written on text file " - << m_outputStrawAlignmentTextFile << endreq; + << m_outputStrawAlignmentTextFile << endmsg; } if (m_doModuleAlign) { if (StatusCode::SUCCESS!=p_aligndbtool.retrieve()) { - msg(MSG::FATAL) << "TRTAlignDbTool not found" << endreq; + msg(MSG::FATAL) << "TRTAlignDbTool not found" << endmsg; return StatusCode::FAILURE; } ATH_MSG_DEBUG(" TRTAlignDbTool found "); if (m_doWriteToPOOL && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Module alignment will be written to POOL file " - << m_outputPOOLFile << endreq; + << m_outputPOOLFile << endmsg; if (m_doRegIOV) { ATH_MSG_INFO("Module alignment will be registered with IOV"); if ( msgLvl(MSG::INFO) ) { msg(MSG::INFO) << " run range: " << m_runRangeBegin << " to " << m_runRangeEnd - << endreq; - msg(MSG::INFO) << " version tag: " << m_moduleAlignTag << endreq; + << endmsg; + msg(MSG::INFO) << " version tag: " << m_moduleAlignTag << endmsg; } } if (m_inputModuleAlignmentTextFile!="" && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Module Alignment will read from text file " - << m_inputModuleAlignmentTextFile << endreq; + << m_inputModuleAlignmentTextFile << endmsg; if (m_outputModuleAlignmentTextFile!="" && msgLvl(MSG::INFO)) msg(MSG::INFO) << "Module Alignment will be written on text file " - << m_outputModuleAlignmentTextFile << endreq; + << m_outputModuleAlignmentTextFile << endmsg; } return StatusCode::SUCCESS; @@ -159,7 +159,7 @@ StatusCode TRTStrawAlign::execute() { sc=p_caldbtool->readTextFile(m_inputStrawAlignmentTextFile); if(sc!=StatusCode::SUCCESS) { msg(MSG::ERROR) << " Could not read input text file " - << endreq; + << endmsg; return StatusCode::FAILURE; } } @@ -169,7 +169,7 @@ StatusCode TRTStrawAlign::execute() { sc=p_caldbtool->writeTextFile(m_outputStrawAlignmentTextFile); if(sc!=StatusCode::SUCCESS) { msg(MSG::ERROR) << " Could not write output text file " - << endreq; + << endmsg; return StatusCode::FAILURE; } } @@ -177,14 +177,14 @@ StatusCode TRTStrawAlign::execute() { if(m_doWriteToPOOL) { if( StatusCode::SUCCESS != p_caldbtool->streamOutObjects()) { msg(MSG::ERROR) << " Could not stream Straw Alignment objects to " - << m_outputPOOLFile << endreq; + << m_outputPOOLFile << endmsg; return StatusCode::FAILURE; } } if(m_doRegIOV) { if( StatusCode::SUCCESS != p_caldbtool->registerObjects(m_stawAlignTag,m_runRangeBegin,m_eventRangeBegin,m_runRangeEnd,m_eventRangeEnd) ) { msg(MSG::ERROR) << " Could not register Straw Alignment objects " - << endreq; + << endmsg; return StatusCode::FAILURE; } } @@ -196,7 +196,7 @@ StatusCode TRTStrawAlign::execute() { sc=p_aligndbtool->readAlignTextFile(m_inputModuleAlignmentTextFile); if(sc!=StatusCode::SUCCESS) { msg(MSG::ERROR) << " Could not read input text file " - << endreq; + << endmsg; return StatusCode::FAILURE; } } @@ -205,14 +205,14 @@ StatusCode TRTStrawAlign::execute() { if (m_outputModuleAlignmentTextFile!="") { sc=p_aligndbtool->writeAlignTextFile(m_outputModuleAlignmentTextFile); if(sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Could not write output text file " << endreq; + msg(MSG::ERROR) << " Could not write output text file " << endmsg; return StatusCode::FAILURE; } } if(m_doWriteToPOOL) { if( StatusCode::SUCCESS != p_aligndbtool->streamOutAlignObjects()) { - msg(MSG::ERROR) << " Could not stream Module Alignment objects to " << m_outputPOOLFile << endreq; + msg(MSG::ERROR) << " Could not stream Module Alignment objects to " << m_outputPOOLFile << endmsg; return StatusCode::FAILURE; } } @@ -223,7 +223,7 @@ StatusCode TRTStrawAlign::execute() { ,m_runRangeEnd ,m_eventRangeEnd) ) { - msg(MSG::ERROR) << " Could not register Module Alignment objects " << endreq; + msg(MSG::ERROR) << " Could not register Module Alignment objects " << endmsg; return StatusCode::FAILURE; } } @@ -248,9 +248,9 @@ StatusCode TRTStrawAlign::finalize() { float z = element->strawCenter(str).z(); if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "bec -1 layer 0 sector 1 plane " - << strlay << " straw " << str << endreq; + << strlay << " straw " << str << endmsg; if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) - << " x " << x << " y " << y << " z " << z << endreq; + << " x " << x << " y " << y << " z " << z << endmsg; id=m_trt->layer_id(1,1,0,strlay); element = m_trtman->getElement(id); y = element->strawCenter(str).x(); @@ -258,9 +258,9 @@ StatusCode TRTStrawAlign::finalize() { z = element->strawCenter(str).z(); if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "bec 1 layer 0 sector 1 plane " - << strlay << " straw " << str << endreq; + << strlay << " straw " << str << endmsg; if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) - << " x " << x << " y " << y << " z " << z << endreq; + << " x " << x << " y " << y << " z " << z << endmsg; } } diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx index ecea4bccfc4..60b64b67af6 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawStatusWrite.cxx @@ -37,24 +37,24 @@ StatusCode TRTStrawStatusWrite::initialize() // par_statusfile="/afs/cern.ch/user/i/idcalib/w0/TRT_Calibration/uploadedDB/Status/2010_09_10_sasa/listNoisyStraws.0162690.athenaFormat.txt"; //"/afs/cern.ch/user/a/attrtcal/TRT_Calibration/uploadedDB/Status/2010_06_30/listNoisyStraws.0158269.athenaFormat.txt"; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRTStrawStatusWrite initialise" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRTStrawStatusWrite initialise" << endmsg; StatusCode sc; if(StatusCode::SUCCESS != m_trtStrawStatusIF.retrieve()){ - msg(MSG::ERROR) << " Can't get TRTStrawtatusTool" << endreq; + msg(MSG::ERROR) << " Can't get TRTStrawtatusTool" << endmsg; return StatusCode::FAILURE; } /* m_trtStrawStatus=dynamic_cast<TRTStrawStatusSummaryTool *>(&(* m_trtStrawStatusIF)); if(!m_trtStrawStatus){ - msg(MSG::ERROR) << " Can't do a dynamic cast to TRTStrawStatusSummaryTool" << endreq; + msg(MSG::ERROR) << " Can't do a dynamic cast to TRTStrawStatusSummaryTool" << endmsg; return StatusCode::FAILURE; } */ if( m_trtStrawStatus.retrieve().isFailure() ) { - msg(MSG::ERROR) << " Can't do a dynamic cast to TRTStrawStatusSummaryTool" << endreq; + msg(MSG::ERROR) << " Can't do a dynamic cast to TRTStrawStatusSummaryTool" << endmsg; return StatusCode::FAILURE; } @@ -75,7 +75,7 @@ StatusCode TRTStrawStatusWrite::execute() // par_statusfile="/afs/cern.ch/user/i/idcalib/w0/TRT_Calibration/uploadedDB/Status/2010_09_10_sasa/listNoisyStraws.0162690.athenaFormat.txt"; // "/afs/cern.ch/user/a/attrtcal/TRT_Calibration/uploadedDB/Status/2010_06_30/listNoisyStraws.0158269.athenaFormat.txt"; - msg(MSG::INFO) << "TRTStrawStatusWrite::execute write DB tag for straw status file " << par_statusfile << endreq; + msg(MSG::INFO) << "TRTStrawStatusWrite::execute write DB tag for straw status file " << par_statusfile << endmsg; // // at first event: @@ -91,7 +91,7 @@ sc=m_trtStrawStatus->readFromTextFile(par_statusfile); if(sc!=StatusCode::SUCCESS) { msg(MSG::ERROR) << " Could not read TRT StrawStatusSummary objects from " - << par_statusfile << endreq; + << par_statusfile << endmsg; return StatusCode::FAILURE; } // diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/TrackFilter.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/TrackFilter.cxx index 4e94846ff8c..2f2c3b4ac8f 100755 --- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/TrackFilter.cxx +++ b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/TrackFilter.cxx @@ -49,19 +49,19 @@ StatusCode InDet::TrackFilter::initialize() // Code entered here will be executed once at program start. - msg(MSG::INFO) << name() << " initialize()" << endreq; + msg(MSG::INFO) << name() << " initialize()" << endmsg; if (detStore()->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endreq; + msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endmsg; return StatusCode::FAILURE; } if(m_inputTrackCollectionNames.size()==0){ - msg(MSG::ERROR) << "Configuration problem: TrackFilter configured with empty list of TrackCollections. Please fix your jobOptions!"<<endreq; + msg(MSG::ERROR) << "Configuration problem: TrackFilter configured with empty list of TrackCollections. Please fix your jobOptions!"<<endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "initialize() successful in " << name() << endreq; + msg(MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -70,8 +70,8 @@ StatusCode InDet::TrackFilter::initialize() StatusCode InDet::TrackFilter::finalize() { // Code entered here will be executed once at the end of the program run. - msg(MSG::INFO) << "finalize() successful in " << name() << endreq; - msg(MSG::INFO) << "Events / accepted = "<<m_evcount <<" / "<<m_accept<<endreq; + msg(MSG::INFO) << "finalize() successful in " << name() << endmsg; + msg(MSG::INFO) << "Events / accepted = "<<m_evcount <<" / "<<m_accept<<endmsg; return StatusCode::SUCCESS; } @@ -85,7 +85,7 @@ StatusCode InDet::TrackFilter::execute() m_evcount++; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute() called in " << name() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute() called in " << name() << endmsg; std::vector<std::string>::const_iterator it=m_inputTrackCollectionNames.begin(); @@ -98,8 +98,8 @@ StatusCode InDet::TrackFilter::execute() StatusCode sc = evtStore()->retrieve(tracks, *it); if(sc.isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " could not open Track collection : " << *it << endreq; - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " will skip this collection!!"<<endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " could not open Track collection : " << *it << endmsg; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " will skip this collection!!"<<endmsg; }else{ //loop over trackcollection and try to find a "good" track @@ -146,7 +146,7 @@ StatusCode InDet::TrackFilter::execute() setFilterPassed( passed ); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Set filter passed to " << filterPassed() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Set filter passed to " << filterPassed() << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx index 63b78b01c1f..646fd13aab7 100755 --- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx +++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx @@ -54,12 +54,12 @@ GeoPhysVol* BCM_Module::Build(const AbsMaterialManager* mat_mgr, const BCM_Modul { diamond = mat_mgr->getMaterial("std::Carbon"); // if(msg) -// (*msg) << "BCM with graphite." << endreq; //commented out by D.Dobos on request by M.Elsing +// (*msg) << "BCM with graphite." << endmsg; //commented out by D.Dobos on request by M.Elsing } // else // { // if(msg) -// (*msg) << "BCM with diamond." << endreq; //commented out by D.Dobos on request by M.Elsing +// (*msg) << "BCM with diamond." << endmsg; //commented out by D.Dobos on request by M.Elsing // } diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx index 8f2b174aec7..405089fda99 100755 --- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx +++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx @@ -34,12 +34,12 @@ GeoPhysVol* BLM_Module::Build(const AbsMaterialManager* mat_mgr, const BLM_Modul { diamond = mat_mgr->getMaterial("std::Carbon"); // if(msg) -// (*msg) << "BLM with graphite." << endreq; //commented out by D.Dobos on request by M.Elsing +// (*msg) << "BLM with graphite." << endmsg; //commented out by D.Dobos on request by M.Elsing } // else // { // if(msg) -// (*msg) << "BLM with diamond." << endreq; //commented out by D.Dobos on request by M.Elsing +// (*msg) << "BLM with diamond." << endmsg; //commented out by D.Dobos on request by M.Elsing // } const GeoMaterial* stainless_steel = mat_mgr->getMaterial("std::Iron"); const GeoMaterial* peek = mat_mgr->getMaterial("pix::Peek"); diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx index dd1b6745cc7..6c89d191abe 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx @@ -57,7 +57,7 @@ namespace InDetDD if (frame == InDetDD::global) frameStr = "global"; if (frame == InDetDD::local) frameStr = "local"; msg(MSG::INFO) << "Registering alignment channel with key " << key << ", level " << level - << ", with frame " << frameStr << "." <<endreq; + << ", with frame " << frameStr << "." <<endmsg; //} m_keys[key] = LevelInfo(level, frame); } @@ -96,7 +96,7 @@ namespace InDetDD { (void) I; // avoid warning about unused parameter - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "AlignmentCallback called " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "AlignmentCallback called " << endmsg; if (!getIdHelper()) return StatusCode::SUCCESS; @@ -116,7 +116,7 @@ namespace InDetDD alignmentChange = (alignmentChange || status); } catch(std::runtime_error& err) { // keys are empty when running simualtion. It is normal for detector specific aligments not to exist. - msg(MSG::FATAL) << err.what() << endreq; + msg(MSG::FATAL) << err.what() << endmsg; return StatusCode::FAILURE; } } @@ -131,7 +131,7 @@ namespace InDetDD } catch(std::runtime_error& err) { // alignments should always exist so we return fatal if we could not process the alignment for this key - msg(MSG::FATAL) << err.what() << endreq; + msg(MSG::FATAL) << err.what() << endmsg; return StatusCode::FAILURE; } } @@ -144,7 +144,7 @@ namespace InDetDD alignmentChange = (alignmentChange || status); } catch(std::runtime_error& err) { // keys are empty when running simualtion. It is normal for detector specific aligments not to exist. - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << err.what() << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << err.what() << endmsg; // We continue as detector specific aligments don't always exist. } } @@ -155,7 +155,7 @@ namespace InDetDD const std::string & key = *itr; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Processing call back key " << key << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Processing call back key " << key << endmsg; if ( m_globalFolders.find(key) != m_globalFolders.end() ) { @@ -165,7 +165,7 @@ namespace InDetDD alignmentChange = (alignmentChange || status); } catch(std::runtime_error& err) { // alignments should always exist so we return fatal if we could not process the alignment for this key - msg(MSG::FATAL) << err.what() << endreq; + msg(MSG::FATAL) << err.what() << endmsg; return StatusCode::FAILURE; } @@ -177,7 +177,7 @@ namespace InDetDD alignmentChange = (alignmentChange || status); } catch(std::runtime_error& err) { // alignments should always exist so we return fatal if we could not process the alignment for this key - msg(MSG::FATAL) << err.what() << endreq; + msg(MSG::FATAL) << err.what() << endmsg; return StatusCode::FAILURE; } @@ -189,12 +189,12 @@ namespace InDetDD } catch(std::runtime_error& err) { // Should always exist if the folder was requested so we return fatal if we could not process the alignment for this key - msg(MSG::FATAL) << err.what() << endreq; + msg(MSG::FATAL) << err.what() << endmsg; return StatusCode::FAILURE; } } else { // Should not be any other keys specified in call back. - msg(MSG::ERROR) << "Unrecognized key in call back." << endreq; + msg(MSG::ERROR) << "Unrecognized key in call back." << endmsg; return StatusCode::SUCCESS; } } @@ -213,18 +213,18 @@ namespace InDetDD { bool alignmentChange = false; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Dealing with key as container" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Dealing with key as container" << endmsg; const AlignableTransformContainer* container; if (StatusCode::SUCCESS!=m_detStore->retrieve(container, key)) { msg(MSG::ERROR) << "Cannot find AlignableTransformContainer for key " - << key << " - no misalignment" << endreq; + << key << " - no misalignment" << endmsg; // This should not occur in normal situations so we force job to abort. throw std::runtime_error("Unable to apply Inner Detector alignments"); } // Check if container is empty - this can occur if it is an invalid IOV. if (container->empty()) { msg(MSG::ERROR) << "AlignableTransformContainer for key " - << key << " is empty. Probably due to out of range IOV" << endreq; + << key << " is empty. Probably due to out of range IOV" << endmsg; // This should not occur in normal situations so we force job to abort. throw std::runtime_error("Unable to apply Inner Detector alignments."); } @@ -247,9 +247,9 @@ namespace InDetDD const LevelInfo & levelInfo = getLevel(key); if (msgLvl(MSG::DEBUG)) { if (levelInfo.isValid()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Processing channel: " << key << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Processing channel: " << key << endmsg; } else { - msg(MSG::DEBUG) << "Channel " << key << " not registered in this manager" << endreq; + msg(MSG::DEBUG) << "Channel " << key << " not registered in this manager" << endmsg; } } // return silently if unrecognised - this can happen in container mode @@ -264,7 +264,7 @@ namespace InDetDD if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Get alignment for identifier " << getIdHelper()->show_to_string(trans_iter->identify()) - << " at level " << levelInfo.level() << endreq; + << " at level " << levelInfo.level() << endmsg; } // The delta in the conditions DB is not necessarily the same as what is needed in the @@ -284,20 +284,20 @@ namespace InDetDD msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier." << " Probably OK if its /Indet/Align/ID folder. " << getIdHelper()->show_to_string(trans_iter->identify()) - << " at level " << levelInfo.level() << endreq; + << " at level " << levelInfo.level() << endmsg; } } else { if (m_suppressWarnings) { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "WARNING: Cannot set AlignableTransform for identifier " << getIdHelper()->show_to_string(trans_iter->identify()) - << " at level " << levelInfo.level() << endreq; + << " at level " << levelInfo.level() << endmsg; } } else { msg(MSG::WARNING) << "Cannot set AlignableTransform for identifier " << getIdHelper()->show_to_string(trans_iter->identify()) - << " at level " << levelInfo.level() << endreq; - msg(MSG::WARNING) << "Subsequent WARNINGS will be printed at DEBUG level." << endreq; + << " at level " << levelInfo.level() << endmsg; + msg(MSG::WARNING) << "Subsequent WARNINGS will be printed at DEBUG level." << endmsg; m_suppressWarnings = true; } } @@ -311,15 +311,15 @@ namespace InDetDD { bool alignmentChange = false; - msg(MSG::DEBUG) << "processing GlobalAlignmentContainer with key: " << key << endreq; + msg(MSG::DEBUG) << "processing GlobalAlignmentContainer with key: " << key << endmsg; // From the key determine what level in hierarchy we are dealing with. // returns -1 if unrecognized. const LevelInfo & levelInfo = getLevel(key); if (msgLvl(MSG::DEBUG)) { if (levelInfo.isValid()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Processing channel: " << key << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Processing channel: " << key << endmsg; } else { - msg(MSG::DEBUG) << "Channel " << key << " not registered in this manager" << endreq; + msg(MSG::DEBUG) << "Channel " << key << " not registered in this manager" << endmsg; } } // return silently if unrecognised - this can happen in container mode diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx index ec621f3c339..b12ff1f1839 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx @@ -33,7 +33,7 @@ namespace InDetDD { StatusCode sc = detStore->retrieve(m_idHelper,"PixelID"); if (sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve Pixel id helper" << endreq; + msg(MSG::ERROR) << "Could not retrieve Pixel id helper" << endmsg; } // Initialize the collections. @@ -236,14 +236,14 @@ namespace InDetDD { return setAlignableTransformLocalDelta(m_alignableTransforms[idHash], element->defTransform(), delta); } else { // other not supported - msg(MSG::WARNING) << "Frames other than global or local are not supported." << endreq; + msg(MSG::WARNING) << "Frames other than global or local are not supported." << endmsg; return false; } } else { // higher level if (frame != InDetDD::global) { - msg(MSG::WARNING) << "Non global shift at higher levels is not possible." << endreq; + msg(MSG::WARNING) << "Non global shift at higher levels is not possible." << endmsg; return false; } @@ -272,7 +272,7 @@ namespace InDetDD { const GeoVFullPhysVol * childFPV = dynamic_cast<const GeoVFullPhysVol *>(child); if (!childFPV) { msg(MSG::ERROR) << "Child of alignable transform is not a full physical volume" - << endreq; + << endmsg; } else { addAlignableTransform (level, id, transform, childFPV); } @@ -326,7 +326,7 @@ namespace InDetDD { if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Processing IBLDist alignment container with key (" << - key << ") and alignment folder pointing to " << alignfolder << endreq; + key << ") and alignment folder pointing to " << alignfolder << endmsg; int nstaves = 0; if (numerology().numPhiModulesForLayer(0)<14) nstaves = 14; @@ -349,13 +349,13 @@ namespace InDetDD { msg(MSG::VERBOSE) << "IBLDist DB -- channel: " << citr->first << " ,stave: " << atrlist["stave"].data<int>() << " ,mag: " << atrlist["mag"].data<float>() - << " ,base: " << atrlist["base"].data<float>() << endreq; + << " ,base: " << atrlist["base"].data<float>() << endmsg; } } else { if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cannot find IBLDist Container for key " - << key << " - no IBL bowing alignment " << endreq; + << key << " - no IBL bowing alignment " << endmsg; return alignmentChange; } @@ -373,14 +373,14 @@ namespace InDetDD { const AlignableTransformContainer* container; if (StatusCode::SUCCESS!=m_detStore->retrieve(container, alignfolder)) { msg(MSG::ERROR) << "Cannot find AlignableTransformContainer for key " - << key << " - no misalignment" << endreq; + << key << " - no misalignment" << endmsg; // This should not occur in normal situations so we force job to abort. throw std::runtime_error("Unable to apply Inner Detector alignments"); } // Check if container is empty - this can occur if it is an invalid IOV. if (container->empty()) { msg(MSG::ERROR) << "AlignableTransformContainer for key " - << key << " is empty. Probably due to out of range IOV" << endreq; + << key << " is empty. Probably due to out of range IOV" << endmsg; // This should not occur in normal situations so we force job to abort. throw std::runtime_error("Unable to apply Inner Detector alignments."); } @@ -392,7 +392,7 @@ namespace InDetDD { if (!( (*pat)->tag()==IBLalignfolder && numerology().numPhiModulesForLayer(0)==14 && numerology().numLayers()==4) ){ // hard-coded to IBL for now; no other geometry should really apply this! - msg(MSG::DEBUG) << "IBLDist; ignoring collections " << (*pat)->tag() << endreq; + msg(MSG::DEBUG) << "IBLDist; ignoring collections " << (*pat)->tag() << endmsg; } else{ const AlignableTransform* transformCollection = *pat; @@ -401,14 +401,14 @@ namespace InDetDD { ++trans_iter) { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "IBLDist alignment for identifier " - << getIdHelper()->show_to_string(trans_iter->identify()) << endreq; + << getIdHelper()->show_to_string(trans_iter->identify()) << endmsg; } IdentifierHash idHash = getIdHelper()->wafer_hash(trans_iter->identify()); if (!idHash.is_valid()){ msg(MSG::WARNING) << "Invalid HashID for identifier " - << getIdHelper()->show_to_string(trans_iter->identify()) << endreq; - msg(MSG::WARNING) << "No IBLDist corrections can be applied for invalid HashID's - exiting " << endreq; + << getIdHelper()->show_to_string(trans_iter->identify()) << endmsg; + msg(MSG::WARNING) << "No IBLDist corrections can be applied for invalid HashID's - exiting " << endmsg; return false; } SiDetectorElement * sielem = m_elementCollection[idHash]; @@ -420,7 +420,7 @@ namespace InDetDD { double basex= iblbaseline[getIdHelper()->phi_module(trans_iter->identify())]; // This is in the module frame, as bowing corrections are directly L3 - msg(MSG::DEBUG) << "Total IBL-module Tx shift (baseline+bowing): " << basex+bowx << endreq; + msg(MSG::DEBUG) << "Total IBL-module Tx shift (baseline+bowing): " << basex+bowx << endmsg; if ( (basex+bowx)==0 ) continue; // make sure we ignore NULL corrections Amg::Transform3D shift = Amg::Translation3D(basex+bowx,0,0) * Amg::RotationMatrix3D::Identity(); @@ -432,11 +432,11 @@ namespace InDetDD { /** Verbose level debug section for transforms **/ if (msgLvl(MSG::VERBOSE)) { - msg(MSG::VERBOSE) << "Bowing Transformation only:" << endreq; + msg(MSG::VERBOSE) << "Bowing Transformation only:" << endmsg; printTransform(shift); - msg(MSG::VERBOSE) << "Original alignable Transformation from StoreGate:" << endreq; + msg(MSG::VERBOSE) << "Original alignable Transformation from StoreGate:" << endmsg; printTransform(Amg::CLHEPTransformToEigen(this_trans->transform())); - msg(MSG::VERBOSE) << "Final mModified Transformation:" << endreq; + msg(MSG::VERBOSE) << "Final mModified Transformation:" << endmsg; printTransform(Amg::CLHEPTransformToEigen(newtrans)); } /** End of verbose level debug section **/ @@ -451,7 +451,7 @@ namespace InDetDD { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier." << getIdHelper()->show_to_string(trans_iter->identify()) - << " at level 0 for IBLDist bowing deformation " << endreq; + << " at level 0 for IBLDist bowing deformation " << endmsg; } } @@ -470,7 +470,7 @@ namespace InDetDD { bool alignmentChange = false; if(msgLvl(MSG::INFO)) - msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endreq; + msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endmsg; Identifier ident=Identifier(); const CondAttrListCollection* atrlistcol=0; @@ -490,8 +490,8 @@ namespace InDetDD { // Precaution which does not work for e.g. SCT if (!(getIdHelper()->wafer_hash(ident)).is_valid()){ msg(MSG::WARNING) << "Invalid HashID for identifier " - << getIdHelper()->show_to_string(ident) << endreq; - msg(MSG::WARNING) << "No global alignment corrections can be applied for invalid HashID's - exiting " << endreq; + << getIdHelper()->show_to_string(ident) << endmsg; + msg(MSG::WARNING) << "No global alignment corrections can be applied for invalid HashID's - exiting " << endmsg; return false; } @@ -514,7 +514,7 @@ namespace InDetDD { << " ,Tz: " << atrlist["Tz"].data<float>() << " ,Rx: " << atrlist["Rx"].data<float>() << " ,Ry: " << atrlist["Ry"].data<float>() - << " ,Rz: " << atrlist["Rz"].data<float>() << endreq; + << " ,Rz: " << atrlist["Rz"].data<float>() << endmsg; // Set the new transform; Will replace existing one with updated transform bool status = setAlignableTransformDelta(level, @@ -526,7 +526,7 @@ namespace InDetDD { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier." << getIdHelper()->show_to_string(ident) - << " at level " << level << " for new global DB " << endreq; + << " at level " << level << " for new global DB " << endmsg; } } @@ -536,7 +536,7 @@ namespace InDetDD { else { if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cannot find new global align Container for key " - << key << " - no new global alignment " << endreq; + << key << " - no new global alignment " << endmsg; return alignmentChange; } return alignmentChange; @@ -546,11 +546,11 @@ namespace InDetDD { // Helpful function for debugging of transforms void PixelDetectorManager::printTransform(const Amg::Transform3D & tr) const { - msg(MSG::DEBUG) <<" - translation: "<<tr.translation().x()<<" "<<tr.translation().y()<<" "<<tr.translation().z() << endreq; - msg(MSG::DEBUG) <<" - rotation:"<< endreq; - msg(MSG::DEBUG) <<" "<<tr(0,0)<<" "<<tr(0,1)<<" "<<tr(0,2)<< endreq; - msg(MSG::DEBUG) <<" "<<tr(1,0)<<" "<<tr(1,1)<<" "<<tr(1,2)<< endreq; - msg(MSG::DEBUG) <<" "<<tr(2,0)<<" "<<tr(2,1)<<" "<<tr(2,2)<< endreq; + msg(MSG::DEBUG) <<" - translation: "<<tr.translation().x()<<" "<<tr.translation().y()<<" "<<tr.translation().z() << endmsg; + msg(MSG::DEBUG) <<" - rotation:"<< endmsg; + msg(MSG::DEBUG) <<" "<<tr(0,0)<<" "<<tr(0,1)<<" "<<tr(0,2)<< endmsg; + msg(MSG::DEBUG) <<" "<<tr(1,0)<<" "<<tr(1,1)<<" "<<tr(1,2)<< endmsg; + msg(MSG::DEBUG) <<" "<<tr(2,0)<<" "<<tr(2,1)<<" "<<tr(2,2)<< endmsg; return; } diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx index 9d122039786..e57bed11c4c 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx @@ -33,7 +33,7 @@ namespace InDetDD { // StatusCode sc = detStore->retrieve(m_idHelper, "SCT_ID"); if (sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve SCT id helper" << endreq; + msg(MSG::ERROR) << "Could not retrieve SCT id helper" << endmsg; } // Initialize the collections. if (m_idHelper) { @@ -214,7 +214,7 @@ namespace InDetDD { } else { // other not supported - msg(MSG::WARNING) << "Frames other than global or local are not supported." << endreq; + msg(MSG::WARNING) << "Frames other than global or local are not supported." << endmsg; return false; } @@ -227,7 +227,7 @@ namespace InDetDD { int idModuleHash = idHash / 2; if (idHash%2) { - msg(MSG::WARNING) << "Side 1 wafer id used for module id" << endreq; + msg(MSG::WARNING) << "Side 1 wafer id used for module id" << endmsg; return false; } @@ -250,14 +250,14 @@ namespace InDetDD { } else { // other not supported - msg(MSG::WARNING) << "Frames other than global or local are not supported." << endreq; + msg(MSG::WARNING) << "Frames other than global or local are not supported." << endmsg; return false; } } else { // higher level if (frame != InDetDD::global) { - msg(MSG::WARNING) << "Non global shift at higher levels is not supported." << endreq; + msg(MSG::WARNING) << "Non global shift at higher levels is not supported." << endmsg; return false; } @@ -285,7 +285,7 @@ namespace InDetDD { const GeoVFullPhysVol * childFPV = dynamic_cast<const GeoVFullPhysVol *>(child); if (!childFPV) { msg(MSG::ERROR) << "Child of alignable transform is not a full physical volume" - << endreq; + << endmsg; } else { addAlignableTransform (level, id, transform, childFPV); } @@ -340,7 +340,7 @@ namespace InDetDD { bool alignmentChange = false; if(msgLvl(MSG::INFO)) - msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endreq; + msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endmsg; Identifier ident=Identifier(); const CondAttrListCollection* atrlistcol=0; @@ -376,7 +376,7 @@ namespace InDetDD { << " ,Tz: " << atrlist["Tz"].data<float>() << " ,Rx: " << atrlist["Rx"].data<float>() << " ,Ry: " << atrlist["Ry"].data<float>() - << " ,Rz: " << atrlist["Rz"].data<float>() << endreq; + << " ,Rz: " << atrlist["Rz"].data<float>() << endmsg; // Set the new transform; Will replace existing one with updated transform bool status = setAlignableTransformDelta(level, @@ -388,7 +388,7 @@ namespace InDetDD { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier." << getIdHelper()->show_to_string(ident) - << " at level " << level << " for new global DB " << endreq; + << " at level " << level << " for new global DB " << endmsg; } } @@ -398,7 +398,7 @@ namespace InDetDD { else { if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cannot find new global align Container for key " - << key << " - no new global alignment " << endreq; + << key << " - no new global alignment " << endmsg; return alignmentChange; } return alignmentChange; diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiCommonItems.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiCommonItems.cxx index 0ad156edd24..e7cd2e0f881 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiCommonItems.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiCommonItems.cxx @@ -35,7 +35,7 @@ SiCommonItems::lorentzAngleSvc() const if (!m_lorentzAngleSvcHandle.empty()) { StatusCode sc = m_lorentzAngleSvcHandle.retrieve(); if (sc.isFailure()) { - msg(MSG::ERROR) << "InDetReadoutGeometry ERROR: Could not locate Lorentz angle service: " << m_lorentzAngleSvcHandle.name() << endreq; + msg(MSG::ERROR) << "InDetReadoutGeometry ERROR: Could not locate Lorentz angle service: " << m_lorentzAngleSvcHandle.name() << endmsg; } } m_lorentzAngleSvc = &*m_lorentzAngleSvcHandle; diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx index e54f148919e..82ec775b442 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx @@ -97,7 +97,7 @@ SiDetectorElement::commonConstructor() // Set booleans for wether we are pixel/sct barrel/endcap m_isPixel = getIdHelper()->is_pixel(m_id); if (!m_isPixel && !getIdHelper()->is_sct(m_id)){ - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Element id is not for pixel or SCT" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Element id is not for pixel or SCT" << endmsg; } // Set IdHash. Also set m_isBarrel. @@ -225,10 +225,10 @@ SiDetectorElement::updateCache() const if (isBarrel() && !barrelLike) { if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Element has endcap like orientation with barrel identifier." - << endreq; + << endmsg; } else if (!isBarrel() && barrelLike) { if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Element has barrel like orientation with endcap identifier." - << endreq; + << endmsg; } if (barrelLike) { @@ -250,11 +250,11 @@ SiDetectorElement::updateCache() const if (m_design->depthSymmetric()) { m_depthDirection = false; } else { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to swap local depth axis." << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to swap local depth axis." << endmsg; } } if (std::abs(depthDir) < 0.5) { // Check that it is in roughly the right direction. - msg(MSG::ERROR) << "Orientation of local depth axis does not follow correct convention." << endreq; + msg(MSG::ERROR) << "Orientation of local depth axis does not follow correct convention." << endmsg; // throw std::runtime_error("Orientation of local depth axis does not follow correct convention."); m_depthDirection = true; // Don't swap. } @@ -268,12 +268,12 @@ SiDetectorElement::updateCache() const if (m_design->phiSymmetric()) { m_phiDirection = false; } else { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to swap local xPhi axis." << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to swap local xPhi axis." << endmsg; } } if (std::abs(phiDir) < 0.5) { // Check that it is in roughly the right direction. - msg(MSG::ERROR) << "Orientation of local xPhi axis does not follow correct convention." << endreq; + msg(MSG::ERROR) << "Orientation of local xPhi axis does not follow correct convention." << endmsg; // throw std::runtime_error("Orientation of local xPhi axis does not follow correct convention."); m_phiDirection = true; // Don't swap. } @@ -287,11 +287,11 @@ SiDetectorElement::updateCache() const if (m_design->etaSymmetric()) { m_etaDirection = false; } else { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to swap local xEta axis." << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to swap local xEta axis." << endmsg; } } if (std::abs(etaDir) < 0.5) { // Check that it is in roughly the right direction. - msg(MSG::ERROR) << "Orientation of local xEta axis does not follow correct convention." << endreq; + msg(MSG::ERROR) << "Orientation of local xEta axis does not follow correct convention." << endmsg; // throw std::runtime_error("Orientation of local xEta axis does not follow correct convention."); m_etaDirection = true; // Don't swap } @@ -315,13 +315,13 @@ SiDetectorElement::updateCache() const if (m_design->depthSymmetric()) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Local frame is left-handed, Swapping depth axis to make it right handed." - << endreq; + << endmsg; m_depthDirection = !m_depthDirection; m_transformCLHEP = geoTransform * recoToHitTransform(); m_transform = Amg::CLHEPTransformToEigen(m_transformCLHEP); //m_transform = m_commonItems->solenoidFrame() * geoTransform * recoToHitTransform(); } else { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Local frame is left-handed." << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Local frame is left-handed." << endmsg; } } } diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorManager.cxx index f58d896a5f6..509a9b2ff00 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorManager.cxx @@ -80,11 +80,11 @@ namespace InDetDD // DEPRECATED void SiDetectorManager::addKey(const std::string & key, int level, bool globalDelta) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Registering alignmentCallback with key " << key << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Registering alignmentCallback with key " << key << endmsg; const DataHandle<AlignableTransform> transformCollection; StatusCode sc = m_detStore->regFcn(&SiDetectorManager::alignmentCallback, this, transformCollection, key); if (sc.isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to register call back using old method. This is OK if you are using COOL." << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to register call back using old method. This is OK if you are using COOL." << endmsg; } FrameType frame = (globalDelta) ? InDetDD::global : InDetDD::local; addKey(key, level, frame); diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/TRT_DetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/TRT_DetectorManager.cxx index ca8ecf46dc7..99ef4e47058 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/TRT_DetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/TRT_DetectorManager.cxx @@ -45,7 +45,7 @@ namespace InDetDD { // If detstore no passed then get it from bootstrap. if (m_detStore == 0) { StatusCode sc = Gaudi::svcLocator()->service("DetectorStore", m_detStore); - if (sc.isFailure()) msg(MSG::ERROR) << "Could not locate DetectorStore" << endreq; + if (sc.isFailure()) msg(MSG::ERROR) << "Could not locate DetectorStore" << endmsg; } // @@ -149,7 +149,7 @@ namespace InDetDD { [barrel->getCode().getStrawLayerIndex()] ) { //Element already added - complain! - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "manageBarrelElement: Overriding existing element"<<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "manageBarrelElement: Overriding existing element"<<endmsg; }; barrelArray @@ -173,11 +173,11 @@ namespace InDetDD { if (m_elements[hashId]) { //Element already added - complain! if(msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "manageBarrelElement: Overriding existing element for hashID"<<endreq; + msg(MSG::DEBUG) << "manageBarrelElement: Overriding existing element for hashID"<<endmsg; } m_elements[hashId]=barrel; } else { - msg(MSG::WARNING) << "manageBarrelElement: Invalid identifier" << endreq; + msg(MSG::WARNING) << "manageBarrelElement: Invalid identifier" << endmsg; } } @@ -195,7 +195,7 @@ namespace InDetDD { //Element already added - complain! if(msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "manageEndcapElement: Overriding existing element"<<endreq; + msg(MSG::DEBUG) << "manageEndcapElement: Overriding existing element"<<endmsg; }; endcapArray @@ -219,11 +219,11 @@ namespace InDetDD { if (m_elements[hashId]) { //Element already added - complain! if(msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "manageEndcapElement: Overriding existing element for hashID"<<endreq; + msg(MSG::DEBUG) << "manageEndcapElement: Overriding existing element for hashID"<<endmsg; } m_elements[hashId]=endcap; } else { - msg(MSG::WARNING) << "manageEndcapElement: Invalid identifier" << endreq; + msg(MSG::WARNING) << "manageEndcapElement: Invalid identifier" << endmsg; } } } @@ -367,7 +367,7 @@ namespace InDetDD { { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Registering alignmentCallback with key " << key << ", at level " << level - << endreq; + << endmsg; const DataHandle<AlignableTransform> transformCollection; m_detStore->regFcn(&TRT_DetectorManager::alignmentCallback, this, transformCollection, key); @@ -399,11 +399,11 @@ namespace InDetDD { if (child && !childFPV) { msg(MSG::ERROR) << "Child of alignable transform is not a full physical volume" - << endreq; + << endmsg; } else if (frameVol && !frameFPV) { msg(MSG::ERROR) << "Frame for alignable transform is not a full physical volume" - << endreq; + << endmsg; } else { addAlignableTransform (level, id, transform, childFPV, frameFPV); } @@ -431,7 +431,7 @@ namespace InDetDD { } else { msg(MSG::VERBOSE) << " using other frame"; } - msg(MSG::VERBOSE) << endreq; + msg(MSG::VERBOSE) << endmsg; } // Save in map int index = level - FIRST_HIGHER_LEVEL; // level 0 treated separately. @@ -528,7 +528,7 @@ namespace InDetDD { if (newFrame == InDetDD::global) { // Global if (!child) { - msg(MSG::ERROR) << "global frame specified, but child == 0" << endreq; + msg(MSG::ERROR) << "global frame specified, but child == 0" << endmsg; } else { const HepGeom::Transform3D & childXF = child->getDefAbsoluteTransform(); extXF->alignableTransform()->setDelta(childXF.inverse() * Amg::EigenTransformToCLHEP(delta) * childXF); @@ -590,7 +590,7 @@ namespace InDetDD { bool TRT_DetectorManager::processSpecialAlignment(const std::string & key, InDetDD::AlignFolderType /*dummy*/) const { if(msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Processing TRT fine alignment." << endreq; + msg(MSG::DEBUG) << "Processing TRT fine alignment." << endmsg; const TRTCond::StrawDxContainer* container = 0; StatusCode sc = StatusCode::FAILURE; @@ -601,7 +601,7 @@ namespace InDetDD { if (sc.isFailure()) { if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cannot find StrawDxContainer for key " - << key << " - no fine alignment " << endreq; + << key << " - no fine alignment " << endmsg; throw std::runtime_error("Unable to apply TRT fine alignment. This is normal for simulation"); //return false; } else { @@ -627,7 +627,7 @@ namespace InDetDD { { // Should only be set once. if (m_conditions) { - msg(MSG::WARNING) << "TRT_DetectorManager: Attempt to reset TRT_Conditions" << endreq; + msg(MSG::WARNING) << "TRT_DetectorManager: Attempt to reset TRT_Conditions" << endmsg; return; } m_conditions = conditions; @@ -646,7 +646,7 @@ namespace InDetDD { bool alignmentChange = false; if(msgLvl(MSG::INFO)) - msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endreq; + msg(MSG::INFO) << "Processing new global alignment containers with key " << key << " in the " << frame << " frame at level " << level << endmsg; Identifier ident=Identifier(); const CondAttrListCollection* atrlistcol=0; @@ -674,7 +674,7 @@ namespace InDetDD { << " ,Tz: " << atrlist["Tz"].data<float>() << " ,phi: " << atrlist["phi"].data<float>() << " ,theta: " << atrlist["theta"].data<float>() - << " ,psi: " << atrlist["psi"].data<float>() << endreq; + << " ,psi: " << atrlist["psi"].data<float>() << endmsg; // Set the new transform; Will replace existing one with updated transform bool status = setAlignableTransformDelta(level, @@ -686,7 +686,7 @@ namespace InDetDD { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Cannot set AlignableTransform for identifier." << getIdHelper()->show_to_string(ident) - << " at level " << level << " for new global DB " << endreq; + << " at level " << level << " for new global DB " << endmsg; } } @@ -696,7 +696,7 @@ namespace InDetDD { else { if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cannot find new global align Container for key " - << key << " - no new global alignment " << endreq; + << key << " - no new global alignment " << endmsg; return alignmentChange; } return alignmentChange; diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilder.cxx index 0019bf6bc5e..f2926b402b4 100755 --- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilder.cxx +++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilder.cxx @@ -451,7 +451,7 @@ const std::vector< const Trk::CylinderLayer* >* InDet::SiLayerBuilder::cylindric if (zbin < layerZboundaries[layerCounter].size()-1) msg(MSG::DEBUG) << ", "; } - msg(MSG::DEBUG) << endreq; + msg(MSG::DEBUG) << endmsg; } // prepare the right overlap descriptor Trk::OverlapDescriptor* olDescriptor = 0; diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx index 1ee0f10969a..e761bf34e44 100644 --- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx +++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx @@ -520,8 +520,8 @@ Identifier TRTFastDigitizationTool::getIdentifier( int hitID, IdentifierHash &ha } else { ATH_MSG_ERROR( "Could not find detector element for endcap identifier with (ipos,iwheel,isector,iplane,istraw) = (" - << trtID << ", " << wheelID << ", " << sectorID << ", " << planeID << ", " << strawID << ")" << endreq - << "If this happens very rarely, don't be alarmed (it is a Geant4 'feature')" << endreq + << trtID << ", " << wheelID << ", " << sectorID << ", " << planeID << ", " << strawID << ")" << endmsg + << "If this happens very rarely, don't be alarmed (it is a Geant4 'feature')" << endmsg << "If it happens a lot, you probably have misconfigured geometry in the sim. job." ); status = false; } diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamCnv.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamCnv.cxx index e894f1afc92..ce299d83419 100644 --- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamCnv.cxx +++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamCnv.cxx @@ -48,27 +48,27 @@ StatusCode BCM_RawContByteStreamCnv::initialize() { // Check ByteStreamCnvSvc if (StatusCode::SUCCESS != service("ByteStreamCnvSvc", m_ByteStreamEventAccess) || !m_ByteStreamEventAccess) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get ByteStreamEventAccess interface" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get ByteStreamEventAccess interface" << endmsg; return StatusCode::FAILURE; } - if (msgLevel(MSG::INFO)) msg(MSG::INFO) << "ByteStreamCnvSvc retireved" << endreq; + if (msgLevel(MSG::INFO)) msg(MSG::INFO) << "ByteStreamCnvSvc retireved" << endmsg; // retrieve Tool IToolSvc* toolSvc; if(StatusCode::SUCCESS != service("ToolSvc",toolSvc)) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get ToolSvc" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get ToolSvc" << endmsg; return StatusCode::FAILURE; } std::string toolType; toolType = "BCM_RawContByteStreamTool"; if(StatusCode::SUCCESS != toolSvc->retrieveTool(toolType,m_BCMRawContBSTool)) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get BCM_RawContByteStreamTool Tool" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can't get BCM_RawContByteStreamTool Tool" << endmsg; return StatusCode::FAILURE; } StatusCode scChrono =serviceLocator()->service("ChronoStatSvc",m_ChronoStat ); if (!scChrono.isSuccess()) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Cannot retrieve ChronoStatSvc" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Cannot retrieve ChronoStatSvc" << endmsg; } return StatusCode::SUCCESS; @@ -90,7 +90,7 @@ StatusCode BCM_RawContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress* BCM_RDO_Container* cont = 0; StoreGateSvc::fromStorable(pObj,cont); if(!cont) { - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can not cast to BCM_RDO_Container" << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << "Can not cast to BCM_RDO_Container" << endmsg; return StatusCode::FAILURE; } @@ -100,7 +100,7 @@ StatusCode BCM_RawContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress* StatusCode sc = m_BCMRawContBSTool->convert(cont, re); if(sc.isFailure()){ - if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Could not convert rdo with m_BCMRawContBSTool " << endreq; + if (msgLevel(MSG::ERROR)) msg(MSG::ERROR) << " Could not convert rdo with m_BCMRawContBSTool " << endmsg; return StatusCode::FAILURE; } diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamTool.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamTool.cxx index c35ad5668e6..477fcba1c03 100644 --- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamTool.cxx +++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawContByteStreamTool.cxx @@ -67,7 +67,7 @@ StatusCode BCM_RawContByteStreamTool::convert(BCM_RDO_Container* cont, RawEventW // set ROD Minor version m_fea.setRodMinorVersion(m_RodBlockVersion); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Setting ROD Minor Version Number to: " << m_RodBlockVersion << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Setting ROD Minor Version Number to: " << m_RodBlockVersion << endmsg; // a map for ROD ID onto Encoder std::map<uint32_t, BCM_RodEncoder> mapEncoder; @@ -75,7 +75,7 @@ StatusCode BCM_RawContByteStreamTool::convert(BCM_RDO_Container* cont, RawEventW // loop over the BCM RDO collections BCM_RDO_Container::const_iterator it_coll = cont->begin(); BCM_RDO_Container::const_iterator it_coll_end = cont->end(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found " << cont->size() << " BCM RDO collections" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found " << cont->size() << " BCM RDO collections" << endmsg; for( ; it_coll!=it_coll_end; ++it_coll) { const BCM_RDO_Collection* coll = (*it_coll); @@ -85,7 +85,7 @@ StatusCode BCM_RawContByteStreamTool::convert(BCM_RDO_Container* cont, RawEventW unsigned int offlineId = coll->getChannel(); uint32_t rodId = getSourceID(offlineId); if ( offlineId >= 16 ) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Didn't find RODID for OfflineID: " << offlineId << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Didn't find RODID for OfflineID: " << offlineId << endmsg; } mapEncoder[rodId].setRodMinorVersion(m_RodBlockVersion); @@ -100,7 +100,7 @@ StatusCode BCM_RawContByteStreamTool::convert(BCM_RDO_Container* cont, RawEventW } } else - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Container contains NULLpointer to collection, skipping collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Container contains NULLpointer to collection, skipping collection" << endmsg; } // Fill the ROD Data into Full Event loop over Encoder map and fill all ROD Data Blocks diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx index de952215cfb..4d0e686abe1 100644 --- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx +++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProvider.cxx @@ -44,21 +44,21 @@ BCM_RawDataProvider::~BCM_RawDataProvider(){ //////////////////////// StatusCode BCM_RawDataProvider::initialize() { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "BCM_RawDataProvider::initialize" << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "BCM_RawDataProvider::initialize" << endmsg; // Get ROBDataProviderSvc if (m_robDataProvider.retrieve().isFailure()) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endmsg; return StatusCode::FAILURE; } else - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endmsg; // Get BCMRawDataProviderTool if (m_rawDataTool.retrieve().isFailure()) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool << endmsg; return StatusCode::FAILURE; } else - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endmsg; return StatusCode::SUCCESS; } @@ -68,10 +68,10 @@ StatusCode BCM_RawDataProvider::initialize() { //////////////////////// StatusCode BCM_RawDataProvider::execute() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Create BCM RDO Container" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Create BCM RDO Container" << endmsg; BCM_RDO_Container *container = new BCM_RDO_Container(); if (evtStore()->record(container, m_RDO_Key).isFailure()) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Unable to record BCM RDO Container" << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Unable to record BCM RDO Container" << endmsg; return StatusCode::FAILURE; } @@ -110,13 +110,13 @@ StatusCode BCM_RawDataProvider::execute() { } */ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of ROB fragments is " << listOfRobf.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of ROB fragments is " << listOfRobf.size() << endmsg; // ask BCM_RawDataProviderTool to decode it and to fill the container if (m_rawDataTool->convert(listOfRobf,container).isFailure()) - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of collections in container is " << container->size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Number of collections in container is " << container->size() << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx index 8d19c856bca..87137127331 100644 --- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx +++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RawDataProviderTool.cxx @@ -50,16 +50,16 @@ StatusCode BCM_RawDataProviderTool::initialize() { StatusCode sc = AthAlgTool::initialize(); if (sc.isFailure()) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to init baseclass" << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to init baseclass" << endmsg; return StatusCode::FAILURE; } // Retrieve decoder if (m_decoder.retrieve().isFailure()) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_decoder << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_decoder << endmsg; return StatusCode::FAILURE; } else { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_decoder << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_decoder << endmsg; } return StatusCode::SUCCESS; @@ -87,7 +87,7 @@ StatusCode BCM_RawDataProviderTool::convert( std::vector<const ROBFragment*>& ve // are we working on a new event ? if ( (*rob_it)->rod_lvl1_id() != LastLvl1ID) { #ifdef BCM_DEBUG - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "New event, reset the collection set" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "New event, reset the collection set" << endmsg; #endif // remember last Lvl1ID LastLvl1ID = (*rob_it)->rod_lvl1_id(); @@ -105,15 +105,15 @@ StatusCode BCM_RawDataProviderTool::convert( std::vector<const ROBFragment*>& ve // check if this ROBFragment was already decoded if (!m_robIdSet.insert(robid).second) { #ifdef BCM_DEBUG - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endmsg; #endif } else { StatusCode sc = m_decoder->fillCollection(&**rob_it, rdoCont); if (sc != StatusCode::SUCCESS) { if (DecodeErrCount < 100) { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Problem with BCM ByteStream Decoding!" << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Problem with BCM ByteStream Decoding!" << endmsg; } else if (100 == DecodeErrCount) { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Too many Problems with BCM Decoding. Turning message off." << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Too many Problems with BCM Decoding. Turning message off." << endmsg; } DecodeErrCount++; } diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RodDecoder.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RodDecoder.cxx index b41559e47f6..3514b9431c7 100644 --- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RodDecoder.cxx +++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/BCM_RodDecoder.cxx @@ -46,7 +46,7 @@ BCM_RodDecoder::~BCM_RodDecoder() StatusCode BCM_RodDecoder::initialize() { #ifdef BCM_DEBUG - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::initialize" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::initialize" << endmsg; #endif StatusCode sc; @@ -66,12 +66,12 @@ StatusCode BCM_RodDecoder::initialize() StatusCode BCM_RodDecoder::finalize() { #ifdef BCM_DEBUG - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::finalize" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::finalize" << endmsg; #endif - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_fragment_number << " fragments found" << endreq; - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_LVL1A_number << " LVL1As found" << endreq; - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_hit_number << " hits found" << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_fragment_number << " fragments found" << endmsg; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_LVL1A_number << " LVL1As found" << endmsg; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Bytestream summary: " << m_hit_number << " hits found" << endmsg; return StatusCode::SUCCESS; } @@ -82,7 +82,7 @@ StatusCode BCM_RodDecoder::finalize() StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Container* rdoCont, std::vector<unsigned int>* /*vecHash*/) { #ifdef BCM_DEBUG - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::fillCollection" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "in BCM_RodDecoder::fillCollection" << endmsg; #endif StatusCode sc = StatusCode::SUCCESS; @@ -143,9 +143,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = ((rawDataWord & 0xc0000000) >> 30) | (rawDataWord_buffer << 2); #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -157,9 +157,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x00001f00) >> 8; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -174,9 +174,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x007c0000) >> 18; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -191,9 +191,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = ((rawDataWord & 0xf0000000) >> 28) | (rawDataWord_buffer << 4); #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -205,9 +205,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x000007c0) >> 6; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -221,9 +221,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x001f0000) >> 16; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -238,9 +238,9 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x7c000000) >> 26; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; @@ -252,15 +252,15 @@ StatusCode BCM_RodDecoder::fillCollection(const ROBFragment *robFrag, BCM_RDO_Co Pulse2Width = (rawDataWord & 0x000001f0) >> 4; #ifdef BCM_DEBUG if (Pulse1Width != 0 || Pulse2Width != 0) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "BCM-ISSUE L1ID: " << m_ROD_LVL1_ID << " Ch: " << Channel << " L1A: " << LVL1A << " BCID: " << BCID << " Hit: " << Pulse1Position << " " << Pulse1Width << " " << Pulse2Position << " " << Pulse2Width << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Decoded ROD 0x"<< std::hex<<m_ROD_source_ID<<std::dec <<" channel: "<< Channel <<" - BCID: "<< BCID <<" : "<< Pulse1Position <<"-"<< Pulse1Width <<" "<< Pulse2Position <<"-"<< Pulse2Width << endmsg; #endif m_coll->push_back(new RDO(Channel,Pulse1Position,Pulse1Width,Pulse2Position,Pulse2Width,LVL1A,BCID,m_ROD_LVL1_ID,Error)); m_hit_number++; break; default: - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "ROD data block decoding failed. Most probably due to wrong words per data block. " << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "ROD data block decoding failed. Most probably due to wrong words per data block. " << endmsg; } } diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_CollectionCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_CollectionCnv_p0.cxx index 743fb396b4c..b04e4b45092 100644 --- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_CollectionCnv_p0.cxx +++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_CollectionCnv_p0.cxx @@ -8,7 +8,7 @@ void BCM_RDO_CollectionCnv_p0::persToTrans(const BCM_RDO_Collection_p0* persColl, BCM_RDO_Collection* transColl, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_CollectionCnv_p0::persToTrans" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_CollectionCnv_p0::persToTrans" << endmsg; BCM_RDO_CollectionCnv_p0_basetype::persToTrans(persColl, transColl, log); transColl->setChannel (persColl->m_chanId); @@ -16,7 +16,7 @@ void BCM_RDO_CollectionCnv_p0::persToTrans(const BCM_RDO_Collection_p0* persColl void BCM_RDO_CollectionCnv_p0::transToPers(const BCM_RDO_Collection* transColl, BCM_RDO_Collection_p0* persColl, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_CollectionCnv_p0::transToPers" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_CollectionCnv_p0::transToPers" << endmsg; BCM_RDO_CollectionCnv_p0_basetype::transToPers(transColl, persColl, log); persColl->m_chanId = transColl->getChannel(); diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.cxx b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.cxx index 30d045cfc75..70c5f284485 100755 --- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.cxx +++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv.cxx @@ -12,17 +12,17 @@ BCM_RDO_Container_p0* BCM_RDO_ContainerCnv::createPersistent(BCM_RDO_Container* transCont) { MsgStream log(msgSvc(), "BCM_RDO_ContainerCnv"); - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv::createPersistent" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv::createPersistent" << endmsg; BCM_RDO_Container_p0* persCont = m_Converter.createPersistent(transCont,log); - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Wrote persistent BCM RDO Container with " << persCont->size() << " entries" << endmsg; return persCont; } BCM_RDO_Container* BCM_RDO_ContainerCnv::createTransient() { MsgStream log(msgSvc(), "BCM_RDO_ContainerCnv"); - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv::createTransient" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv::createTransient" << endmsg; std::auto_ptr<BCM_RDO_Container_p0> persCont(poolReadObject<BCM_RDO_Container_p0>()); BCM_RDO_Container* transCont = m_Converter.createTransient(persCont.get(),log); - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Made transient BCM RDO Container with " << transCont->size() << " entries" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "Made transient BCM RDO Container with " << transCont->size() << " entries" << endmsg; return transCont; } diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv_p0.cxx index 7c47ff6d99c..bf0def1e6b7 100755 --- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv_p0.cxx +++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RDO_ContainerCnv_p0.cxx @@ -7,14 +7,14 @@ void BCM_RDO_ContainerCnv_p0::persToTrans(const BCM_RDO_Container_p0* persCont, BCM_RDO_Container* transCont, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv_p0::persToTrans" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv_p0::persToTrans" << endmsg; BCM_RDO_ContainerCnv_p0_basetype::persToTrans(persCont, transCont, log); } void BCM_RDO_ContainerCnv_p0::transToPers(const BCM_RDO_Container* transCont, BCM_RDO_Container_p0* persCont, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv_p0::transToPers" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RDO_ContainerCnv_p0::transToPers" << endmsg; BCM_RDO_ContainerCnv_p0_basetype::transToPers(transCont, persCont, log); } diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RawDataCnv_p0.cxx b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RawDataCnv_p0.cxx index 0f14cd08db0..a7986a305ff 100644 --- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RawDataCnv_p0.cxx +++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/src/BCM_RawDataCnv_p0.cxx @@ -7,12 +7,12 @@ #include "BCM_RawDataCnv_p0.h" void BCM_RawDataCnv_p0::persToTrans(const BCM_RawData_p0* persObj, BCM_RawData* transObj, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RawDataCnv_p0:persToTrans" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RawDataCnv_p0:persToTrans" << endmsg; *transObj = BCM_RawData (persObj->m_word1, persObj->m_word2); } void BCM_RawDataCnv_p0::transToPers(const BCM_RawData* transObj, BCM_RawData_p0* persObj, MsgStream &log) { - if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RawDataCnv_p0:transToPers" << endreq; + if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In BCM_RawDataCnv_p0:transToPers" << endmsg; persObj->m_word1 = transObj->getWord1(); persObj->m_word2 = transObj->getWord2(); } diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/BeamSpotRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/BeamSpotRetriever.cxx index ce97261c765..030bef860ab 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/BeamSpotRetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/BeamSpotRetriever.cxx @@ -33,7 +33,7 @@ namespace JiveXML { StatusCode BeamSpotRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; DataVect x; x.reserve( 1 ); DataVect y; y.reserve( 1 ); @@ -51,7 +51,7 @@ namespace JiveXML { // add the following into the initialize routine. if ( m_beamSpotSvc.retrieve().isFailure() ) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to retrieve service " << m_beamSpotSvc << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to retrieve service " << m_beamSpotSvc << endmsg; return StatusCode::RECOVERABLE; } else { @@ -72,7 +72,7 @@ namespace JiveXML { // tiltX Tilt angle in x-z plane (rad) // tiltY Tilt angle in y-z plane (rad) - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_beamSpotSvc << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved service " << m_beamSpotSvc << endmsg; label.push_back( "Beamspot_position_at_PV_z_position" ); @@ -95,21 +95,21 @@ namespace JiveXML { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "BeamSpot Position: " - << m_beamSpotSvc->beamPos() << endreq; + << m_beamSpotSvc->beamPos() << endmsg; msg(MSG::DEBUG) << "BeamSpot Sigma " << m_beamSpotSvc->beamSigma(0) << ", " << m_beamSpotSvc->beamSigma(1) << ", " << m_beamSpotSvc->beamSigma(2) - << endreq; + << endmsg; msg(MSG::DEBUG) << "BeamSpot Tilt: " << m_beamSpotSvc->beamTilt(0) << ", " << m_beamSpotSvc->beamTilt(1) - << endreq; - msg(MSG::DEBUG) << "Beamspot position at PV z-position" << endreq; + << endmsg; + msg(MSG::DEBUG) << "Beamspot position at PV z-position" << endmsg; } //be verbose about the amount of data we retrieved - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved " << label.size() << "Beamspot" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved " << label.size() << "Beamspot" << endmsg; //Create a data map DataMap dataMap; @@ -131,7 +131,7 @@ namespace JiveXML { return StatusCode::RECOVERABLE; //Clean up and exit - if (msgLvl(MSG::DEBUG)) msg() << dataTypeName() << " retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << dataTypeName() << " retrieved" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/InDetGeoModelTool.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/InDetGeoModelTool.cxx index 8fe476791d2..9b72774ea1d 100644 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/InDetGeoModelTool.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/InDetGeoModelTool.cxx @@ -41,13 +41,13 @@ namespace JiveXML { // Get geo model manager if ( detStore()->retrieve(m_PixelGeoManager, "Pixel").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get Pixel GeoModel Manager!" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get Pixel GeoModel Manager!" << endmsg; return StatusCode::RECOVERABLE; } // Get identifier helper if (detStore()->retrieve(m_PixelIDHelper, "PixelID").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get Pixel ID helper" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get Pixel ID helper" << endmsg; return StatusCode::RECOVERABLE; } @@ -57,13 +57,13 @@ namespace JiveXML { // Get geo model manager if ( detStore()->retrieve(m_SCTGeoManager, "SCT").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get SCT GeoModel Manager!" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get SCT GeoModel Manager!" << endmsg; return StatusCode::RECOVERABLE; } // Get identifier helper if (detStore()->retrieve(m_SCTIDHelper, "SCT_ID").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get SCT ID helper" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get SCT ID helper" << endmsg; return StatusCode::RECOVERABLE; } @@ -72,12 +72,12 @@ namespace JiveXML { bool isSLHC = false; const IdDictManager* idDictMgr; if (detStore()->retrieve(idDictMgr, "IdDict").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get IdDictManager !" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get IdDictManager !" << endmsg; return StatusCode::RECOVERABLE; } else { const IdDictDictionary* dict = idDictMgr->manager()->find_dictionary("InnerDetector"); if(!dict) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << " Cannot access InnerDetector dictionary "<< endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << " Cannot access InnerDetector dictionary "<< endmsg; return StatusCode::RECOVERABLE; }else{ // if (dict->file_name().find("SLHC")!=std::string::npos) isSLHC=true; @@ -92,13 +92,13 @@ namespace JiveXML { // Get geo model manager if ( detStore()->retrieve(m_TRTGeoManager, "TRT").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get TRT GeoModel Manager!" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get TRT GeoModel Manager!" << endmsg; return StatusCode::RECOVERABLE; } // Get identifier helper if (detStore()->retrieve(m_TRTIDHelper, "TRT_ID").isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get TRT ID helper" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not get TRT ID helper" << endmsg; return StatusCode::RECOVERABLE; } } diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx index 85b2f89fdc9..bade266cc79 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx @@ -50,13 +50,13 @@ namespace JiveXML { StatusCode PixelClusterRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; //Retrieve the cluster container const InDet::SiClusterContainer* SiClusterCont; if (evtStore()->retrieve(SiClusterCont, m_PixelClusterCollName).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SiClusterContainer with name " << m_PixelClusterCollName << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SiClusterContainer with name " << m_PixelClusterCollName << endmsg; return StatusCode::RECOVERABLE; } @@ -65,7 +65,7 @@ namespace JiveXML { if ( evtStore()->contains<PRD_MultiTruthCollection>(m_PixelTruthMapName) ){ if ( evtStore()->retrieve(simClusterMap, m_PixelTruthMapName).isFailure() ){ //Just write out a warning if this fails - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not retrieve PRD_MultiTruthCollection with name " << m_PixelTruthMapName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not retrieve PRD_MultiTruthCollection with name " << m_PixelTruthMapName << endmsg; } } //Loop over all collections in the container and count the clusters @@ -111,7 +111,7 @@ namespace JiveXML { Identifier id = geo->PixelIDHelper()->wafer_id(cluster->identify()); InDetDD::SiDetectorElement* element = geo->PixelGeoManager()->getDetectorElement(id); if (!element){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not obtain Detector Element with ID " << id << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not obtain Detector Element with ID " << id << endmsg; continue ; } @@ -168,7 +168,7 @@ namespace JiveXML { } //Be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieved " << dataTypeName() << ": " << x0.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieved " << dataTypeName() << ": " << x0.size() << endmsg; //forward data to formating tool and return return FormatTool->AddToEvent(dataTypeName(), "", &dataMap); diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx index 772a53a6ede..6ac3a15f84b 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx @@ -44,12 +44,12 @@ namespace JiveXML { StatusCode PixelRDORetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; //retrieve the PixelRDO container const DataHandle<PixelRDO_Container> rdoContainer; if (evtStore()->retrieve(rdoContainer,m_PixelRDOContainerName).isFailure()) { - if (msgLvl(MSG::DEBUG)) msg() << "Unable to retrieve PixelRDO_Container with name " << m_PixelRDOContainerName << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Unable to retrieve PixelRDO_Container with name " << m_PixelRDOContainerName << endmsg; return StatusCode::RECOVERABLE; } @@ -76,7 +76,7 @@ namespace JiveXML { //Make sure we got the detector element if (element == NULL){ - msg(MSG::WARNING) << "Unable to obtain detector element for PixelRDO hit with id " << id << endreq; + msg(MSG::WARNING) << "Unable to obtain detector element for PixelRDO hit with id " << id << endmsg; continue; } @@ -95,7 +95,7 @@ namespace JiveXML { } //be verbose about the amount of data we retrieved - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved " << idVec.size() << " PixelRDO objects" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved " << idVec.size() << " PixelRDO objects" << endmsg; //Create a data map DataMap dataMap; @@ -115,7 +115,7 @@ namespace JiveXML { return StatusCode::RECOVERABLE; //Clean up and exit - if (msgLvl(MSG::DEBUG)) msg() << dataTypeName() << " retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << dataTypeName() << " retrieved" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx index 9fde0f5004e..48aab9e124b 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx @@ -43,12 +43,12 @@ namespace JiveXML { StatusCode SCTRDORetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; //Get an iterator over all containers const DataHandle<SCT_RDO_Container> SCTRDOContainer; if ((evtStore()->retrieve(SCTRDOContainer,m_SCTRDOContainerName)).isFailure()){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve SCT_RDO_Container with name " << m_SCTRDOContainerName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve SCT_RDO_Container with name " << m_SCTRDOContainerName << endmsg; return StatusCode::RECOVERABLE; } @@ -100,7 +100,7 @@ namespace JiveXML { const InDetDD::SiDetectorElement *element = geo->SCTGeoManager()->getDetectorElement(id); //Make sure we got the detector element if (element == NULL){ - msg(MSG::WARNING) << "Unable to obtain detector element for SCT_RDO hit with id " << id << endreq; + msg(MSG::WARNING) << "Unable to obtain detector element for SCT_RDO hit with id " << id << endmsg; continue ; } @@ -160,7 +160,7 @@ namespace JiveXML { dataMap["formatterError"] = formatterError; //Be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": " << ident.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": " << ident.size() << endmsg; //forward data to formating tool and return return FormatTool->AddToEvent(dataTypeName(), "", &dataMap); diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx index e6d94d182c7..72e5f4770af 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx @@ -49,13 +49,13 @@ namespace JiveXML { StatusCode SiClusterRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; //Retrieve the cluster container const InDet::SiClusterContainer* SiClusterCont; if (evtStore()->retrieve(SiClusterCont, m_SiClusterCollName).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SiClusterContainer with name " << m_SiClusterCollName << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SiClusterContainer with name " << m_SiClusterCollName << endmsg; return StatusCode::RECOVERABLE; } @@ -64,7 +64,7 @@ namespace JiveXML { if ( evtStore()->contains<PRD_MultiTruthCollection>(m_SiTruthMapName) ){ if ( evtStore()->retrieve(simClusterMap, m_SiTruthMapName).isFailure() ){ //Just write out a warning if this fails - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not retrieve PRD_MultiTruthCollection with name " << m_SiTruthMapName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not retrieve PRD_MultiTruthCollection with name " << m_SiTruthMapName << endmsg; } } //Loop over all collections in the container and count the clusters @@ -111,7 +111,7 @@ namespace JiveXML { Identifier id = geo->SCTIDHelper()->wafer_id(cluster->identify()); InDetDD::SiDetectorElement* element = geo->SCTGeoManager()->getDetectorElement(id); if (!element){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not obtain Detector Element with ID " << id << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not obtain Detector Element with ID " << id << endmsg; continue ; } @@ -179,7 +179,7 @@ namespace JiveXML { } //Be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieved " << dataTypeName() << ": " << x0.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieved " << dataTypeName() << ": " << x0.size() << endmsg; //forward data to formating tool and return return FormatTool->AddToEvent(dataTypeName(), "", &dataMap); diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx index dbc5b3db05e..3cbb5f52182 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx @@ -111,7 +111,7 @@ namespace JiveXML StatusCode SiSpacePointRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; /** * Try to retrieve all the relevant collections first @@ -123,18 +123,18 @@ namespace JiveXML //Try to retrieve all four from store gate if ( evtStore()->retrieve(PixelSPContainer, m_PixelSPContainerName).isFailure() ) - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve SpacePoint container with name " << m_PixelSPContainerName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve SpacePoint container with name " << m_PixelSPContainerName << endmsg; if ( evtStore()->contains<PRD_MultiTruthCollection>(m_PixelPRDTruthName) ){ if ( evtStore()->retrieve(PixelPRDTruthColl, m_PixelPRDTruthName).isFailure() ) - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve PRD_MultiTruth collection with name " << m_PixelPRDTruthName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve PRD_MultiTruth collection with name " << m_PixelPRDTruthName << endmsg; } if ( evtStore()->retrieve(SCTSPContainer, m_SCTSPContainerName).isFailure() ) - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve SpacePoint container with name " << m_SCTSPContainerName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve SpacePoint container with name " << m_SCTSPContainerName << endmsg; if ( evtStore()->contains<PRD_MultiTruthCollection>(m_SCTPRDTruthName) ){ if ( evtStore()->retrieve(SCTPRDTruthColl, m_SCTPRDTruthName).isFailure() ) - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve PRD_MultiTruth collection with name " << m_SCTPRDTruthName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Unable to retrieve PRD_MultiTruth collection with name " << m_SCTPRDTruthName << endmsg; } /** * Now make a list of SpacePoint - PRDTruth collection pairs to run over @@ -166,7 +166,7 @@ namespace JiveXML NSpacePoints += (**SpacePointCollItr).size(); } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Counted " << NSpacePoints << " in total" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Counted " << NSpacePoints << " in total" << endmsg; /** * Declare all the data we want to retrieve @@ -230,7 +230,7 @@ namespace JiveXML numBarcodes.push_back(SiSpacePointRetrieverHelpers::getTruthBarcodes(idFirst, idSecond, PRDTruthColl, barcodes)); if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Found " << numBarcodes.back() << " common barcodes, now " - << barcodes.size() << " in total" << endreq; + << barcodes.size() << " in total" << endmsg; } // loop over SpacePoint collection } // loop over SpacePoint container @@ -254,7 +254,7 @@ namespace JiveXML dataMap[bctag] = barcodes; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< x.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< x.size() << endmsg; //forward data to formating tool and return return FormatTool->AddToEvent(dataTypeName(), "", &dataMap); diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx index 7af02647d13..78be1e7dba9 100755 --- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx +++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx @@ -39,12 +39,12 @@ namespace JiveXML { StatusCode TRTRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() <<endmsg; //First try to retrieve the DriftCircleContainer const InDet::TRT_DriftCircleContainer* DriftCircleContainer; if ( evtStore()->retrieve(DriftCircleContainer, m_TRTDriftCircleCollName).isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrive TRT_DriftCircleContainer with name " << m_TRTDriftCircleCollName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrive TRT_DriftCircleContainer with name " << m_TRTDriftCircleCollName << endmsg; return StatusCode::RECOVERABLE; } @@ -53,7 +53,7 @@ namespace JiveXML { if ( evtStore()->contains<PRD_MultiTruthCollection>(m_TRTTruthMapName) ){ if ( evtStore()->retrieve(TRTMultiTruthMap, m_TRTTruthMapName).isFailure() ){ //Only warn if this container is not available - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve PRD_MultiTruthCollection with name " << m_TRTTruthMapName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve PRD_MultiTruthCollection with name " << m_TRTTruthMapName << endmsg; } } @@ -65,7 +65,7 @@ namespace JiveXML { NDriftCircleTotal += (*DriftCircleContItr)->size(); //be verbose - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Reserving space for " << NDriftCircleTotal << " entries" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Reserving space for " << NDriftCircleTotal << " entries" << endmsg; //Rerserve space in the map DataVect rhoz; rhoz.reserve(NDriftCircleTotal); @@ -95,13 +95,13 @@ namespace JiveXML { InDet::TRT_DriftCircle* driftcircle = (*DriftCircleCollItr); //In verbose mode, print out drift circle information - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Retrieving information from " << (*driftcircle) << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Retrieving information from " << (*driftcircle) << endmsg; Identifier id = driftcircle->identify(); //Check if it is valid if (! id.is_valid()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring TRT_DriftCircle with invalid identifier " << id << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring TRT_DriftCircle with invalid identifier " << id << endmsg; continue; } @@ -187,7 +187,7 @@ namespace JiveXML { } //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": " << rhoz.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": " << rhoz.size() << endmsg; //forward data to formating tool and return return FormatTool->AddToEvent(dataTypeName(), "", &dataMap); diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTOutputFile.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTOutputFile.cc index 18848d1cab1..5983d270486 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTOutputFile.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTOutputFile.cc @@ -16,12 +16,12 @@ TRTOutputFile::TRTOutputFile() : output("TRTOutput", std::ios::out), m_msg("TRTO { printMessages = ReadParameter("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTOutputFile" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTOutputFile" << endmsg; output << std::endl << " TRT output file" << std::endl << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTOutputFile done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTOutputFile done" << endmsg; } @@ -29,13 +29,13 @@ TRTOutputFile::TRTOutputFile() : output("TRTOutput", std::ios::out), m_msg("TRTO TRTOutputFile::~TRTOutputFile() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTOutputFile" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTOutputFile" << endmsg; output.close(); pOutputFile = NULL; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTOutputFile done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTOutputFile done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParameters.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParameters.cc index a1a8701762c..19024a0288c 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParameters.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParameters.cc @@ -21,14 +21,14 @@ TRTParameters::TRTParameters() : m_msg("TRTParameters") printMessages = GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParameters" << endmsg; ReadInputFile("TRT_G4Utilities_geometry.txt"); if (GetInteger("PrintListOfParameters")) PrintListOfParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParameters done" << endmsg; } @@ -36,11 +36,11 @@ TRTParameters::TRTParameters() : m_msg("TRTParameters") TRTParameters::~TRTParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParameters" << endmsg; pParameters = NULL; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParameters done" << endmsg; } @@ -48,7 +48,7 @@ TRTParameters::~TRTParameters() void TRTParameters::ReadInputFile(std::string fileName) { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::ReadInputFile" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::ReadInputFile" << endmsg; std::string file = PathResolver::find_file (fileName, "DATAPATH"); std::ifstream inputFile(file.c_str(), std::ios::in); @@ -147,7 +147,7 @@ void TRTParameters::ReadInputFile(std::string fileName) inputFile.close(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::ReadInputFile done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::ReadInputFile done" << endmsg; } @@ -155,7 +155,7 @@ void TRTParameters::ReadInputFile(std::string fileName) void TRTParameters::PrintListOfParameters() const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::PrintListOfParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::PrintListOfParameters" << endmsg; TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -169,7 +169,7 @@ void TRTParameters::PrintListOfParameters() const output << " " << (*i).first << "=" << (*i).second << std::endl; output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::PrintListOfParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParameters::PrintListOfParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfBarrelStraws.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfBarrelStraws.cc index 59de9e2ed44..097924a0a05 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfBarrelStraws.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfBarrelStraws.cc @@ -18,14 +18,14 @@ TRTParametersOfBarrelStraws::TRTParametersOfBarrelStraws(): m_msg("TRTParameters printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfBarrelStraws" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfBarrelStraws" << endmsg; DefineParameters(); if (pParameters->GetInteger("PrintParametersOfBarrelStraws")) PrintParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfBarrelStraws done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfBarrelStraws done" << endmsg; } @@ -33,9 +33,9 @@ TRTParametersOfBarrelStraws::TRTParametersOfBarrelStraws(): m_msg("TRTParameters TRTParametersOfBarrelStraws::~TRTParametersOfBarrelStraws() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfBarrelStraws" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfBarrelStraws" << endmsg; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfBarrelStraws done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfBarrelStraws done" << endmsg; } @@ -43,7 +43,7 @@ TRTParametersOfBarrelStraws::~TRTParametersOfBarrelStraws() void TRTParametersOfBarrelStraws::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfBarrelStraws::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfBarrelStraws::DefineParameters" << endmsg; // Parameters of straw hole: outerRadiusOfStrawHole = pParameters->GetDouble("OuterRadiusOfStrawHole"); @@ -87,7 +87,7 @@ void TRTParametersOfBarrelStraws::DefineParameters() lengthOfLongDeadRegion; if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfBarrelStraws::DefineParameters" - << " done" << endreq; + << " done" << endmsg; } @@ -96,7 +96,7 @@ void TRTParametersOfBarrelStraws::DefineParameters() void TRTParametersOfBarrelStraws::PrintParameters() const { if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfBarrelStraws::PrintParameters" - << endreq; + << endmsg; TRTUtilities* pUtilities = TRTUtilities::GetPointer(); TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -153,5 +153,5 @@ void TRTParametersOfBarrelStraws::PrintParameters() const output << std::endl; if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfBarrelStraws::PrintParameters" - << " done" << endreq; + << " done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesA.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesA.cc index a71c999ddf9..19eed5cc616 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesA.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesA.cc @@ -18,11 +18,11 @@ TRTParametersOfModulesA::TRTParametersOfModulesA() : m_msg("TRTParametersOfModul printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesA" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesA" << endmsg; DefineParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesA done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesA done" << endmsg; } @@ -30,14 +30,14 @@ TRTParametersOfModulesA::TRTParametersOfModulesA() : m_msg("TRTParametersOfModul TRTParametersOfModulesA::~TRTParametersOfModulesA() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesA" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesA" << endmsg; delete [] xLocalOfHolesA; delete [] zLocalOfHolesA; delete [] xOfCoolingTubesA; delete [] zOfCoolingTubesA; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesA done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesA done" << endmsg; } @@ -45,7 +45,7 @@ TRTParametersOfModulesA::~TRTParametersOfModulesA() void TRTParametersOfModulesA::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::DefineParameters" << endmsg; // Distances between corners of shell A: int numberOfShellCorners = pParameters->GetInteger("NumberOfShellCorners"); @@ -252,7 +252,7 @@ void TRTParametersOfModulesA::DefineParameters() delete [] xGlobalOfHolesA; delete [] yGlobalOfHolesA; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::DefineParameters done" << endmsg; } @@ -261,7 +261,7 @@ void TRTParametersOfModulesA::DefineParameters() void TRTParametersOfModulesA::PrintParameters(double* xGlobalOfHolesA, double* yGlobalOfHolesA) const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::PrintParameters" << endmsg; TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -361,5 +361,5 @@ void TRTParametersOfModulesA::PrintParameters(double* xGlobalOfHolesA, output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesA::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesB.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesB.cc index 5e8c63c9adf..0d4886f3ba9 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesB.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesB.cc @@ -18,11 +18,11 @@ TRTParametersOfModulesB::TRTParametersOfModulesB(): m_msg("TRTParametersOfModule printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesB" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesB" << endmsg; DefineParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesB done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesB done" << endmsg; } @@ -30,7 +30,7 @@ TRTParametersOfModulesB::TRTParametersOfModulesB(): m_msg("TRTParametersOfModule TRTParametersOfModulesB::~TRTParametersOfModulesB() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesB" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesB" << endmsg; delete [] xLocalOfHolesB; delete [] zLocalOfHolesB; @@ -39,7 +39,7 @@ TRTParametersOfModulesB::~TRTParametersOfModulesB() delete [] xOfHolesForCoolingTubesB; delete [] zOfHolesForCoolingTubesB; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesB done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesB done" << endmsg; } @@ -47,7 +47,7 @@ TRTParametersOfModulesB::~TRTParametersOfModulesB() void TRTParametersOfModulesB::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::DefineParameters" << endmsg; // Distances between corners of shell B: int numberOfShellCorners = pParameters->GetInteger("NumberOfShellCorners"); @@ -264,7 +264,7 @@ void TRTParametersOfModulesB::DefineParameters() delete [] xGlobalOfHolesB; delete [] yGlobalOfHolesB; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::DefineParameters done" << endmsg; } @@ -273,7 +273,7 @@ void TRTParametersOfModulesB::DefineParameters() void TRTParametersOfModulesB::PrintParameters(double* xGlobalOfHolesB, double* yGlobalOfHolesB) const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::PrintParameters" << endmsg; TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -385,5 +385,5 @@ void TRTParametersOfModulesB::PrintParameters(double* xGlobalOfHolesB, output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesB::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesC.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesC.cc index f5cbb49ca81..a28da445477 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesC.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfModulesC.cc @@ -18,11 +18,11 @@ TRTParametersOfModulesC::TRTParametersOfModulesC() : m_msg("TRTParametersOfModul printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesC" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesC" << endmsg; DefineParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesC done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfModulesC done" << endmsg; } @@ -30,7 +30,7 @@ TRTParametersOfModulesC::TRTParametersOfModulesC() : m_msg("TRTParametersOfModul TRTParametersOfModulesC::~TRTParametersOfModulesC() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesC" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesC" << endmsg; delete [] xLocalOfHolesC; delete [] zLocalOfHolesC; @@ -39,7 +39,7 @@ TRTParametersOfModulesC::~TRTParametersOfModulesC() delete [] xOfHolesForCoolingTubesC; delete [] zOfHolesForCoolingTubesC; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesC done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfModulesC done" << endmsg; } @@ -47,7 +47,7 @@ TRTParametersOfModulesC::~TRTParametersOfModulesC() void TRTParametersOfModulesC::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::DefineParameters" << endmsg; // Distances between corners of shell C: int numberOfShellCorners = pParameters->GetInteger("NumberOfShellCorners"); @@ -264,7 +264,7 @@ void TRTParametersOfModulesC::DefineParameters() delete [] xGlobalOfHolesC; delete [] yGlobalOfHolesC; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::DefineParameters done" << endmsg; } @@ -273,7 +273,7 @@ void TRTParametersOfModulesC::DefineParameters() void TRTParametersOfModulesC::PrintParameters(double* xGlobalOfHolesC, double* yGlobalOfHolesC) const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::PrintParameters" << endmsg; TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -386,5 +386,5 @@ void TRTParametersOfModulesC::PrintParameters(double* xGlobalOfHolesC, output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfModulesC::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfStrawPlanes.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfStrawPlanes.cc index c058e61a6b1..0b7ec34b8d5 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfStrawPlanes.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfStrawPlanes.cc @@ -19,14 +19,14 @@ TRTParametersOfStrawPlanes::TRTParametersOfStrawPlanes() : m_msg("TRTParametersO printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfStrawPlanes" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfStrawPlanes" << endmsg; DefineParameters(); if (pParameters->GetInteger("PrintParametersOfStrawPlanes")) PrintParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfStrawPlanes done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfStrawPlanes done" << endmsg; } @@ -34,9 +34,9 @@ TRTParametersOfStrawPlanes::TRTParametersOfStrawPlanes() : m_msg("TRTParametersO TRTParametersOfStrawPlanes::~TRTParametersOfStrawPlanes() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfStrawPlanes" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfStrawPlanes" << endmsg; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfStrawPlanes done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfStrawPlanes done" << endmsg; } @@ -44,7 +44,7 @@ TRTParametersOfStrawPlanes::~TRTParametersOfStrawPlanes() void TRTParametersOfStrawPlanes::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::DefineParameters" << endmsg; // Parameters of straw plane: innerRadiusOfStrawPlanesAB = pParameters->GetDouble("InnerRadiusOfWheelsAB") + @@ -126,7 +126,7 @@ void TRTParametersOfStrawPlanes::DefineParameters() lengthOfGasC = lengthOfStrawC - lengthOfDeadRegion * 2.; } - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::DefineParameters" << " done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::DefineParameters" << " done" << endmsg; } @@ -134,7 +134,7 @@ void TRTParametersOfStrawPlanes::DefineParameters() void TRTParametersOfStrawPlanes::PrintParameters() const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::PrintParameters" << endmsg; TRTUtilities* pUtilities = TRTUtilities::GetPointer(); TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -210,5 +210,5 @@ void TRTParametersOfStrawPlanes::PrintParameters() const output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfStrawPlanes::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsA.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsA.cc index 0904fb399c3..a3649b9ca67 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsA.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsA.cc @@ -18,14 +18,14 @@ TRTParametersOfWheelsA::TRTParametersOfWheelsA() : m_msg("TRTParametersOfWheelsA printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsA" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsA" << endmsg; DefineParameters(); if (pParameters->GetInteger("PrintParametersOfWheelsA")) PrintParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsA done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsA done" << endmsg; } @@ -33,7 +33,7 @@ TRTParametersOfWheelsA::TRTParametersOfWheelsA() : m_msg("TRTParametersOfWheelsA TRTParametersOfWheelsA::~TRTParametersOfWheelsA() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsA" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsA" << endmsg; delete [] positionsOfWheelsA; delete [] positionsOfStrawPlanesA; @@ -41,7 +41,7 @@ TRTParametersOfWheelsA::~TRTParametersOfWheelsA() delete [] positionsOfMainRadiatorsA; delete [] positionsOfThinRadiatorsA; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsA done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsA done" << endmsg; } @@ -49,7 +49,7 @@ TRTParametersOfWheelsA::~TRTParametersOfWheelsA() void TRTParametersOfWheelsA::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::DefineParameters" << endmsg; // Parameters of wheels A: numberOfWheelsA = pParameters->GetInteger("NumberOfWheelsA"); @@ -130,7 +130,7 @@ void TRTParametersOfWheelsA::DefineParameters() outerRadiusOfStraw + lengthOfMainRadiatorA / 2.; } - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::DefineParameters done" << endmsg; } @@ -138,7 +138,7 @@ void TRTParametersOfWheelsA::DefineParameters() void TRTParametersOfWheelsA::PrintParameters() const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::PrintParameters" << endmsg; TRTUtilities* pUtilities = TRTUtilities::GetPointer(); TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -205,5 +205,5 @@ void TRTParametersOfWheelsA::PrintParameters() const output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsA::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsB.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsB.cc index c420f1517a2..2db5f2af83d 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsB.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsB.cc @@ -18,14 +18,14 @@ TRTParametersOfWheelsB::TRTParametersOfWheelsB() : m_msg("TRTParametersOfWheelsB printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsB" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsB" << endmsg; DefineParameters(); if (pParameters->GetInteger("PrintParametersOfWheelsB")) PrintParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsB done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsB done" << endmsg; } @@ -33,7 +33,7 @@ TRTParametersOfWheelsB::TRTParametersOfWheelsB() : m_msg("TRTParametersOfWheelsB TRTParametersOfWheelsB::~TRTParametersOfWheelsB() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsB" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsB" << endmsg; delete [] positionsOfWheelsB; delete [] positionsOfStrawPlanesB; @@ -42,7 +42,7 @@ TRTParametersOfWheelsB::~TRTParametersOfWheelsB() delete [] positionsOfThinRadiatorsB; delete [] positionsOfMiddleRadiatorsB; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsB done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTParametersOfWheelsB done" << endmsg; } @@ -50,7 +50,7 @@ TRTParametersOfWheelsB::~TRTParametersOfWheelsB() void TRTParametersOfWheelsB::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::DefineParameters" << endmsg; // Parameters of wheels B: numberOfWheelsB = pParameters->GetInteger("NumberOfWheelsB"); @@ -142,7 +142,7 @@ void TRTParametersOfWheelsB::DefineParameters() positionsOfMiddleRadiatorsB[1] = positionsOfStrawPlanesB[4] - outerRadiusOfStraw - lengthOfMiddleRadiatorB / 2.; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::DefineParameters done" << endmsg; } @@ -150,7 +150,7 @@ void TRTParametersOfWheelsB::DefineParameters() void TRTParametersOfWheelsB::PrintParameters() const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::PrintParameters" << endmsg; TRTUtilities* pUtilities = TRTUtilities::GetPointer(); TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -228,5 +228,5 @@ void TRTParametersOfWheelsB::PrintParameters() const output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsB::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsC.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsC.cc index 3bd1ea11bbf..d44e0e9a53d 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsC.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTParametersOfWheelsC.cc @@ -19,14 +19,14 @@ TRTParametersOfWheelsC::TRTParametersOfWheelsC() : m_msg("TRTParametersOfWheelsC printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsC" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsC" << endmsg; DefineParameters(); if (pParameters->GetInteger("PrintParametersOfWheelsC")) PrintParameters(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsC done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTParametersOfWheelsC done" << endmsg; } @@ -34,7 +34,7 @@ TRTParametersOfWheelsC::TRTParametersOfWheelsC() : m_msg("TRTParametersOfWheelsC TRTParametersOfWheelsC::~TRTParametersOfWheelsC() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTParametersOfWheelsC" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTParametersOfWheelsC" << endmsg; delete [] positionsOfWheelsC; delete [] positionsOfStrawPlanesC; @@ -42,7 +42,7 @@ TRTParametersOfWheelsC::~TRTParametersOfWheelsC() delete [] positionsOfMainRadiatorsC; delete [] positionsOfThinRadiatorsC; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTParametersOfWheelsC done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTParametersOfWheelsC done" << endmsg; } @@ -51,7 +51,7 @@ TRTParametersOfWheelsC::~TRTParametersOfWheelsC() void TRTParametersOfWheelsC::DefineParameters() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::DefineParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::DefineParameters" << endmsg; // Parameters of wheels C: numberOfWheelsC = pParameters->GetInteger("NumberOfWheelsC"); @@ -130,7 +130,7 @@ void TRTParametersOfWheelsC::DefineParameters() outerRadiusOfStraw + lengthOfMainRadiatorC / 2.; } - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::DefineParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::DefineParameters done" << endmsg; } @@ -138,7 +138,7 @@ void TRTParametersOfWheelsC::DefineParameters() void TRTParametersOfWheelsC::PrintParameters() const { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::PrintParameters" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::PrintParameters" << endmsg; TRTUtilities* pUtilities = TRTUtilities::GetPointer(); TRTOutputFile* pOutputFile = TRTOutputFile::GetPointer(); @@ -205,5 +205,5 @@ void TRTParametersOfWheelsC::PrintParameters() const output << std::endl; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::PrintParameters done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTParametersOfWheelsC::PrintParameters done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTUtilities.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTUtilities.cc index 49a2ac1e2a4..f9349cba38d 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTUtilities.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTUtilities.cc @@ -21,11 +21,11 @@ TRTUtilities::TRTUtilities() : m_msg("TRTUtilities") printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTUtilities" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTUtilities" << endmsg; pOutputFile = NULL; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTUtilities done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTUtilities done" << endmsg; } @@ -33,11 +33,11 @@ TRTUtilities::TRTUtilities() : m_msg("TRTUtilities") TRTUtilities::~TRTUtilities() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTUtilities" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTUtilities" << endmsg; pUtilities = NULL; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTUtilities done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTUtilities done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTVisualization.cc b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTVisualization.cc index 8c9fa571349..a629ea50b52 100644 --- a/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTVisualization.cc +++ b/InnerDetector/InDetG4/TRT_G4Utilities/src/TRTVisualization.cc @@ -21,11 +21,11 @@ TRTVisualization::TRTVisualization(): m_msg("TRTVisualization") printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTVisualization" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTVisualization" << endmsg; Initialize(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTVisualization done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTVisualization done" << endmsg; } @@ -33,11 +33,11 @@ TRTVisualization::TRTVisualization(): m_msg("TRTVisualization") TRTVisualization::~TRTVisualization() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTVisualization" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTVisualization" << endmsg; pVisualization = NULL; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTVisualization done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Destructor TRTVisualization done" << endmsg; } @@ -45,7 +45,7 @@ TRTVisualization::~TRTVisualization() void TRTVisualization::Initialize() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTVisualization::Initialize" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTVisualization::Initialize" << endmsg; pVisAttributeRed = new G4VisAttributes(G4Colour(1., 0., 0.)); pVisAttributeRed->SetVisibility(true); @@ -68,7 +68,7 @@ void TRTVisualization::Initialize() pVisAttributeBlack = new G4VisAttributes(G4Colour(0., 0., 0.)); pVisAttributeBlack->SetVisibility(true); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTVisualization::Initialize done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "######### Method TRTVisualization::Initialize done" << endmsg; } diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/TRTPrintingOfHits.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/TRTPrintingOfHits.cxx index ca56281f143..f6ca6c31915 100644 --- a/InnerDetector/InDetG4/TRT_G4_SD/src/TRTPrintingOfHits.cxx +++ b/InnerDetector/InDetG4/TRT_G4_SD/src/TRTPrintingOfHits.cxx @@ -21,14 +21,14 @@ TRTPrintingOfHits::TRTPrintingOfHits(): m_msg("TRTPrintingOfHits") m_printMessages = pParameters->GetInteger("PrintMessages"); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTPrintingOfHits" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTPrintingOfHits" << endmsg; m_mask = 0x0000001F; m_shift = 5; m_pOutputFile = TRTOutputFile::GetPointer(); - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTPrintingOfHits done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "##### Constructor TRTPrintingOfHits done" << endmsg; } @@ -36,8 +36,8 @@ TRTPrintingOfHits::TRTPrintingOfHits(): m_msg("TRTPrintingOfHits") TRTPrintingOfHits::~TRTPrintingOfHits() { - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTPrintingOfHits" << endreq; - if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTPrintingOfHits done" << endreq; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTPrintingOfHits" << endmsg; + if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) << "####### Destructor TRTPrintingOfHits done" << endmsg; } diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorLocalFrames.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorLocalFrames.cxx index 805d81a4c98..cf48118516c 100644 --- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorLocalFrames.cxx +++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorLocalFrames.cxx @@ -67,41 +67,41 @@ GetDetectorLocalFrames::GetDetectorLocalFrames(std::string const& name, ISvcLoc /** initialize */ StatusCode GetDetectorLocalFrames::initialize(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "initialize()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "initialize()" << endmsg; /** Retrive TRT info */ if (detStore()->retrieve(m_TRTHelper, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the TRT ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the TRT ID" << endmsg; if ((detStore()->retrieve(m_TRTDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving TRT_DetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving TRT_DetectorManager" << endmsg; return StatusCode::FAILURE; } /** Retrive SCT info */ if (detStore()->retrieve(m_SCTHelper, "SCT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get SCT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get SCT ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the SCT ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the SCT ID" << endmsg; if ((detStore()->retrieve(m_SCTDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving SCT_DetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving SCT_DetectorManager" << endmsg; return StatusCode::FAILURE; } /** Retrive Pixel info */ if (detStore()->retrieve(m_PixelHelper, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the Pixel ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the Pixel ID" << endmsg; if ((detStore()->retrieve(m_pixelDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving PixelDetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving PixelDetectorManager" << endmsg; return StatusCode::FAILURE; } @@ -114,7 +114,7 @@ StatusCode GetDetectorLocalFrames::initialize(){ /** execute */ StatusCode GetDetectorLocalFrames::execute() { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "execute() check global position" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "execute() check global position" << endmsg; StatusCode sc = StatusCode::SUCCESS; static int eventCount(-1); eventCount++; @@ -141,7 +141,7 @@ StatusCode GetDetectorLocalFrames::execute() { /** Finalize */ StatusCode GetDetectorLocalFrames::finalize() { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "finalize()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "finalize()" << endmsg; /** Close the file */ outputFile.close(); @@ -151,7 +151,7 @@ StatusCode GetDetectorLocalFrames::finalize() { /** Writing the Pixel Positions */ void GetDetectorLocalFrames::writePixelFames(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writePixelFames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writePixelFames()" << endmsg; //Loop over pixel elements std::vector<Identifier>::const_iterator pixIt = m_PixelHelper->wafer_begin(); @@ -163,13 +163,13 @@ void GetDetectorLocalFrames::writePixelFames(){ } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writePixelFames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writePixelFames()" << endmsg; return; } /** Writing the SCT Positions */ void GetDetectorLocalFrames::writeSCTFrames(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSCTFrames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSCTFrames()" << endmsg; //Loop over SCT elements std::vector<Identifier>::const_iterator sctIt = m_SCTHelper->wafer_begin(); @@ -180,13 +180,13 @@ void GetDetectorLocalFrames::writeSCTFrames(){ // Get local Frame } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeSCTFrames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeSCTFrames()" << endmsg; return; } /** Writing the Detailed (all straws) TRT Positions */ void GetDetectorLocalFrames::writeTRTFrames(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTFrames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTFrames()" << endmsg; TRT_ID::const_expanded_id_iterator trtStrawIt = m_TRTHelper->straw_begin(); TRT_ID::const_expanded_id_iterator trtStrawItE = m_TRTHelper->straw_end(); @@ -238,21 +238,21 @@ void GetDetectorLocalFrames::writeTRTFrames(){ outputFile << std::endl; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTFrames()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTFrames()" << endmsg; return; } void GetDetectorLocalFrames::writeVector(std::string name, const Amg::Vector3D& vector){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeVector()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeVector()" << endmsg; outputFile << name << " " << vector.x() << " " << vector.y() << " " << vector.z() << std::endl; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeVector()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeVector()" << endmsg; return; } void GetDetectorLocalFrames::writeTransForm(const HepGeom::Transform3D& transform){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTransForm()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTransForm()" << endmsg; outputFile << " Trans(x,y,z): " << transform.dx() << " " << transform.dy() << " " << transform.dz() << std::endl; outputFile << " Rotation Matrix " << std::endl; @@ -260,7 +260,7 @@ void GetDetectorLocalFrames::writeTransForm(const HepGeom::Transform3D& transfor outputFile << transform.yx() << " " << transform.yy() << " " << transform.yz() << std::endl; outputFile << transform.zx() << " " << transform.zy() << " " << transform.zz() << std::endl; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTransForm()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTransForm()" << endmsg; return; } diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx index 72f13b00fa8..e462544bef0 100644 --- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx +++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx @@ -84,41 +84,41 @@ GetDetectorPositions::GetDetectorPositions(std::string const& name, ISvcLocator /** initialize */ StatusCode GetDetectorPositions::initialize(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "initialize()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "initialize()" << endmsg; /** Retrive TRT info */ if (detStore()->retrieve(m_TRTHelper, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the TRT ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the TRT ID" << endmsg; if ((detStore()->retrieve(m_TRTDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving TRT_DetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving TRT_DetectorManager" << endmsg; return StatusCode::FAILURE; } /** Retrive SCT info */ if (detStore()->retrieve(m_SCTHelper, "SCT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get SCT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get SCT ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the SCT ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the SCT ID" << endmsg; if ((detStore()->retrieve(m_SCTDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving SCT_DetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving SCT_DetectorManager" << endmsg; return StatusCode::FAILURE; } /** Retrive Pixel info */ if (detStore()->retrieve(m_PixelHelper, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the Pixel ID" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "got the Pixel ID" << endmsg; if ((detStore()->retrieve(m_pixelDetectorManager)).isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving PixelDetectorManager" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Problem retrieving PixelDetectorManager" << endmsg; return StatusCode::FAILURE; } @@ -131,7 +131,7 @@ StatusCode GetDetectorPositions::initialize(){ /** execute */ StatusCode GetDetectorPositions::execute() { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "execute() check global position" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "execute() check global position" << endmsg; //StatusCode sc = StatusCode::SUCCESS; static int eventCount(-1); eventCount++; @@ -158,7 +158,7 @@ StatusCode GetDetectorPositions::execute() { /** Finalize */ StatusCode GetDetectorPositions::finalize() { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "finalize()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "finalize()" << endmsg; /** Close the file */ outputFile.close(); @@ -168,7 +168,7 @@ StatusCode GetDetectorPositions::finalize() { /** Writing the Pixel Positions */ void GetDetectorPositions::writePixelPositions(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writePixelPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writePixelPositions()" << endmsg; //Loop over pixel elements std::vector<Identifier>::const_iterator pixIt = m_PixelHelper->wafer_begin(); @@ -197,13 +197,13 @@ void GetDetectorPositions::writePixelPositions(){ << std::endl; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writePixelPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writePixelPositions()" << endmsg; return; } /** Writing the SCT Positions */ void GetDetectorPositions::writeSCTPositions(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSCTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSCTPositions()" << endmsg; //Loop over SCT elements std::vector<Identifier>::const_iterator sctIt = m_SCTHelper->wafer_begin(); @@ -232,13 +232,13 @@ void GetDetectorPositions::writeSCTPositions(){ << std::endl; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeSCTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeSCTPositions()" << endmsg; return; } /** Writing the TRT positions (depends on the level of detail) */ void GetDetectorPositions::writeTRTPositions(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endmsg; //Write TRT positions switch(m_detailLevel) { @@ -259,13 +259,13 @@ void GetDetectorPositions::writeTRTPositions(){ break; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endmsg; return; } /** Writing the Simple (not all straws) TRT Positions */ void GetDetectorPositions::writeSimpleTRTPositions(){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSimpleTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeSimpleTRTPositions()" << endmsg; //Loop over TRT elements std::vector<Identifier>::const_iterator trtStrawLayIt = m_TRTHelper->straw_layer_begin(); @@ -275,13 +275,13 @@ void GetDetectorPositions::writeSimpleTRTPositions(){ writeTRTPositions(*trtStrawLayIt); } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endmsg; return; } /** Writing the Detailed (all straws) TRT Positions */ void GetDetectorPositions::writeDetailedTRTPositions(bool doDoubleSampling){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeDetailedTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeDetailedTRTPositions()" << endmsg; TRT_ID::const_expanded_id_iterator trtStrawIt = m_TRTHelper->straw_begin(); TRT_ID::const_expanded_id_iterator trtStrawItE = m_TRTHelper->straw_end(); @@ -301,13 +301,13 @@ void GetDetectorPositions::writeDetailedTRTPositions(bool doDoubleSampling){ writeTRTPositions(trtId); } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeDetailedTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeDetailedTRTPositions()" << endmsg; return; } /** Write the TRT Positions */ void GetDetectorPositions::writeTRTPositions(Identifier const& trtId){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTRTPositions()" << endmsg; const Amg::Vector3D &p3d = m_TRTDetectorManager->getElement( trtId )->center(trtId); @@ -335,7 +335,7 @@ void GetDetectorPositions::writeTRTPositions(Identifier const& trtId){ << m_trt_z << " " << std::endl; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTPositions()" << endmsg; return; } @@ -345,7 +345,7 @@ void GetDetectorPositions::writeTRTPositions(Identifier const& trtId){ Allows the wire-by-wire alignment to be debugged */ void GetDetectorPositions::writeTwoTRTPositions(Identifier const& trtId){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTwoTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In writeTwoTRTPositions()" << endmsg; const Amg::Vector3D &p3d = m_TRTDetectorManager->getElement( trtId )->center(trtId); @@ -394,6 +394,6 @@ void GetDetectorPositions::writeTwoTRTPositions(Identifier const& trtId){ << std::endl; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTPositions()" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Leaving writeTRTPositions()" << endmsg; return; } diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx index 16e9e7b4a36..e88bbe1b2a6 100644 --- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx +++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx @@ -138,12 +138,12 @@ StatusCode DiMuMon::initialize(){ // IAlgTool* ptool; //sc = serviceLocator->service("ToolSvc", toolSvc, true); //if ( sc.isFailure() ) { - //msg(MSG::WARNING) << "Could not locate toolSvc"<<endreq; + //msg(MSG::WARNING) << "Could not locate toolSvc"<<endmsg; //return sc; //} //sc = toolSvc->retrieveTool("TrackIsolationTool", ptool); //if ( sc.isFailure() ) { - //msg(MSG::WARNING) << "Could not retrieve track isolation tool!" << endreq; + //msg(MSG::WARNING) << "Could not retrieve track isolation tool!" << endmsg; //return sc; //} //m_isolationTool = dynamic_cast<TrackIsolationTool*>(ptool); @@ -177,7 +177,7 @@ StatusCode DiMuMon::bookHistograms() // const EventInfo* thisEventInfo; // sc=evtStore()->retrieve(thisEventInfo); // if (sc != StatusCode::SUCCESS) { -// if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endreq; +// if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg; // } // else { // m_lumiBlockNum = thisEventInfo->event_ID()->lumi_block(); @@ -658,7 +658,7 @@ void DiMuMon::RegisterHisto(MonGroup& mon, T* histo) { StatusCode sc = mon.regHist(histo); if (sc.isFailure() ) { - msg(MSG::WARNING) << "Cannot book histogram:" << endreq; + msg(MSG::WARNING) << "Cannot book histogram:" << endmsg; } } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx index 5e73182f3a0..6b073767176 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx @@ -605,7 +605,7 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){ if ( evtStore()->retrieve(evtInfo).isFailure() ){ m_current_LB = 0; if ( msgLvl(MSG::WARNING) ){ - msg(MSG::WARNING) << "Could not retrieve the event information container" << endreq; + msg(MSG::WARNING) << "Could not retrieve the event information container" << endmsg; } } else { m_current_LB = evtInfo->event_ID()->lumi_block(); @@ -631,7 +631,7 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){ if (vxContainer->size() == 1) { if ( msgLvl(MSG::DEBUG ) ) { - msg(MSG::DEBUG) << "vxContainer size = 1 ->contains only dummy vertex" << endreq; + msg(MSG::DEBUG) << "vxContainer size = 1 ->contains only dummy vertex" << endmsg; } } else{ @@ -757,7 +757,7 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){ const EventInfo * evtInfo; if ( evtStore()->retrieve(evtInfo).isFailure() ){ if ( msgLvl(MSG::WARNING) ){ - msg(MSG::WARNING) << "Could not retrieve the event information container" << endreq; + msg(MSG::WARNING) << "Could not retrieve the event information container" << endmsg; } } else { ecr = (evtInfo->trigger_info()->extendedLevel1ID() & 0xff000000) >> 24; // Returns the extendedLevel1ID of the trigger information object diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx index e41f2121d60..58afa16caaf 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx @@ -83,10 +83,10 @@ StatusCode InDetGlobalBeamSpotMonTool::initialize() { if(!sc.isSuccess()) return sc; if ( m_beamCondSvc.retrieve().isFailure() ) { - msg(MSG::WARNING) << "Failed to retrieve beamspot service " << m_beamCondSvc << " - will use nominal beamspot at (0,0,0)" << endreq; + msg(MSG::WARNING) << "Failed to retrieve beamspot service " << m_beamCondSvc << " - will use nominal beamspot at (0,0,0)" << endmsg; } else { m_hasBeamCondSvc = true; - msg(MSG::INFO) << "Retrieved service " << m_beamCondSvc << endreq; + msg(MSG::INFO) << "Retrieved service " << m_beamCondSvc << endmsg; } return StatusCode::SUCCESS; @@ -187,7 +187,7 @@ StatusCode InDetGlobalBeamSpotMonTool::fillHistograms() { m_hBsTiltY->Fill(1e6*beamTiltY); if (msgLvl(MSG::DEBUG)) msg() << "Beamspot from " << m_beamCondSvc << ": x0 = " << beamSpotX << ", y0 = " << beamSpotY << ", z0 = " << beamSpotZ << ", tiltX = " << beamTiltX - << ", tiltY = " << beamTiltY <<endreq; + << ", tiltY = " << beamTiltY <<endmsg; } const xAOD::TrackParticleContainer* trackCollection = evtStore()->tryConstRetrieve<xAOD::TrackParticleContainer>(m_trackContainerName); diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx index fd7e28c1030..b797224aaae 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalErrorMonTool.cxx @@ -50,20 +50,20 @@ InDetGlobalErrorMonTool::InDetGlobalErrorMonTool( const std::string & type, StatusCode InDetGlobalErrorMonTool::initialize() { if (detStore()->retrieve(m_pixID, "PixelID").isFailure()){ - msg(MSG::ERROR) << "Could not retrieve Pixel ID helper" << endreq; + msg(MSG::ERROR) << "Could not retrieve Pixel ID helper" << endmsg; return StatusCode::FAILURE; } if (detStore()->retrieve(m_pixManager, "Pixel").isFailure()){ - msg(MSG::ERROR) << "Could not retrieve Pixel Detector Manager" << endreq; + msg(MSG::ERROR) << "Could not retrieve Pixel Detector Manager" << endmsg; return StatusCode::FAILURE; } if (detStore()->retrieve(m_sctManager, "SCT").isFailure()){ - msg(MSG::ERROR) << "Could not retrieve SCT Detector Manager" << endreq; + msg(MSG::ERROR) << "Could not retrieve SCT Detector Manager" << endmsg; return StatusCode::FAILURE; } if (m_pixCond.retrieve().isFailure()){ - msg(MSG::ERROR) << "Could not retrieve Pixel conditions service!" << endreq; + msg(MSG::ERROR) << "Could not retrieve Pixel conditions service!" << endmsg; return StatusCode::FAILURE; } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalHitsMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalHitsMonTool.cxx index a308be83a96..776c3d7474a 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalHitsMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalHitsMonTool.cxx @@ -129,7 +129,7 @@ InDetGlobalHitsMonTool::InDetGlobalHitsMonTool(const std::string & type, StatusCode InDetGlobalHitsMonTool::initialize(){ if ( ManagedMonitorToolBase::initialize().isFailure() ) { - if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endreq; + if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endmsg; return StatusCode::FAILURE; } @@ -281,7 +281,7 @@ StatusCode InDetGlobalHitsMonTool::fillHistograms() const Trk::Track *track=(*itrack); if (track == 0){ if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) - << "no pointer to track!!!" << endreq; break; + << "no pointer to track!!!" << endmsg; break; } const Trk::Perigee *measPerigee = dynamic_cast<const Trk::Perigee *>(track->perigeeParameters()); @@ -291,7 +291,7 @@ StatusCode InDetGlobalHitsMonTool::fillHistograms() if (trackStates == 0) { if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "for current track is TrackStateOnSurfaces == Null " - << endreq; + << endmsg; } else { DataVector<const Trk::TrackStateOnSurface>::const_iterator it=trackStates->begin(); DataVector<const Trk::TrackStateOnSurface>::const_iterator it_end=trackStates->end(); @@ -403,7 +403,7 @@ StatusCode InDetGlobalHitsMonTool::procHistograms() StatusCode InDetGlobalHitsMonTool::processHit( const Trk::Track *track, const Trk::TrackStateOnSurface* trackState ) { if (trackState == 0) { - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "TrackStateOnSurface == Null, is the tracking OK?" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "TrackStateOnSurface == Null, is the tracking OK?" << endmsg; return StatusCode::FAILURE; } //if ( !(trackState->type() == 0) ) { @@ -453,7 +453,7 @@ StatusCode InDetGlobalHitsMonTool::processHit( const Trk::Track *track, const Tr if (RawDataClus==0) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "SiCluster WITHOUT prepRawData!!!!" - << endreq; + << endmsg; } else { if (RawDataClus->detectorElement()->isSCT()) { switch ( m_sctID->barrel_ec( RawDataClus->identify() ) ) { diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalManager.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalManager.cxx index 852f0290757..12ff969805a 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalManager.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalManager.cxx @@ -62,21 +62,21 @@ StatusCode InDetGlobalManager::initialize() const TRT_ID *trtID = 0; if (detStore()->retrieve(trtID, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } const SCT_ID *sctID = 0; if (detStore()->retrieve(sctID, "SCT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get SCT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get SCT ID helper" << endmsg; return StatusCode::FAILURE; } const PixelID *pixelID = 0; if (detStore()->retrieve(pixelID, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } @@ -121,10 +121,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(sct_tracks, m_SCTTracksName); if ( msgLvl(MSG::DEBUG) ){ if ( sc.isFailure()) { - msg(MSG::DEBUG) <<"No SCT segments in StoreGate"<<endreq; + msg(MSG::DEBUG) <<"No SCT segments in StoreGate"<<endmsg; } else { msg(MSG::DEBUG) <<"found SCT segments in StoreGate " - <<m_SCTTracksName<<" "<<sct_tracks->size()<<endreq; + <<m_SCTTracksName<<" "<<sct_tracks->size()<<endmsg; } } } @@ -134,10 +134,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(pix_tracks, m_PIXTracksName); if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure() ) { - msg(MSG::DEBUG) <<"No PIX segments in StoreGate"<<endreq; + msg(MSG::DEBUG) <<"No PIX segments in StoreGate"<<endmsg; } else { msg(MSG::DEBUG) <<"found PIX segments in StoreGate " - <<m_PIXTracksName<<" "<<pix_tracks->size()<<endreq; + <<m_PIXTracksName<<" "<<pix_tracks->size()<<endmsg; } } } @@ -148,10 +148,10 @@ StatusCode InDetGlobalManager::execute() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No TRT segments in StoreGate " - << m_TRTTracksName<<endreq; + << m_TRTTracksName<<endmsg; } else { msg(MSG::DEBUG) <<"found TRT segments in StoreGate " - <<m_TRTTracksName <<" "<<trt_tracks->size()<<endreq; + <<m_TRTTracksName <<" "<<trt_tracks->size()<<endmsg; } } } @@ -162,11 +162,11 @@ StatusCode InDetGlobalManager::execute() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No combined tracks in StoreGate " - << m_CombinedTracksName<<endreq; + << m_CombinedTracksName<<endmsg; } else { msg(MSG::DEBUG) <<"found combined tracks in StoreGate " <<m_CombinedTracksName <<" " - <<combined_tracks->size()<<endreq; + <<combined_tracks->size()<<endmsg; } } } @@ -178,10 +178,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve( bcmRdoContainer, "BCM_RDOs" ); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !bcmRdoContainer) { - msg(MSG::DEBUG) <<"No BCM RDOs in StoreGate "<<endreq; + msg(MSG::DEBUG) <<"No BCM RDOs in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - <<"found BCM RDOs in StoreGate " <<endreq; + <<"found BCM RDOs in StoreGate " <<endmsg; } } } @@ -191,10 +191,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve( pixRdoContainer, "PixelRDOs" ); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !pixRdoContainer) { - msg(MSG::DEBUG) <<"No Pixel RDOs in StoreGate "<<endreq; + msg(MSG::DEBUG) <<"No Pixel RDOs in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - <<"found Pixel RDOs in StoreGate " <<endreq; + <<"found Pixel RDOs in StoreGate " <<endmsg; } } } @@ -204,10 +204,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve( sctRdoContainer, "SCT_RDOs" ); if ( msgLvl(MSG::DEBUG) ){ if (sc.isFailure() || !sctRdoContainer) { - msg(MSG::DEBUG) <<"No SCT RDOs in StoreGate "<<endreq; + msg(MSG::DEBUG) <<"No SCT RDOs in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - <<"found SCT RDOs in StoreGate " <<endreq; + <<"found SCT RDOs in StoreGate " <<endmsg; } } } @@ -218,10 +218,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(driftCircleContainer, m_TRT_DriftCircleName); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !driftCircleContainer) { - msg(MSG::DEBUG) <<"No TRT RDO in StoreGate "<<endreq; + msg(MSG::DEBUG) <<"No TRT RDO in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - <<"found TRT driftcircles in StoreGate " <<endreq; + <<"found TRT driftcircles in StoreGate " <<endmsg; } } } @@ -231,10 +231,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(pixel_LVL1IDColl, "PixelLVL1ID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !pixel_LVL1IDColl) { - msg(MSG::DEBUG) << "No Pixel LVL1ID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No Pixel LVL1ID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found Pixel LVL1ID information in StoreGate " <<endreq; + << "found Pixel LVL1ID information in StoreGate " <<endmsg; } } } @@ -244,10 +244,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(sct_LVL1IDColl, "SCT_LVL1ID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !sct_LVL1IDColl) { - msg(MSG::DEBUG) << "No SCT LVL1ID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No SCT LVL1ID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found SCT LVL1ID information in StoreGate " <<endreq; + << "found SCT LVL1ID information in StoreGate " <<endmsg; } } } @@ -257,10 +257,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(trt_LVL1IDColl, "TRT_LVL1ID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !trt_LVL1IDColl) { - msg(MSG::DEBUG) << "No TRT LVL1ID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No TRT LVL1ID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found TRT LVL1ID information in StoreGate " <<endreq; + << "found TRT LVL1ID information in StoreGate " <<endmsg; } } } @@ -270,10 +270,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(pixel_BCIDColl, "PixelBCID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !pixel_BCIDColl) { - msg(MSG::DEBUG) << "No Pixel BCID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No Pixel BCID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found Pixel BCID information in StoreGate " <<endreq; + << "found Pixel BCID information in StoreGate " <<endmsg; } } } @@ -283,10 +283,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(sct_BCIDColl, "SCT_BCID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !sct_BCIDColl) { - msg(MSG::DEBUG) << "No SCT BCID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No SCT BCID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found SCT BCID information in StoreGate " <<endreq; + << "found SCT BCID information in StoreGate " <<endmsg; } } } @@ -296,10 +296,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(trt_BCIDColl, "TRT_BCID"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !trt_BCIDColl) { - msg(MSG::DEBUG) << "No TRT BCID information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No TRT BCID information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found TRT BCID information in StoreGate " <<endreq; + << "found TRT BCID information in StoreGate " <<endmsg; } } } @@ -309,10 +309,10 @@ StatusCode InDetGlobalManager::execute() StatusCode sc = evtStore()->retrieve(trtPhase, "TRT_Phase"); if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure() || !trtPhase) { - msg(MSG::DEBUG) << "No TRT event phase information in StoreGate "<<endreq; + msg(MSG::DEBUG) << "No TRT event phase information in StoreGate "<<endmsg; } else { msg(MSG::DEBUG) - << "found TRT event phase information in StoreGate " <<endreq; + << "found TRT event phase information in StoreGate " <<endmsg; } } } @@ -330,7 +330,7 @@ StatusCode InDetGlobalManager::execute() if( managed != 0 ) { if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) - <<"Loop over InDetGlobalMonTool " <<managed << endreq; + <<"Loop over InDetGlobalMonTool " <<managed << endmsg; managed->fillTracks(sct_tracks, trt_tracks, combined_tracks, pix_tracks); managed->fillRDOContainers(bcmRdoContainer, pixRdoContainer, sctRdoContainer, driftCircleContainer); diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.cxx index 7d49c1fb538..b35a6a42035 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.cxx @@ -128,7 +128,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -141,7 +141,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -154,7 +154,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -166,7 +166,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -179,7 +179,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -192,7 +192,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -206,7 +206,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -219,7 +219,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -232,7 +232,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -245,7 +245,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -258,7 +258,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } @@ -272,7 +272,7 @@ StatusCode InDetGlobalMotherMonTool::registerHist( MonGroup & theGroup, { //std::string msgtext = "Could not register histogram "; //fix this it did not like the variable //if (h1!=0) msg+=h1->GetName(); - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" << endmsg; } return rc; } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.h index a01139dcd8f..e69692529ad 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.h +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherMonTool.h @@ -300,7 +300,7 @@ public: StatusCode rc = theGroup.regHist(h1); if (rc != StatusCode::SUCCESS) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" - << name <<endreq; + << name <<endmsg; } h.push_back(h1); return rc ; @@ -323,7 +323,7 @@ public: StatusCode rc = theGroup.regHist(h1); if (rc != StatusCode::SUCCESS) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram :" - << name <<endreq; + << name <<endmsg; } h.push_back(h1); return rc ; @@ -368,7 +368,7 @@ public: StatusCode rc = theGroup.regHist(h2); if (rc != StatusCode::SUCCESS) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram : " - << name <<endreq; + << name <<endmsg; } h.push_back(h2); @@ -397,7 +397,7 @@ public: StatusCode rc = theGroup.regHist(h2); if (rc != StatusCode::SUCCESS) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Could not register histogram : " - << name <<endreq; + << name <<endmsg; } h.push_back(h2); @@ -491,7 +491,7 @@ public: inline virtual void retrieveTools() { if (m_trkSummaryTool.retrieve().isFailure() ) { - if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "Could not retrieve the track summary tool!" << endreq; + if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "Could not retrieve the track summary tool!" << endmsg; } } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx index eb80e9dba77..bdfae3b2d9d 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalMotherTrigMonTool.cxx @@ -38,7 +38,7 @@ InDetGlobalMotherTrigMonTool::InDetGlobalMotherTrigMonTool( StatusCode InDetGlobalMotherTrigMonTool::initialize(){ if ( ManagedMonitorToolBase::initialize().isFailure() ) { - if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endreq; + if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endmsg; return StatusCode::FAILURE; } m_triggerNames[0] = "RNDM"; @@ -83,7 +83,7 @@ StatusCode InDetGlobalMotherTrigMonTool::CheckTriggers() StatusCode InDetGlobalMotherTrigMonTool::PrintTriggers() { for ( int i = 0; i < 8; i++){ - if ( msgLvl(MSG::INFO) ) msg(MSG::INFO) << std::setw(7) << m_triggerNames[i] << " : " << m_firedTriggers[i] << endreq; + if ( msgLvl(MSG::INFO) ) msg(MSG::INFO) << std::setw(7) << m_triggerNames[i] << " : " << m_firedTriggers[i] << endmsg; } return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx index 4dd1d6d9c38..f2e5c2c9b69 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx @@ -305,7 +305,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) if(!evtStore()){ if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "No pointer to StoreGateSvc" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -413,7 +413,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) const Trk::Track *track=(*itrack); if (track == 0){ if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) - << "no pointer to track!!!" << endreq; break; + << "no pointer to track!!!" << endmsg; break; } const DataVector<const Trk::TrackStateOnSurface>* @@ -421,7 +421,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) if (trackStates == 0) { if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "for current track is TrackStateOnSurfaces == Null " - << endreq; + << endmsg; } else { DataVector<const Trk::TrackStateOnSurface>::const_iterator it=trackStates->begin(); @@ -431,7 +431,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) const Trk::TrackStateOnSurface* trackState=(*it); if (trackState == 0) { - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "TrackStateOnSurface == Null, is the tracking OK?" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "TrackStateOnSurface == Null, is the tracking OK?" << endmsg; continue; } const InDet::TRT_DriftCircleOnTrack *trtcircle = dynamic_cast<const InDet::TRT_DriftCircleOnTrack*>(trackState->measurementOnTrack()); @@ -467,14 +467,14 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "SiCluster WITHOUT " << "prepRawData!!!!" << - endreq; + endmsg; continue; } if (RawDataClus==0) { if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "SiCluster WITHOUT prepRawData!!!!" - << endreq; + << endmsg; } else { if (RawDataClus->detectorElement()->isSCT()) { nSCT_trk += RawDataClus->rdoList().size(); @@ -597,7 +597,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "SCT_Collection found with " << SCT_Collection->size() << " RDOs" - << endreq; + << endmsg; DataVector<SCT_RDORawData>::const_iterator p_rdo = SCT_Collection->begin(); @@ -658,7 +658,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( ) if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "PIX_Collection found with " << PIX_Collection->size() << " RDOs" - << endreq; + << endmsg; DataVector<PixelRDORawData>::const_iterator p_rdo = PIX_Collection->begin(); @@ -1005,7 +1005,7 @@ void InDetGlobalNoiseOccupancyMonTool::correlation_coeffs(vector<struct noise> msg(MSG::WARNING) << "less than " << size << " events saved for correlation calculation " "- manually setting numbers to -2" - << endreq; + << endmsg; }*/ m_TRT_SCTvTRT_PIX_10evt->Fill(-2,-2); @@ -1136,7 +1136,7 @@ int InDetGlobalNoiseOccupancyMonTool::GetSCTCounts(int barrel_ec_sel, bool do_ch if(barrel_ec_sel != 0 && barrel_ec_sel != -2 && barrel_ec_sel != 2) { - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Wrong selection on SCTCounts !" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Wrong selection on SCTCounts !" << endmsg; return -1; } @@ -1202,7 +1202,7 @@ int InDetGlobalNoiseOccupancyMonTool::GetSCTCounts(int barrel_ec_sel, bool do_ch } } - if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " SCT nStripsCntr: " << nStripsCntr << endreq; + if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " SCT nStripsCntr: " << nStripsCntr << endmsg; return nStripsCntr; } @@ -1221,7 +1221,7 @@ int InDetGlobalNoiseOccupancyMonTool::GetPixelCounts(int barrel_ec_sel, bool do_ if(barrel_ec_sel != 0 && barrel_ec_sel != -2 && barrel_ec_sel != 2) { - if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Wrong selection on GetPixelCounts !" << endreq; + if ( msgLvl(MSG::WARNING) ) msg(MSG::WARNING) << "Wrong selection on GetPixelCounts !" << endmsg; return -1; } @@ -1264,7 +1264,7 @@ int InDetGlobalNoiseOccupancyMonTool::GetPixelCounts(int barrel_ec_sel, bool do_ } } - if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " Pixel Cntr: " << nPixelCntr << endreq; + if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " Pixel Cntr: " << nPixelCntr << endmsg; return nPixelCntr; } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx index 7af0e8744b9..22baa546285 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx @@ -144,7 +144,7 @@ StatusCode InDetGlobalPixelTool::fillHistograms() const Trk::Track *track=(*m_tracks)[i]; if (track == 0) { - if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endreq; + if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endmsg; break; } const Trk::TrackSummary* summary = m_trkSummaryTool->createSummary(*track); diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx index 18e7f603ab3..5219110094b 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalSynchMonTool.cxx @@ -106,7 +106,7 @@ InDetGlobalSynchMonTool::InDetGlobalSynchMonTool( StatusCode InDetGlobalSynchMonTool::initialize(){ if ( InDetGlobalMotherTrigMonTool::initialize().isFailure() ) { - if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endreq; + if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Could not initialize Monitor tool base!" << endmsg; return StatusCode::FAILURE; } @@ -353,7 +353,7 @@ StatusCode InDetGlobalSynchMonTool::fillHistograms() int prev_bcm_lvl1id = -1; if ( doTrigger == true && InDetGlobalMotherTrigMonTool::CheckTriggers() != StatusCode::SUCCESS ){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Triggers not found!" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Triggers not found!" << endmsg; doTrigger = false; } diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx index 515a9f9b833..66bef67796a 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx @@ -262,11 +262,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if (sc.isFailure()) { msg(MSG::DEBUG) - <<"No SCT segments in StoreGate " <<endreq; + <<"No SCT segments in StoreGate " <<endmsg; } else { msg(MSG::DEBUG) <<"found SCT segments in StoreGate " <<m_SCTTracksName<<"Up " - <<m_sct_tracks_up->size()<<endreq; + <<m_sct_tracks_up->size()<<endmsg; } } } @@ -276,11 +276,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) - <<"No SCT segments in StoreGate " <<endreq; + <<"No SCT segments in StoreGate " <<endmsg; } else { msg(MSG::DEBUG) <<"found SCT segments in StoreGate " <<m_SCTTracksName<<"Low " - <<m_sct_tracks_low->size()<<endreq; + <<m_sct_tracks_low->size()<<endmsg; } } } @@ -290,11 +290,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) - <<"No PIX segments in StoreGate " <<endreq; + <<"No PIX segments in StoreGate " <<endmsg; } else { msg(MSG::DEBUG) <<"found PIX segments in StoreGate " <<m_PIXTracksName<<"Up " - <<m_pix_tracks_up->size()<<endreq; + <<m_pix_tracks_up->size()<<endmsg; } } } @@ -303,11 +303,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) - <<"No PIX segments in StoreGate " <<endreq; + <<"No PIX segments in StoreGate " <<endmsg; } else { msg(MSG::DEBUG) << "found PIX segments in StoreGate" << m_PIXTracksName<<"Low " - << m_pix_tracks_low->size()<<endreq; + << m_pix_tracks_low->size()<<endmsg; } } } @@ -317,11 +317,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No TRT segments in StoreGate " - <<m_TRTTracksName<<"Up"<<endreq; + <<m_TRTTracksName<<"Up"<<endmsg; } else { msg(MSG::DEBUG) <<"found TRT segments in StoreGate " <<m_TRTTracksName<<"Up "<<m_trt_tracks_up->size() - <<endreq; + <<endmsg; } } } @@ -331,11 +331,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No TRT segments in StoreGate " - <<m_TRTTracksName<<"Low"<<endreq; + <<m_TRTTracksName<<"Low"<<endmsg; } else { msg(MSG::DEBUG) <<"found TRT segments in StoreGate " <<m_TRTTracksName<<"Low " - <<m_trt_tracks_low->size()<<endreq; + <<m_trt_tracks_low->size()<<endmsg; } } } @@ -345,11 +345,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No combined tracks in StoreGate " - <<m_CombinedTracksName<<"Up"<<endreq; + <<m_CombinedTracksName<<"Up"<<endmsg; } else { msg(MSG::DEBUG) <<"found combined tracks in StoreGate " <<m_CombinedTracksName<<"Up"<<" " - <<m_combined_tracks_up->size()<<endreq; + <<m_combined_tracks_up->size()<<endmsg; } } } @@ -359,11 +359,11 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if ( msgLvl(MSG::DEBUG) ) { if ( sc.isFailure()) { msg(MSG::DEBUG) <<"No combined tracks in StoreGate " - <<m_CombinedTracksName+"Low"<<endreq; + <<m_CombinedTracksName+"Low"<<endmsg; } else { msg(MSG::DEBUG) <<"found combined tracks in StoreGate " <<m_CombinedTracksName+"Low"<<" " - <<m_combined_tracks_low->size()<<endreq; + <<m_combined_tracks_low->size()<<endmsg; } } } @@ -399,7 +399,7 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() if (track_bottom == 0) { msg(MSG::WARNING) - << "no pointer to bottom track!!!" << endreq; + << "no pointer to bottom track!!!" << endmsg; continue; } @@ -429,7 +429,7 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() } } else { msg(MSG::ERROR) - << "no measurement at perigee !!!" << endreq; + << "no measurement at perigee !!!" << endmsg; } if ( nBottomTracks<s_nMaxTracks) m_Bottom_chi2[nBottomTracks]= @@ -453,7 +453,7 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() const Trk::Track *track_top=(*itop); if (track_top == 0){ msg(MSG::WARNING) - << "no pointer to top track!!!" << endreq; + << "no pointer to top track!!!" << endmsg; continue; } // Track at perigee @@ -477,7 +477,7 @@ StatusCode InDetGlobalTopBottomMonTool::fillHistograms() } } else { msg(MSG::ERROR) - << "no measurement at perigee !!!" << endreq; + << "no measurement at perigee !!!" << endmsg; } if ( nTopTracks<s_nMaxTracks) { m_Top_chi2[nTopTracks]= diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx index f88303a8aa0..2d0b0d08d58 100755 --- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx +++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx @@ -184,18 +184,18 @@ StatusCode InDetGlobalTrackMonTool::initialize() { } if (m_IBLParameterSvc.retrieve().isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve " << m_IBLParameterSvc << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve " << m_IBLParameterSvc << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_IBLParameterSvc << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_IBLParameterSvc << endmsg; } if ( m_residualPullCalculator.retrieve().isFailure() ) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve " << m_residualPullCalculator << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve " << m_residualPullCalculator << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endmsg; } ATH_CHECK( m_iUpdator.retrieve() ); @@ -991,7 +991,7 @@ void InDetGlobalTrackMonTool::FillTIDE() const Trk::TrackParameters* UnbiasedTrackParams = m_iUpdator->removeFromState(*PropagatedTrackParams, tsos->measurementOnTrack()->localParameters(), tsos->measurementOnTrack()->localCovariance()); delete PropagatedTrackParams; if ( !UnbiasedTrackParams ) - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "RemoveFromState did not work, using original TrackParameters" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "RemoveFromState did not work, using original TrackParameters" << endmsg; const Trk::ResidualPull * residualPull = m_residualPullCalculator->residualPull(tsos->measurementOnTrack(), ( UnbiasedTrackParams ) ? UnbiasedTrackParams:tsos->trackParameters(), Trk::ResidualPull::Unbiased); if (residualPull) { @@ -1189,13 +1189,13 @@ void InDetGlobalTrackMonTool::FillHoleMaps( const Trk::Track *track ) // loop over holes if (!holesOnTrack) { - msg(MSG::WARNING) << "Got no holes on track" << endreq; + msg(MSG::WARNING) << "Got no holes on track" << endmsg; } else { for (DataVector<const Trk::TrackStateOnSurface>::const_iterator it=holesOnTrack->begin(); it!=holesOnTrack->end(); it++) { if (!(*it)) { - msg(MSG::WARNING) << "TrackStateOnSurface from hole search tool == Null" << endreq; + msg(MSG::WARNING) << "TrackStateOnSurface from hole search tool == Null" << endmsg; continue; } // Here The X Y Z of Holes diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx index 3acda772833..366c2692ade 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx @@ -51,7 +51,7 @@ StatusCode PixelMainMon::BookClustersMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Clusters" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Clusters" << endmsg; std::string path = "Pixel/Clusters"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/ClustersOnTrack"); @@ -540,14 +540,14 @@ StatusCode PixelMainMon::BookClustersMon(void) } - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } StatusCode PixelMainMon::BookClustersLumiBlockMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Clusters for lowStat" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Clusters for lowStat" << endmsg; std::string path = "Pixel/LumiBlock"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnTrack"); @@ -574,7 +574,7 @@ StatusCode PixelMainMon::BookClustersLumiBlockMon(void) sc = m_cluster_ToT_mod_LB->regHist(this,(path+"/Modules_ClusToT").c_str(),lowStat,m_doIBL); } - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } @@ -583,11 +583,11 @@ StatusCode PixelMainMon::FillClustersMon(void) sc = evtStore()->retrieve(m_Pixel_clcontainer, m_Pixel_SiClustersName); if (sc.isFailure() || !m_Pixel_clcontainer) { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"Pixel Cluster container for Pixels not found"<< endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"Pixel Cluster container for Pixels not found"<< endmsg; if(m_storegate_errors) m_storegate_errors->Fill(3.,3.); return StatusCode::SUCCESS; } else { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Pixel Cluster container for Pixels found" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Pixel Cluster container for Pixels found" <<endmsg; } int nclusters=0; diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx index 0e941d157b6..fd5b39bd033 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx @@ -47,7 +47,7 @@ StatusCode PixelMainMon::BookRODErrorMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors" << endmsg; /// Set the paths and a group of histograms std::string path = "Pixel/Errors"; @@ -326,13 +326,13 @@ StatusCode PixelMainMon::BookRODErrorMon(void) htitles = makeHisttitle(("Number of FEs with FE EoC Trunc error, "+m_modLabel_PixLayerIBL2D3D[i]), ";lumi block;eta index of module;# FEs with errors in a module in an event;# event #times # modules", false); sc = rodExpert.regHist(m_nFEswithTruncErr_mod[i] = new TH3F(hname.c_str(), htitles.c_str(), nbins_LB, minbin_LB, maxbin_LB, nmod_eta[i], -0.5, -0.5 + nmod_eta[i], 18, -0.5, 17.5)); } - if(sc.isFailure()) if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure()) if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } StatusCode PixelMainMon::BookRODErrorLumiBlockMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors for lowStat" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Errors for lowStat" << endmsg; std::string path = "Pixel/LumiBlock"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnTrack"); @@ -353,7 +353,7 @@ StatusCode PixelMainMon::BookRODErrorLumiBlockMon(void) } - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx index 75f0d2588ce..b8f3d2f9435 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx @@ -50,7 +50,7 @@ StatusCode PixelMainMon::BookHitsMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Hits" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Hits" << endmsg; std::string path = "Pixel/Hits"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/HitsOnTrack"); @@ -337,13 +337,13 @@ StatusCode PixelMainMon::BookHitsMon(void) sc = rdoExpert.regHist(m_nFEswithHits_mod[i] = new TH3F(hname.c_str(), htitles.c_str(), nbins_LB, min_LB, max_LB, nmod_eta[i], -0.5, -0.5 + nmod_eta[i], 18, -0.5, 17.5)); } - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } StatusCode PixelMainMon::BookHitsLumiBlockMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Hits for lowStat" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Hits for lowStat" << endmsg; std::string path = "Pixel/LumiBlock"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnTrack"); @@ -393,7 +393,7 @@ StatusCode PixelMainMon::BookHitsLumiBlockMon(void) m_occupancy_10min = new PixelMon2DMaps("Occupancy_10min", ("hit occupancy" + m_histTitleExt).c_str()); sc = m_occupancy_10min->regHist(lumiBlockHist); - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } @@ -403,7 +403,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event //float mu = m_lumiTool->lbAverageInteractionsPerCrossing(); //if(m_mu_vs_lumi) m_mu_vs_lumi->Fill( m_manager->lumiBlockNumber(),mu); }else{ - msg(MSG::ERROR) << "No lumitool found in FillHitsMon!"<<endreq; + msg(MSG::ERROR) << "No lumitool found in FillHitsMon!"<<endmsg; } @@ -415,7 +415,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event if ( !sc.isFailure() && Pixel_BCIDColl!=0 ) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found Pixel BCID collection"<<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found Pixel BCID collection"<<endmsg; for ( InDetTimeCollection::const_iterator ipix_bcid = Pixel_BCIDColl->begin(); ipix_bcid != Pixel_BCIDColl->end(); ++ipix_bcid ) { @@ -430,7 +430,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event n_pix_bcid_nrobs++; } // End for loop } - if (sc.isFailure()) if(msgLvl(MSG::INFO)) {msg(MSG::INFO) << "Could not find the data object PixelBCID" << " !" << endreq;} + if (sc.isFailure()) if(msgLvl(MSG::INFO)) {msg(MSG::INFO) << "Could not find the data object PixelBCID" << " !" << endmsg;} //needed for the rodSim histos and timing/trigger histogram //long int extLvl1ID = -1; @@ -441,7 +441,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event sc=evtStore()->retrieve(thisEventInfo); if(sc != StatusCode::SUCCESS) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg; }else{ if (m_doRodSim|| m_doTiming) { //extLvl1ID = thisEventInfo->trigger_info()->extendedLevel1ID(); @@ -540,11 +540,11 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event sc=evtStore()->retrieve(m_rdocontainer,m_Pixel_RDOName); if (sc.isFailure() || !m_rdocontainer) { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not find the data object " << m_Pixel_RDOName << " !" << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not find the data object " << m_Pixel_RDOName << " !" << endmsg; if(m_storegate_errors) m_storegate_errors->Fill(1.,3.); //first entry (1). is for RDO, second (2) is for retrieve problem return StatusCode::SUCCESS; //fail gracefully and keep going in the next tool } else { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Data object " << m_Pixel_RDOName << " found" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Data object " << m_Pixel_RDOName << " found" << endmsg; } PixelRDO_Container::const_iterator colNext = m_rdocontainer->begin(); @@ -607,7 +607,7 @@ StatusCode PixelMainMon::FillHitsMon(void) //Called once per event /// Fill difference of Lvl1 if(sc != StatusCode::SUCCESS) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg; }else{ int lvl1idMOD = (int)(*p_rdo)->getLVL1ID(); int lvl1idATLAS = (int)((thisEventInfo->trigger_info()->extendedLevel1ID())&0xf); @@ -901,9 +901,9 @@ StatusCode PixelMainMon::ProcHitsMon(void) if(m_doPixelOccupancy && m_pixel_occupancy && (m_doNoiseMap||m_doSpectrum) )//flags need to be set, and the right histograms need to exist { if(msgLvl(MSG::WARNING)){ - msg(MSG::WARNING) << "Starting to fill pixel granularity histograms." << endreq; - msg(MSG::WARNING) << "This is very CPU and memory intensive and should not normmally be turned on" << endreq; - msg(MSG::WARNING) << "Please be patient, it will take a while to fill these histograms" << endreq; + msg(MSG::WARNING) << "Starting to fill pixel granularity histograms." << endmsg; + msg(MSG::WARNING) << "This is very CPU and memory intensive and should not normmally be turned on" << endmsg; + msg(MSG::WARNING) << "Please be patient, it will take a while to fill these histograms" << endmsg; } //if(m_pixel_noise_map) m_pixel_noise_map->Reset(); diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx index 7e7ee2be1b8..b52d00a7c02 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx @@ -39,9 +39,9 @@ StatusCode PixelMainMon::BookPixelDCSMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endmsg; - msg(MSG::DEBUG) << "[BookPixelDCSMon]" << endreq; + msg(MSG::DEBUG) << "[BookPixelDCSMon]" << endmsg; //if(m_doOnTrack) return StatusCode::SUCCESS; @@ -564,7 +564,7 @@ StatusCode PixelMainMon::BookPixelDCSMon(void) nbins_LB,min_LB,max_LB,nbins_staveID,min_staveID,max_staveID)); //m_hist_LB_staveID_thermalFigureMerit->SetContour(99); - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } @@ -578,7 +578,7 @@ StatusCode PixelMainMon::FillPixelDCSMon(void) return StatusCode::SUCCESS; } - msg(MSG::DEBUG) << "[FillPixelDCSMon]" << endreq; + msg(MSG::DEBUG) << "[FillPixelDCSMon]" << endmsg; // loop over DCS directories // const CondAttrListCollection* atrlistcol; @@ -772,7 +772,7 @@ StatusCode PixelMainMon::FillPixelDCSMon(void) StatusCode PixelMainMon::ProcPixelDCSMon(void) { - msg(MSG::DEBUG) << "[ProcPixelDCSMon]" << endreq; + msg(MSG::DEBUG) << "[ProcPixelDCSMon]" << endmsg; //--------------------------------------- // fill dcs data in moduleDcsDataHolder diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx index ebeddee9a19..999561d86de 100755 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx @@ -617,7 +617,7 @@ StatusCode PixelMainMon::initialize() // Retrieve tools if (detStore()->retrieve(m_pixelid, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } @@ -625,65 +625,65 @@ StatusCode PixelMainMon::initialize() sc = detStore()->retrieve(m_idHelper, "AtlasID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get ID helper !" << endreq; + msg(MSG::ERROR) << "Could not get ID helper !" << endmsg; return sc; } if ( m_pixelCondSummarySvc.retrieve().isFailure() ) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endmsg; } if ( m_pixelCableSvc.retrieve().isFailure() ) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCableSvc << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCableSvc << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_pixelCableSvc << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_pixelCableSvc << endmsg; } if ( m_ErrorSvc.retrieve().isFailure() ) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_ErrorSvc << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failed to retrieve tool " << m_ErrorSvc << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_ErrorSvc << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_ErrorSvc << endmsg; } if (m_IBLParameterSvc.retrieve().isFailure()) { - if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve IBLParameterSvc" << endreq; + if(msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve IBLParameterSvc" << endmsg; return StatusCode::FAILURE; } else { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_IBLParameterSvc << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_IBLParameterSvc << endmsg; } m_doIBL = m_IBLParameterSvc->containsIBL(); - msg(MSG::INFO)<<"doIBL set to "<<m_doIBL<<endreq; + msg(MSG::INFO)<<"doIBL set to "<<m_doIBL<<endmsg; if(m_doIBL && !m_IBLParameterSvc->contains3D()){ - msg(MSG::WARNING)<<"Assuming hybrid 2D/3D IBL module composition, but geometry is all-planar"<<endreq; + msg(MSG::WARNING)<<"Assuming hybrid 2D/3D IBL module composition, but geometry is all-planar"<<endmsg; } if(m_doHoleSearch){ if ( m_holeSearchTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_holeSearchTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_holeSearchTool << endmsg; return StatusCode::FAILURE; }else{ - msg(MSG::INFO) << "Retrieved tool " << m_holeSearchTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_holeSearchTool << endmsg; } } if ( m_lumiTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_lumiTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_lumiTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_lumiTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_lumiTool << endmsg; } //if ( m_trkSummaryTool.retrieve().isFailure() ) { - // if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "Failed to retrieve tool " << m_trkSummaryTool << endreq; + // if ( msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "Failed to retrieve tool " << m_trkSummaryTool << endmsg; //} else { - // if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_trkSummaryTool << endreq; + // if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Retrieved tool " << m_trkSummaryTool << endmsg; //} //m_elementsMap[std::string("/PIXEL/DCS/FSMSTATE")].push_back(std::string("FSM_state")); // type: String4k @@ -820,7 +820,7 @@ StatusCode PixelMainMon::bookHistograms() const EventInfo* thisEventInfo; sc=evtStore()->retrieve(thisEventInfo); if(sc != StatusCode::SUCCESS) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg; }else{ m_lumiBlockNum = thisEventInfo->event_ID()->lumi_block(); @@ -841,7 +841,7 @@ StatusCode PixelMainMon::bookHistograms() } } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "bookHistograms()" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "bookHistograms()" << endmsg; if(m_environment==AthenaMonManager::tier0Raw&&!m_doOnline) { @@ -863,15 +863,15 @@ StatusCode PixelMainMon::bookHistograms() m_doTrack = false; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "[PixelMonitoring] flags in bookHisto" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doESD " << m_doESD << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doRDO " << m_doRDO << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doRODError " << m_doRODError << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doSpacePoint" << m_doSpacePoint << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doCluster " << m_doCluster << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doStatus " << m_doStatus << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doDCS " << m_doDCS << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doTrack " << m_doTrack << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "[PixelMonitoring] flags in bookHisto" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doESD " << m_doESD << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doRDO " << m_doRDO << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doRODError " << m_doRODError << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doSpacePoint" << m_doSpacePoint << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doCluster " << m_doCluster << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doStatus " << m_doStatus << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doDCS " << m_doDCS << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "m_doTrack " << m_doTrack << endmsg; /// @@ -881,23 +881,23 @@ StatusCode PixelMainMon::bookHistograms() if(m_doLumiBlock){ if(m_doRDO){ sc=BookHitsLumiBlockMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO for lowStat" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO for lowStat" << endmsg; } if(m_doRODError){ sc=BookRODErrorLumiBlockMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error for lowStat" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error for lowStat" << endmsg; } if(m_doCluster){ sc=BookClustersLumiBlockMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster for lowStat" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster for lowStat" << endmsg; } if(m_doStatus){ sc=BookStatusLumiBlockMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status for lowStat" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book lowStat histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status for lowStat" << endmsg; } } @@ -920,7 +920,7 @@ StatusCode PixelMainMon::bookHistograms() if(m_doOnPixelTrack) path.replace(path.begin(), path.end(), "Pixel/ErrorsOnPixelTrack"); MonGroup errorHistos( this, path.c_str(), run, ATTRIB_MANAGED ); //declare a group of histograms sc = errorHistos.regHist(m_storegate_errors = TH2F_LW::create("storegate_errors", ("Storegate Errors" + m_histTitleExt + ";Container Name;Error Type").c_str(), 6,0.5,6.5,5,0.5,5.5)); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; /// ///Set lables and style for error histogram @@ -942,44 +942,44 @@ StatusCode PixelMainMon::bookHistograms() if(m_doTrack) { sc=BookTrackMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Track" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Track" << endmsg; } if(m_doRDO) { sc=BookHitsMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking RDO" << endmsg; } if(m_doRODError) { sc=BookRODErrorMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking ROD Error" << endmsg; } if(m_doSpacePoint) { sc=BookSpacePointMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking SP" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking SP" << endmsg; } if(m_doCluster) { sc=BookClustersMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Cluster" << endmsg; } if(m_doStatus) { sc=BookStatusMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking Status" << endmsg; } if(m_doDCS) { sc=BookPixelDCSMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking DCS" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not book histograms" << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Done booking DCS" << endmsg; } return StatusCode::SUCCESS; @@ -998,18 +998,18 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event const EventInfo* thisEventInfo; sc=evtStore()->retrieve(thisEventInfo); if(sc != StatusCode::SUCCESS) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "No EventInfo object found" << endmsg; }else{ m_currentTime = thisEventInfo->event_ID()->time_stamp(); m_currentBCID = thisEventInfo->event_ID()->bunch_crossing_id(); - //msg(MSG::INFO) << "First booking time:" << m_firstBookTime << " Current time: " << m_currentTime << endreq; + //msg(MSG::INFO) << "First booking time:" << m_firstBookTime << " Current time: " << m_currentTime << endmsg; unsigned int currentdiff = (m_currentTime - m_firstBookTime)/100; unsigned int currentdiff5min = (m_currentTime - m_firstBookTime)/300; /// for 100 sec if( currentdiff > m_nRefresh ){ m_doRefresh = true; m_nRefresh = currentdiff; - // msg(MSG::INFO) << "m_doRefresh:" << m_doRefresh << " " << m_nRefresh << endreq; + // msg(MSG::INFO) << "m_doRefresh:" << m_doRefresh << " " << m_nRefresh << endmsg; }else{ m_doRefresh = false; } @@ -1017,7 +1017,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event if( currentdiff5min > m_nRefresh5min ){ m_doRefresh5min = true; m_nRefresh5min = currentdiff5min; - // msg(MSG::INFO) << "m_doRefresh:" << m_doRefresh << " " << m_nRefresh << endreq; + // msg(MSG::INFO) << "m_doRefresh:" << m_doRefresh << " " << m_nRefresh << endmsg; }else{ m_doRefresh5min = false; } @@ -1083,14 +1083,14 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event /// if(m_doStatus) { //fill status histograms first, to check number of disabled modules sc=FillStatusMon(); - if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; } //if(m_doRODError&&evtStore()->contains<PixelRODErrorCollection>(m_detector_error_name)) if(m_doRODError) { sc=FillRODErrorMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; }else{ if(m_storegate_errors) m_storegate_errors->Fill(5.,1.); } @@ -1099,7 +1099,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event if(m_doTrack){ if(evtStore()->contains< TrackCollection >(m_TracksName)){ sc=FillTrackMon(); - if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if(sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; }else if(m_storegate_errors) m_storegate_errors->Fill(4.,2.); }else{ if(m_storegate_errors) m_storegate_errors->Fill(4.,1.); @@ -1117,7 +1117,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event if(m_doCluster){ if(evtStore()->contains<InDet::PixelClusterContainer>(m_Pixel_SiClustersName)){ sc=FillClustersMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; }else if(m_storegate_errors) m_storegate_errors->Fill(3.,2.); }else{ if(m_storegate_errors) m_storegate_errors->Fill(3.,1.); @@ -1128,7 +1128,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event { if(evtStore()->contains<SpacePointContainer>(m_Pixel_SpacePointsName)){ sc=FillSpacePointMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; }else if(m_storegate_errors) m_storegate_errors->Fill(2.,2.); }else{ if(m_storegate_errors) m_storegate_errors->Fill(2.,1.); @@ -1138,7 +1138,7 @@ StatusCode PixelMainMon::fillHistograms() //get called twice per event /// DCS if(m_doDCS){ sc=FillPixelDCSMon(); - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not fill histograms" << endmsg; }else{ if(m_storegate_errors)m_storegate_errors->Fill(6.,1.); } @@ -1153,13 +1153,13 @@ StatusCode PixelMainMon::procHistograms() { // Part 1: Get the messaging service, print where you are - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "finalize()" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "finalize()" << endmsg; //if(endOfEventsBlock){} if(endOfLumiBlock) { m_LBendTime = m_currentTime; //if (m_doTrack) { sc=ProcTrackMon(); } - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg; } if( m_doOnline ){ @@ -1174,7 +1174,7 @@ StatusCode PixelMainMon::procHistograms() if (m_doStatus) { sc=ProcStatusMon(); } if (m_doDCS) { sc=ProcPixelDCSMon(); } if (m_doTrack) { sc=ProcTrackMon(); } - if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endreq; + if (sc.isFailure()) if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Could not proc histograms" << endmsg; } return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx index edf9183a1d9..827649a1e0d 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/SpacePoints.cxx @@ -62,7 +62,7 @@ StatusCode PixelMainMon::BookSpacePointMon(void) sc = spacePointHistos.regHist(m_spHit_xy = TH2F_LW::create("pixel_sp_x_vs_y",("xy location of barrel hits" + m_histTitleExt + ";x (mm);y (mm)").c_str(),100,-160,160,100,-160,160)); //all is for what to integrate over (all, lumiblock, run....) sc = spacePointHistos.regHist(m_spHit_rz = TH2F_LW::create("pixel_sp_r_vs_z",("rz location of hit" + m_histTitleExt + ";z (mm);r (mm)").c_str(),200,-665,665,200,-0,165)); //all is for what to integrate over (all, lumiblock, run....) - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } @@ -72,11 +72,11 @@ StatusCode PixelMainMon::FillSpacePointMon(void) sc = evtStore()->retrieve(m_Pixel_spcontainer, m_Pixel_SpacePointsName ); if (sc.isFailure() || !m_Pixel_spcontainer) { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"SpacePoint container for Pixels not found"<< endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"SpacePoint container for Pixels not found"<< endmsg; if(m_storegate_errors) m_storegate_errors->Fill(2.,3.); return StatusCode::SUCCESS; } else{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Si SpacePoint container for Pixels found" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Si SpacePoint container for Pixels found" <<endmsg; } DataVector<SpacePoint>::const_iterator p_sp; diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx index a7d7a4f7152..51f73d4c767 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx @@ -31,7 +31,7 @@ StatusCode PixelMainMon::BookStatusMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status" << endmsg; std::string path = "Pixel/Status"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/StatusOnTrack"); @@ -95,13 +95,13 @@ StatusCode PixelMainMon::BookStatusMon(void) sc = statusHistos.regHist(m_disabledModules_per_lumi_PIX = TProfile_LW::create(tmp.c_str(), (tmp2+m_histTitleExt+atext_LB+atext_nmod).c_str(), nbins_LB, min_LB, max_LB)); - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } StatusCode PixelMainMon::BookStatusLumiBlockMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status for lowStat" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Status for lowStat" << endmsg; std::string path = "Pixel/LumiBlock"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/LumiBlockOnTrack"); @@ -112,7 +112,7 @@ StatusCode PixelMainMon::BookStatusLumiBlockMon(void) sc = m_status_LB->regHist(lumiBlockHist); m_status_LB->SetMaxValue( 2.0 ); - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx index b7a3fba317b..bf7d9c49b18 100644 --- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx +++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx @@ -50,7 +50,7 @@ /////////////////////////////////////////////////////////////////////////////// StatusCode PixelMainMon::BookTrackMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Tracks" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "starting Book Tracks" << endmsg; std::string path = "Pixel/Track"; if(m_doOnTrack) path.replace(path.begin(), path.end(), "Pixel/TrackOnTrack"); @@ -178,13 +178,13 @@ StatusCode PixelMainMon::BookTrackMon(void) if(m_LorentzAngle_B1) m_LorentzAngle_B1->SetOption("colz"); if(m_LorentzAngle_B2) m_LorentzAngle_B2->SetOption("colz"); - if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endreq; + if(sc.isFailure())if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "histograms not booked" << endmsg; return StatusCode::SUCCESS; } StatusCode PixelMainMon::FillTrackMon(void) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "MainFillTrackMon" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "MainFillTrackMon" << endmsg; /// /// Retrieve and Check Store Gate Error @@ -193,11 +193,11 @@ StatusCode PixelMainMon::FillTrackMon(void) sc = evtStore()->retrieve(m_tracks, m_TracksName); if (sc.isFailure()) { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"No tracks in StoreGate found"<< endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) <<"No tracks in StoreGate found"<< endmsg; if(m_storegate_errors) m_storegate_errors->Fill(4.,3.); return StatusCode::SUCCESS; } else{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Tracks in StoreGate found" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) <<"Tracks in StoreGate found" <<endmsg; } m_ntracksPerEvent = 0; @@ -218,7 +218,7 @@ StatusCode PixelMainMon::FillTrackMon(void) { const Trk::Track *track0=(*m_tracks)[i]; if (track0 == 0) { - if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endreq; break; + if (msgLvl(MSG::ERROR) ) msg(MSG::ERROR) << "no pointer to track!!!" << endmsg; break; } @@ -242,7 +242,7 @@ StatusCode PixelMainMon::FillTrackMon(void) if(summary){ if (summary->get(Trk::numberOfPixelHits)==0) continue; } else { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "No Track Summary Found" << endreq; continue; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "No Track Summary Found" << endmsg; continue; } const Trk::Track* track = track0; @@ -303,7 +303,7 @@ StatusCode PixelMainMon::FillTrackMon(void) side = dynamic_cast<const InDetDD::SiDetectorElement *>( mesb->associatedSurface().associatedDetectorElement() ); }else{ // holes, perigee if(not (*trackStateOnSurfaceIterator)->trackParameters() ) { - msg(MSG::INFO) << "pointer of TSOS to track parameters or associated surface is null" << endreq; + msg(MSG::INFO) << "pointer of TSOS to track parameters or associated surface is null" << endmsg; continue; } surfaceID = (*trackStateOnSurfaceIterator)->trackParameters()->associatedSurface().associatedDetectorElementIdentifier();//check ptr @@ -662,7 +662,7 @@ StatusCode PixelMainMon::ProcTrackMon(void) double lengthLB = 0; lengthLB = m_LBendTime - m_LBstartTime; if (lengthLB <= 0) { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Luminosity block has length <= 0 sec, cannot calculate track rate." << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Luminosity block has length <= 0 sec, cannot calculate track rate." << endmsg; return StatusCode::SUCCESS; //if LB length is zero, the rest is pointless and would divide by 0 } diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/BCM_ZeroSuppression.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/BCM_ZeroSuppression.cxx index 59defaab7ed..a81d80fe4c4 100644 --- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/BCM_ZeroSuppression.cxx +++ b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/BCM_ZeroSuppression.cxx @@ -27,29 +27,29 @@ BCM_ZeroSuppression::~BCM_ZeroSuppression() StatusCode BCM_ZeroSuppression::initialize() { - msg(MSG::INFO) << "Initialising" << endreq; + msg(MSG::INFO) << "Initialising" << endmsg; if (AthAlgorithm::initialize().isFailure()) { - msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endreq; + msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; } StatusCode BCM_ZeroSuppression::execute() { - msg(MSG::DEBUG) << "execute()" << endreq; + msg(MSG::DEBUG) << "execute()" << endmsg; StatusCode sc; // Check for BCM RDO sc=evtStore()->contains<BCM_RDO_Container>(m_bcmContainerName); if( sc.isFailure() ) { - msg(MSG::DEBUG) << m_bcmContainerName << " not found" << endreq; + msg(MSG::DEBUG) << m_bcmContainerName << " not found" << endmsg; return StatusCode::SUCCESS; } else { msg(MSG::DEBUG) << m_bcmContainerName << " container exists in StoreGate " - << endreq; + << endmsg; } // Retrieve BCM RDO @@ -61,23 +61,23 @@ StatusCode BCM_ZeroSuppression::execute() { } else { msg(MSG::DEBUG) << m_bcmContainerName << " not found in StoreGate " - << endreq; + << endmsg; } // Create output RDO container and record it to StoreGate try { m_bcmCompactDO = new BCM_RDO_Container(); } catch (std::bad_alloc) { - msg(MSG::FATAL) << "Could not create a new BCM RawDataContainer!" << endreq; + msg(MSG::FATAL) << "Could not create a new BCM RawDataContainer!" << endmsg; return StatusCode::FAILURE; } sc = evtStore()->record(m_bcmCompactDO, m_bcmOutputName); if (sc.isFailure()) { - msg(MSG::FATAL) << "Container '" << m_bcmOutputName << "' could not be registered in StoreGate" << endreq; + msg(MSG::FATAL) << "Container '" << m_bcmOutputName << "' could not be registered in StoreGate" << endmsg; return sc; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Container '" << m_bcmOutputName << "' registered in StoreGate" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Container '" << m_bcmOutputName << "' registered in StoreGate" << endmsg; } // check if the collection exists if in the original container and loop over it @@ -107,7 +107,7 @@ StatusCode BCM_ZeroSuppression::execute() { } if (contains_hit) { - msg(MSG::VERBOSE) << "Container '" << m_bcmOutputName << "' is being filled" << endreq; + msg(MSG::VERBOSE) << "Container '" << m_bcmOutputName << "' is being filled" << endmsg; m_bcmCompactDO->push_back(my_collection); } else { delete my_collection; diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/BcmCollisionTimeAlg.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/BcmCollisionTimeAlg.cxx index 38f7eac42e1..234aa25e410 100644 --- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/BcmCollisionTimeAlg.cxx +++ b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/BcmCollisionTimeAlg.cxx @@ -44,7 +44,7 @@ StatusCode BcmCollisionTimeAlg::initialize() StatusCode BcmCollisionTimeAlg::finalize() { MsgStream log( messageService(), name() ); - log << MSG::DEBUG <<"BcmCollisionTimeAlg finalize()" << endreq; + log << MSG::DEBUG <<"BcmCollisionTimeAlg finalize()" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/LowBetaAlg.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/LowBetaAlg.cxx index 5b8f34b739f..cd97d3eb0b8 100644 --- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/LowBetaAlg.cxx +++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/LowBetaAlg.cxx @@ -72,10 +72,10 @@ namespace InDet // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * StatusCode LowBetaAlg::initialize(){ - if (msgLvl(MSG::INFO)) msg() << "initialize()" << endreq; + if (msgLvl(MSG::INFO)) msg() << "initialize()" << endmsg; if (m_fieldServiceHandle.retrieve().isFailure()){ - if (msgLvl(MSG::WARNING)) msg() << "Could not find " << m_fieldServiceHandle << endreq; + if (msgLvl(MSG::WARNING)) msg() << "Could not find " << m_fieldServiceHandle << endmsg; return( StatusCode::SUCCESS ); } @@ -105,7 +105,7 @@ namespace InDet // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * StatusCode LowBetaAlg::execute() { - if (msgLvl(MSG::DEBUG)) msg() << "execute()" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "execute()" << endmsg; std::vector<float> CSMP_indicators; InDet::InDetLowBetaContainer* myInDetLowBetaContainer = new InDet::InDetLowBetaContainer; @@ -121,7 +121,7 @@ namespace InDet //if ( evtStore()->retrieve ( trackTES, m_tracksName ).isFailure() ) if (evtStore()->retrieve(trackTES, m_trackParticleCollection).isFailure()) { - if (msgLvl(MSG::WARNING)) msg() << "Could not find TrackParticleCollection " << m_trackParticleCollection << " in StoreGate." << endreq; + if (msgLvl(MSG::WARNING)) msg() << "Could not find TrackParticleCollection " << m_trackParticleCollection << " in StoreGate." << endmsg; } else{ @@ -178,7 +178,7 @@ namespace InDet //---- Recording section: write the results to StoreGate ---// if ( evtStore()->record ( myInDetLowBetaContainer, m_InDetLowBetaOutputName,false ).isFailure() ) { - if (msgLvl(MSG::ERROR)) msg() << "Unable to record InDetLowBeta Container in TDS" << endreq; + if (msgLvl(MSG::ERROR)) msg() << "Unable to record InDetLowBeta Container in TDS" << endmsg; return StatusCode::FAILURE; } @@ -187,7 +187,7 @@ namespace InDet // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * StatusCode LowBetaAlg::finalize() { - if (msgLvl(MSG::INFO)) msg() << "finalize()" << endreq; + if (msgLvl(MSG::INFO)) msg() << "finalize()" << endmsg; finalizeTrtToolBetaLiklihood(); return StatusCode::SUCCESS; } @@ -295,12 +295,12 @@ namespace InDet double trk_z0 = parameterVector[Trk::z0]; if (tan(theta/2.0) < 0.0001) { - if (msgLvl(MSG::DEBUG)) msg() <<" Track has negative theta or is VERY close to beampipe! (tan(theta/2) < 0.0001) " << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<" Track has negative theta or is VERY close to beampipe! (tan(theta/2) < 0.0001) " << endmsg; return Discriminators; // to allow RVO } if (qOverP == 0.0) { - if (msgLvl(MSG::DEBUG)) msg() << " Track momentum infinite! (i.e. q/p = 0) " << endreq; + if (msgLvl(MSG::DEBUG)) msg() << " Track momentum infinite! (i.e. q/p = 0) " << endmsg; return Discriminators; // to allow RVO } else pTrk = fabs(1.0 / qOverP); @@ -698,7 +698,7 @@ namespace InDet HighTbits = -999; dEdx = -999.; tegap = -999.0; - if (msgLvl(MSG::WARNING)) msg() << "No TRT Bitpattern found for some straws"<< endreq; + if (msgLvl(MSG::WARNING)) msg() << "No TRT Bitpattern found for some straws"<< endmsg; } else if (m_TrtToolInitSuccess) { diff --git a/InnerDetector/InDetRecAlgs/InDetParticleCreation/src/TrackParticleCreator.cxx b/InnerDetector/InDetRecAlgs/InDetParticleCreation/src/TrackParticleCreator.cxx index 9ec0cf4faa8..1a4ac07f0c0 100755 --- a/InnerDetector/InDetRecAlgs/InDetParticleCreation/src/TrackParticleCreator.cxx +++ b/InnerDetector/InDetRecAlgs/InDetParticleCreation/src/TrackParticleCreator.cxx @@ -92,21 +92,21 @@ TrackParticleCreator::~TrackParticleCreator() StatusCode TrackParticleCreator::initialize() { - msg(MSG::DEBUG) << "initialize() success" << endreq; + msg(MSG::DEBUG) << "initialize() success" << endmsg; if ( m_particleCreatorTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_particleCreatorTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_particleCreatorTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_particleCreatorTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_particleCreatorTool << endmsg; } if (m_doSharedHits) { if ( m_assoTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_assoTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_assoTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -404,14 +404,14 @@ StatusCode TrackParticleCreator::finalize() double nTP = (double)m_nTrackParticlesCreated; msg(MSG::INFO) << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(9) << std::setprecision(3); - msg(MSG::INFO) << " --- InDetParticleCreation Summary: " << endreq; + msg(MSG::INFO) << " --- InDetParticleCreation Summary: " << endmsg; msg(MSG::INFO) << " --- Input TrackCollection : \"" << m_tracksName << "\" with " << m_nTracksProcessed << " Tracks ("; - msg(MSG::INFO) << ( m_numEvents ? (double)m_nTracksProcessed/(double)m_numEvents : 0 ) << " per event)." << endreq; + msg(MSG::INFO) << ( m_numEvents ? (double)m_nTracksProcessed/(double)m_numEvents : 0 ) << " per event)." << endmsg; msg(MSG::INFO) << " --- Output TrackParticleContainer : \"" << m_trackParticleOutputName << "\" with " << nTP << " TrackParticles ("; - msg(MSG::INFO) << (m_numEvents ? nTP/(double)m_numEvents : 0 ) << " per event)." << endreq; + msg(MSG::INFO) << (m_numEvents ? nTP/(double)m_numEvents : 0 ) << " per event)." << endmsg; if (m_nTrackParticlesCreated>0){ msg(MSG::INFO) << " --- /Track in -----> " @@ -419,79 +419,79 @@ StatusCode TrackParticleCreator::finalize() << " Pixel " << " SCT " << " TRT " - << " All (P+S+T)" << endreq; + << " All (P+S+T)" << endmsg; msg(MSG::INFO) << " --- Hits " << (double)m_numberOfBLayerHits/nTP << " " << (double)m_numberOfPixelHits/nTP << " " << (double)m_numberOfSCTHits/nTP << " " << (double)m_numberOfTRTHits/nTP << " " - << (double)(m_numberOfPixelHits+m_numberOfSCTHits+m_numberOfTRTHits)/nTP << endreq; + << (double)(m_numberOfPixelHits+m_numberOfSCTHits+m_numberOfTRTHits)/nTP << endmsg; msg(MSG::INFO) << " --- Shared Hits " << (double)m_numberOfBLayerSharedHits/nTP << " " << (double)m_numberOfPixelSharedHits/nTP << " " << (double)m_numberOfSCTSharedHits/nTP << " " << " " << " " - << " " << (double)(m_numberOfPixelSharedHits+m_numberOfSCTSharedHits)/nTP << endreq; + << " " << (double)(m_numberOfPixelSharedHits+m_numberOfSCTSharedHits)/nTP << endmsg; msg(MSG::INFO) << " --- Spoiled/Tube Hits " << " " << (double)m_numberOfPixelSpoiltHits/nTP << " " << (double)m_numberOfSCTSpoiltHits/nTP << " " << " " << (double)m_numberOfTRTTubeHits/nTP << " " - << " " << (double)(m_numberOfPixelSpoiltHits+m_numberOfSCTSpoiltHits+m_numberOfTRTTubeHits)/nTP << endreq; + << " " << (double)(m_numberOfPixelSpoiltHits+m_numberOfSCTSpoiltHits+m_numberOfTRTTubeHits)/nTP << endmsg; msg(MSG::INFO) << " --- Outliers " << (double)m_numberOfBLayerOutliers/nTP << " " << (double)m_numberOfPixelOutliers/nTP << " " << (double)m_numberOfSCTOutliers/nTP << " " << " " << (double)m_numberOfTRTOutliers/nTP << " " - << " " << (double)m_numberOfOutliersOnTrack/nTP << endreq; + << " " << (double)m_numberOfOutliersOnTrack/nTP << endmsg; msg(MSG::INFO) << " --- Holes " << " " << (double)m_numberOfPixelHoles/nTP << " " << (double)m_numberOfSCTHoles/nTP << " " << " " << (double)m_numberOfTRTHoles/nTP << " " - << " " << (double)(m_numberOfPixelHoles+m_numberOfSCTHoles+m_numberOfTRTHoles)/nTP << endreq; - msg(MSG::INFO) << " missed (exp) blayer " << (double) m_numberOfBlayersMissed/nTP << endreq; + << " " << (double)(m_numberOfPixelHoles+m_numberOfSCTHoles+m_numberOfTRTHoles)/nTP << endmsg; + msg(MSG::INFO) << " missed (exp) blayer " << (double) m_numberOfBlayersMissed/nTP << endmsg; msg(MSG::INFO) << " SCT Double Holes " << " " << " " << (double)m_numberOfSCTDoubleHoles/nTP - << endreq; + << endmsg; msg(MSG::INFO) << " --- Dead Sensors/Straws " << " " << (double)m_numberOfPixelDeadSensors/nTP << " " << (double)m_numberOfSCTDeadSensors/nTP << " " << " " << (double)m_numberOfTRTDeadStraws/nTP << " " << " " << (double)(m_numberOfPixelDeadSensors+m_numberOfSCTDeadSensors+m_numberOfTRTDeadStraws)/nTP - << endreq; - msg(MSG::INFO) << " --- Add info Pixels " << endreq; - msg(MSG::INFO) << " contributing layers " << (double)m_numberOfContribPixelLayers/nTP << endreq; - msg(MSG::INFO) << " ganged pixels " << (double)m_numberOfGangedPixels/nTP << endreq; - msg(MSG::INFO) << " ganged flagged as fake " << (double)m_numberOfGangedFlaggedFakes/nTP << endreq; - msg(MSG::INFO) << " --- Add info TRT " << endreq; + << endmsg; + msg(MSG::INFO) << " --- Add info Pixels " << endmsg; + msg(MSG::INFO) << " contributing layers " << (double)m_numberOfContribPixelLayers/nTP << endmsg; + msg(MSG::INFO) << " ganged pixels " << (double)m_numberOfGangedPixels/nTP << endmsg; + msg(MSG::INFO) << " ganged flagged as fake " << (double)m_numberOfGangedFlaggedFakes/nTP << endmsg; + msg(MSG::INFO) << " --- Add info TRT " << endmsg; msg(MSG::INFO) << " High Threshold Hits " << " " << " " << " " << " " << (double)m_numberOfTRTHighThresholdHits/nTP - << endreq; + << endmsg; msg(MSG::INFO) << " High thre. outliers " << " " << " " << " " << " " << (double)m_numberOfTRTHighThresholdOutliers/nTP - << endreq; + << endmsg; msg(MSG::INFO) << " Xenon hits" << " " << " " << " " << " " << (double)m_numberOfTRTXenonHits/nTP - << endreq; + << endmsg; } else - msg(MSG::INFO) << " No TrackParticles have been created ... skipping output." << endreq; + msg(MSG::INFO) << " No TrackParticles have been created ... skipping output." << endmsg; - msg(MSG::DEBUG) << "finalize() success" << endreq; + msg(MSG::DEBUG) << "finalize() success" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxDummyFinder.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxDummyFinder.cxx index 2fd46a955d6..a579f1965e3 100755 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxDummyFinder.cxx +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxDummyFinder.cxx @@ -35,7 +35,7 @@ namespace InDet { if ( m_iBeamCondSvc.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Could not find BeamCondSvc." << endreq; + msg(MSG::ERROR) << "Could not find BeamCondSvc." << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; @@ -56,7 +56,7 @@ namespace InDet //---- Recording section: write the results to StoreGate ---// if ( evtStore()->record ( theVxContainer, m_vxCandidatesOutputName,false ).isFailure() ) { - if (msgLvl(MSG::ERROR)) msg() << "Unable to record Vertex Container in StoreGate" << endreq; + if (msgLvl(MSG::ERROR)) msg() << "Unable to record Vertex Container in StoreGate" << endmsg; return StatusCode::FAILURE; } diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx index 441d2681ba0..824cb1e094f 100755 --- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx +++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx @@ -65,12 +65,12 @@ namespace InDet /* Get the VertexFinderTool */ if ( m_VertexFinderTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexFinderTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexFinderTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_VertexFinderTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_VertexFinderTool << endmsg; } /*Get the Vertex Mergin Tool*/ @@ -78,12 +78,12 @@ namespace InDet { if ( m_VertexMergingTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexMergingTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexMergingTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_VertexMergingTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_VertexMergingTool << endmsg; } } @@ -92,12 +92,12 @@ namespace InDet { if ( m_VertexCollectionSortingTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexCollectionSortingTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_VertexCollectionSortingTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_VertexCollectionSortingTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_VertexCollectionSortingTool << endmsg; } } if ( m_VertexEdmFactory.retrieve().isFailure() ) { @@ -106,7 +106,7 @@ namespace InDet } - msg(MSG::INFO) << "Initialization successful" << endreq; + msg(MSG::INFO) << "Initialization successful" << endmsg; return StatusCode::SUCCESS; } @@ -128,7 +128,7 @@ namespace InDet const TrackCollection *trackTES ( 0 ); if ( evtStore()->retrieve ( trackTES, m_tracksName ).isFailure() ) { - if (msgLvl(MSG::DEBUG)) msg() << "Could not find TrackCollection " << m_tracksName << " in StoreGate." << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Could not find TrackCollection " << m_tracksName << " in StoreGate." << endmsg; return StatusCode::SUCCESS; } theXAODContainers = m_VertexFinderTool->findVertex ( trackTES ); @@ -139,7 +139,7 @@ namespace InDet const xAOD::TrackParticleContainer *trackParticleCollection(0); if ( evtStore()->retrieve ( trackParticleCollection, m_tracksName ).isFailure() ) { - if (msgLvl(MSG::DEBUG)) msg() << "Could not find xAOD::TrackParticleContainer " << m_tracksName << " in StoreGate." << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Could not find xAOD::TrackParticleContainer " << m_tracksName << " in StoreGate." << endmsg; return StatusCode::SUCCESS; } theXAODContainers = m_VertexFinderTool->findVertex ( trackParticleCollection ); @@ -150,7 +150,7 @@ namespace InDet const Trk::TrackParticleBaseCollection *trackParticleBaseCollection(0); if ( evtStore()->retrieve ( trackParticleBaseCollection, m_tracksName ).isFailure() ) { - if (msgLvl(MSG::DEBUG)) msg() << "Could not find Trk::TrackParticleBaseCollection " << m_tracksName << " in StoreGate." << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Could not find Trk::TrackParticleBaseCollection " << m_tracksName << " in StoreGate." << endmsg; return StatusCode::SUCCESS; } @@ -233,9 +233,9 @@ namespace InDet { if (msgLvl(MSG::INFO)) { - msg() << "Summary from Primary Vertex Finder (InnerDetector/InDetRecAlgs/InDetPriVxFinder)" << endreq; - msg() << "=== " << m_totalNumVerticesWithoutDummy << " vertices recoed in " << m_numEventsProcessed << " events (excluding dummy)." << endreq; - if (m_numEventsProcessed!=0) msg() << "=== " << double(m_totalNumVerticesWithoutDummy)/double(m_numEventsProcessed) << " vertices per event (excluding dummy)." << endreq; + msg() << "Summary from Primary Vertex Finder (InnerDetector/InDetRecAlgs/InDetPriVxFinder)" << endmsg; + msg() << "=== " << m_totalNumVerticesWithoutDummy << " vertices recoed in " << m_numEventsProcessed << " events (excluding dummy)." << endmsg; + if (m_numEventsProcessed!=0) msg() << "=== " << double(m_totalNumVerticesWithoutDummy)/double(m_numEventsProcessed) << " vertices per event (excluding dummy)." << endmsg; } return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx index 6b892b5e9c9..372533eac48 100755 --- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx +++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/InDetTrackPRD_Association.cxx @@ -35,11 +35,11 @@ StatusCode InDet::InDetTrackPRD_Association::initialize() // if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<< "Failed to retrieve tool " << m_assoTool << endreq; + msg(MSG::FATAL)<< "Failed to retrieve tool " << m_assoTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } // Get output print level @@ -47,7 +47,7 @@ StatusCode InDet::InDetTrackPRD_Association::initialize() m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return StatusCode::SUCCESS; } @@ -92,7 +92,7 @@ StatusCode InDet::InDetTrackPRD_Association::execute() // Print common event information // if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/InDetZVTOP_Alg.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/InDetZVTOP_Alg.cxx index 6e67c1bee81..4662d2eb7d3 100755 --- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/InDetZVTOP_Alg.cxx +++ b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/InDetZVTOP_Alg.cxx @@ -43,16 +43,16 @@ StatusCode InDet::InDetZVTOP_Alg::initialize() { // Code entered here will be executed once at program start. - msg (MSG::INFO) << MSG::INFO << name() << " initialize()" << endreq; + msg (MSG::INFO) << MSG::INFO << name() << " initialize()" << endmsg; /* Get the VertexFinderTool */ if ( m_VertexFinderTool.retrieve().isFailure() ) { - msg( MSG::FATAL ) << "Failed to retrieve tool " << m_VertexFinderTool << endreq; + msg( MSG::FATAL ) << "Failed to retrieve tool " << m_VertexFinderTool << endmsg; return StatusCode::FAILURE; - } else msg ( MSG::INFO ) << "Retrieved tool " << m_VertexFinderTool<< endreq; + } else msg ( MSG::INFO ) << "Retrieved tool " << m_VertexFinderTool<< endmsg; - msg ( MSG::INFO ) << "initialize() successful in " << name() << endreq; + msg ( MSG::INFO ) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -81,10 +81,10 @@ StatusCode InDet::InDetZVTOP_Alg::execute() const TrackCollection *trackTES(0); if (evtStore()->retrieve(trackTES, m_tracksName).isFailure()) { - if(msgLvl(MSG::DEBUG)) msg() << "Could not find TrackCollection " << m_tracksName << " in StoreGate." << endreq; + if(msgLvl(MSG::DEBUG)) msg() << "Could not find TrackCollection " << m_tracksName << " in StoreGate." << endmsg; return StatusCode::SUCCESS; - } else if (msgLvl(MSG::VERBOSE)) msg() << "Find TrackCollection " << m_tracksName << " in StoreGate." << endreq; - if (msgLvl(MSG::VERBOSE)) msg() << "Number of tracks = " << trackTES->size() << endreq; + } else if (msgLvl(MSG::VERBOSE)) msg() << "Find TrackCollection " << m_tracksName << " in StoreGate." << endmsg; + if (msgLvl(MSG::VERBOSE)) msg() << "Number of tracks = " << trackTES->size() << endmsg; //theVxContainer = m_VertexFinderTool->findVertex(trackTES); --David S. theXAODContainers = m_VertexFinderTool->findVertex(trackTES); } @@ -93,34 +93,34 @@ StatusCode InDet::InDetZVTOP_Alg::execute() const Trk::TrackParticleBaseCollection *trackParticleBaseCollection(0); if(evtStore()->retrieve(trackParticleBaseCollection, m_tracksName).isFailure()) { - if(msgLvl(MSG::DEBUG)) msg() << "Could not find Trk::TrackParticleBaseCollection" << m_tracksName << " in StoreGate." << endreq; + if(msgLvl(MSG::DEBUG)) msg() << "Could not find Trk::TrackParticleBaseCollection" << m_tracksName << " in StoreGate." << endmsg; return StatusCode::SUCCESS; } //theVxContainer = m_VertexFinderTool->findVertex(trackParticleBaseCollection); --David S. theXAODContainers = m_VertexFinderTool->findVertex(trackParticleBaseCollection); } else { - if (msgLvl(MSG::DEBUG)) msg() << "Neither a TrackCollection nor a TrackParticleBaseCollection with key " << m_tracksName << " exist." << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Neither a TrackCollection nor a TrackParticleBaseCollection with key " << m_tracksName << " exist." << endmsg; //add check for xAOD::TrackParticleContainer --David S. if(evtStore()->contains<xAOD::TrackParticleContainer>(m_tracksName)) { - if (msgLvl (MSG::DEBUG)) msg() << "xAOD::TrackParticleContainer with key " << m_tracksName << " found, but no findVertex method implemented yet for these objects." << endreq; + if (msgLvl (MSG::DEBUG)) msg() << "xAOD::TrackParticleContainer with key " << m_tracksName << " found, but no findVertex method implemented yet for these objects." << endmsg; } } //---- Recording section: write the results to StoreGate ---// - //if (msgLvl(MSG::VERBOSE)) msg() << "Recording to StoreGate: " << m_vxCollectionOutputName << endreq; --David S. - if (msgLvl(MSG::VERBOSE)) msg() << "Recording to StoreGate: " << m_vxCollectionOutputName << " with AuxContainer " << vxContainerAuxName << endreq; + //if (msgLvl(MSG::VERBOSE)) msg() << "Recording to StoreGate: " << m_vxCollectionOutputName << endmsg; --David S. + if (msgLvl(MSG::VERBOSE)) msg() << "Recording to StoreGate: " << m_vxCollectionOutputName << " with AuxContainer " << vxContainerAuxName << endmsg; //if (evtStore()->record(theVxContainer,m_vxCollectionOutputName,false).isFailure()) --David S. if (evtStore()->record(theXAODContainers.first,m_vxCollectionOutputName,false).isFailure()) { - //if (msgLvl(MSG::INFO)) msg() << "Unable to record VxContainer in TDS" << endreq; --David S. - if (msgLvl(MSG::INFO)) msg() << "Unable to record VertexContainer in TDS" << endreq; + //if (msgLvl(MSG::INFO)) msg() << "Unable to record VxContainer in TDS" << endmsg; --David S. + if (msgLvl(MSG::INFO)) msg() << "Unable to record VertexContainer in TDS" << endmsg; return StatusCode::FAILURE; } //add record AuxContainer to StoreGate --David S. if (evtStore()->record(theXAODContainers.second,vxContainerAuxName).isFailure()) { - if (msgLvl(MSG::INFO)) msg() << "Unable to record VertexAuxContainer in TDS" << endreq; + if (msgLvl(MSG::INFO)) msg() << "Unable to record VertexAuxContainer in TDS" << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/TRT_StandaloneTrackFinder.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/TRT_StandaloneTrackFinder.cxx index 7ef78f3b67a..645eb1f7bf9 100644 --- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/TRT_StandaloneTrackFinder.cxx +++ b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/TRT_StandaloneTrackFinder.cxx @@ -63,21 +63,21 @@ StatusCode InDet::TRT_StandaloneTrackFinder::initialize() { StatusCode sc; - msg(MSG::DEBUG) << "Initializing TRT_StandaloneTrackFinder" << endreq; + msg(MSG::DEBUG) << "Initializing TRT_StandaloneTrackFinder" << endmsg; sc = m_segToTrackTool.retrieve(); if (sc.isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_segToTrackTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_segToTrackTool << endmsg; return StatusCode::FAILURE; }else{ - msg() << MSG::INFO << "Retrieved tool " << m_segToTrackTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_segToTrackTool << endmsg; } // Get output print level // if(msgLvl(MSG::DEBUG)) { - m_nprint=0; msg(MSG::DEBUG) << (*this) << endreq; + m_nprint=0; msg(MSG::DEBUG) << (*this) << endmsg; } //Global counters. See the include file for definitions @@ -237,7 +237,7 @@ StatusCode InDet::TRT_StandaloneTrackFinder::execute() // Print common event information if(msgLvl(MSG::DEBUG)) { - m_nprint=1; msg(MSG::DEBUG) << (*this) << endreq; + m_nprint=1; msg(MSG::DEBUG) << (*this) << endmsg; } return StatusCode::SUCCESS; @@ -249,7 +249,7 @@ StatusCode InDet::TRT_StandaloneTrackFinder::execute() StatusCode InDet::TRT_StandaloneTrackFinder::finalize() { - m_nprint=2; msg(MSG::INFO)<<(*this)<<endreq; + m_nprint=2; msg(MSG::INFO)<<(*this)<<endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/InDetPRD_AssociationToolGangedPixels.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/InDetPRD_AssociationToolGangedPixels.cxx index fe53e17a390..bf3341d89b5 100755 --- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/InDetPRD_AssociationToolGangedPixels.cxx +++ b/InnerDetector/InDetRecTools/InDetAssociationTools/src/InDetPRD_AssociationToolGangedPixels.cxx @@ -47,7 +47,7 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::addPRDs( const Trk::Trac TrackPrepRawDataMap::const_iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec!=m_trackPrepRawDataMap.end()) { - msg(MSG::ERROR)<<"track already found in cache, should not happen"<<endreq; + msg(MSG::ERROR)<<"track already found in cache, should not happen"<<endmsg; return StatusCode::FAILURE; } // get all prds on 'track' @@ -63,12 +63,12 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::addPRDs( const Trk::Trac const PixelCluster* pixel = dynamic_cast<const PixelCluster*> (*it); if (pixel!=0) { if (pixel->gangedPixel()) { - if (msgLvl(MSG::DEBUG)) msg() << "Found ganged pixel, search for mirror" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Found ganged pixel, search for mirror" << endmsg; std::pair<PixelGangedClusterAmbiguities::const_iterator, PixelGangedClusterAmbiguities::const_iterator> ambi = m_gangedAmbis->equal_range(pixel); for (; ambi.first != ambi.second ; ++(ambi.first) ) { // add ambiguity as used by this track as well - if (msgLvl(MSG::DEBUG)) msg() << "Found mirror pixel, add mirror to association map" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Found mirror pixel, add mirror to association map" << endmsg; m_prepRawDataTrackMap.insert(std::make_pair(ambi.first->second, &track) ); } } @@ -79,7 +79,7 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::addPRDs( const Trk::Trac m_trackPrepRawDataMap.insert( std::make_pair(&track, prds) ); if (msgLvl(MSG::DEBUG)) msg()<<"Added PRDs from Track at ("<<&track<<") - map now has size: \t" - <<m_prepRawDataTrackMap.size()<<endreq; + <<m_prepRawDataTrackMap.size()<<endmsg; return StatusCode::SUCCESS; } @@ -101,7 +101,7 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::removePRDs( const Trk::T TrackPrepRawDataMap::iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec==m_trackPrepRawDataMap.end()) { - msg(MSG::ERROR)<<"Track not found in cache, this should not happen"<<endreq; + msg(MSG::ERROR)<<"Track not found in cache, this should not happen"<<endmsg; return StatusCode::FAILURE; } @@ -137,7 +137,7 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::removePRDs( const Trk::T PixelGangedClusterAmbiguities::const_iterator> ambi = m_gangedAmbis->equal_range(pixel); for (; ambi.first != ambi.second ; ++(ambi.first) ) { // add ambiguity as used by this track as well - if (msgLvl(MSG::DEBUG)) msg()<<MSG::DEBUG<<"Found ganged pixel, remove also mirror from association map"<<endreq; + if (msgLvl(MSG::DEBUG)) msg()<<MSG::DEBUG<<"Found ganged pixel, remove also mirror from association map"<<endmsg; range = m_prepRawDataTrackMap.equal_range(ambi.first->second); // get iterators for range @@ -161,7 +161,7 @@ StatusCode InDet::InDetPRD_AssociationToolGangedPixels::removePRDs( const Trk::T if (msgLvl(MSG::DEBUG)) msg()<<"Removed PRDs from track (" <<&track<<") \t- map has changed size from \t" - <<oldSize <<" \tto "<<m_prepRawDataTrackMap.size()<<endreq; + <<oldSize <<" \tto "<<m_prepRawDataTrackMap.size()<<endmsg; return StatusCode::SUCCESS; } @@ -201,7 +201,7 @@ Trk::IPRD_AssociationTool::TrackSet connectedTracks.erase(&track); if (msgLvl(MSG::VERBOSE)) msg()<<"Added in connected tracks for track "<<&track - << "\tsize of list is "<<connectedTracks.size()<<endreq; + << "\tsize of list is "<<connectedTracks.size()<<endmsg; return connectedTracks; } @@ -215,12 +215,12 @@ std::vector< const Trk::PrepRawData* > InDet::InDetPRD_AssociationToolGangedPixe TrackPrepRawDataMap::const_iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec!=m_trackPrepRawDataMap.end()) { - msg(MSG::VERBOSE)<<"found track in cache, return cached PRD vector for track"<<endreq; + msg(MSG::VERBOSE)<<"found track in cache, return cached PRD vector for track"<<endmsg; return itvec->second; } if (track.measurementsOnTrack()==0) { - msg(MSG::WARNING)<<"Track has no RoTs"<<endreq; + msg(MSG::WARNING)<<"Track has no RoTs"<<endmsg; return PRDs_t(); // return vector optimization } @@ -247,7 +247,7 @@ std::vector< const Trk::PrepRawData* > InDet::InDetPRD_AssociationToolGangedPixe } if (msgLvl(MSG::DEBUG)) msg()<<" Getting "<<vec.size() - <<" PRDs from track at:"<<&track<<endreq; + <<" PRDs from track at:"<<&track<<endmsg; // new mode, we add the outleirs in the TRT if (m_addTRToutliers) { @@ -272,7 +272,7 @@ std::vector< const Trk::PrepRawData* > InDet::InDetPRD_AssociationToolGangedPixe } if (msgLvl(MSG::DEBUG)) msg()<<" Getting "<<vec.size() - <<" PRDs including TRT outlier from track at:"<<&track<<endreq; + <<" PRDs including TRT outlier from track at:"<<&track<<endmsg; } return vec; @@ -292,14 +292,14 @@ void InDet::InDetPRD_AssociationToolGangedPixels::reset() StatusCode sc = evtStore()->retrieve(m_gangedAmbis, m_pixelClusterAmbiguitiesMapName ); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not retrieve "<< m_pixelClusterAmbiguitiesMapName << endreq; + msg(MSG::ERROR) << "Could not retrieve "<< m_pixelClusterAmbiguitiesMapName << endmsg; } else { if (msgLvl(MSG::DEBUG)) msg() << "Retrieved " << m_pixelClusterAmbiguitiesMapName << ", number of entries for this event:" - << m_gangedAmbis->size() << endreq; + << m_gangedAmbis->size() << endmsg; } } else { - if (msgLvl(MSG::DEBUG)) msg() << "Could not retrieve "<< m_pixelClusterAmbiguitiesMapName << " this is ok if pixel is off." << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Could not retrieve "<< m_pixelClusterAmbiguitiesMapName << " this is ok if pixel is off." << endmsg; } m_prepRawDataTrackMap.clear(); m_trackPrepRawDataMap.clear(); diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx index b5fb03b3b3a..7c8209fbfbc 100755 --- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx +++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingSCT_ClustersOnTrackTool.cxx @@ -425,40 +425,40 @@ void InDet::CompetingSCT_ClustersOnTrackTool::testCompetingROT(const InDet::Comp if (!msgLvl(MSG::VERBOSE)) return; - msg(MSG::VERBOSE)<<"**Test**"<<endreq; + msg(MSG::VERBOSE)<<"**Test**"<<endmsg; msg()<<" - associatedSurface(): "; const Trk::Surface* assocsurface = &(compROT.associatedSurface()); - //msg(MSG::VERBOSE)<<" distance of surface center from origin: " << assocsurface->center().distance()<<endreq; - msg()<< assocsurface << " at ("<< assocsurface->center().x() << ", "<< assocsurface->center().y() << ", "<< assocsurface->center().z() << ")" <<endreq; + //msg(MSG::VERBOSE)<<" distance of surface center from origin: " << assocsurface->center().distance()<<endmsg; + msg()<< assocsurface << " at ("<< assocsurface->center().x() << ", "<< assocsurface->center().y() << ", "<< assocsurface->center().z() << ")" <<endmsg; msg()<<" - containedROTs(): "; - //msg()<<" size of ROT vector: " << compROT.containedROTs().size()<<endreq; - msg()<<" numberOfContainedROTs(): " << compROT.numberOfContainedROTs()<<endreq; + //msg()<<" size of ROT vector: " << compROT.containedROTs().size()<<endmsg; + msg()<<" numberOfContainedROTs(): " << compROT.numberOfContainedROTs()<<endmsg; msg()<<" - eff. localParameters():"; - //msg()<<" dimension of the effective local params: " << compROT.localParameters().dimension()<<endreq; + //msg()<<" dimension of the effective local params: " << compROT.localParameters().dimension()<<endmsg; msg()<<" dim: " << compROT.localParameters().dimension(); - //msg()<<" effective localPar[locX]: " << compROT.localParameters()[Trk::locX] <<endreq; - msg()<<" [locX]: " << compROT.localParameters()[Trk::locX] <<endreq; + //msg()<<" effective localPar[locX]: " << compROT.localParameters()[Trk::locX] <<endmsg; + msg()<<" [locX]: " << compROT.localParameters()[Trk::locX] <<endmsg; if (compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) > 0. ) { // if maxAssgnProb==0 the weight matrix is 0 and therefore singular => can not get covariance msg()<<" - localErrorMatrix():"; msg()<<" dimCov: " << compROT.localCovariance().rows(); - msg()<<" cov[loc1]: " << compROT.localCovariance()(Trk::loc1,Trk::loc1) << endreq; + msg()<<" cov[loc1]: " << compROT.localCovariance()(Trk::loc1,Trk::loc1) << endmsg; } - msg()<<" - indexOfMaxAssignProb(): " << compROT.indexOfMaxAssignProb() <<endreq; - //msg()<<" assignmentProbability( indexOfMaxAssignProb() ): " << compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) <<endreq; + msg()<<" - indexOfMaxAssignProb(): " << compROT.indexOfMaxAssignProb() <<endmsg; + //msg()<<" assignmentProbability( indexOfMaxAssignProb() ): " << compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) <<endmsg; - msg()<<" - assignmentProbability(index) and rioOnTrack(index)"<<endreq; + msg()<<" - assignmentProbability(index) and rioOnTrack(index)"<<endmsg; for (unsigned int i=0; i<compROT.numberOfContainedROTs(); i++) { msg()<<" ["<< i <<"] assgnProb: "<< compROT.assignmentProbability(i) << " ROT ID: "<< compROT.rioOnTrack(i).identify().getString() << " [locX]: "<< compROT.rioOnTrack(i).localParameters()[Trk::locX] << " ROT surf: "<< &(compROT.rioOnTrack(i).associatedSurface()) - << endreq; + << endmsg; if (compROT.assignmentProbability(i) > compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) ) { ATH_MSG_ERROR(" assignment probability larger than maximum assignment probability!!!"); } @@ -466,38 +466,38 @@ void InDet::CompetingSCT_ClustersOnTrackTool::testCompetingROT(const InDet::Comp msg()<<" - eff. globalPosition(): "; - //msg()<<" distance of effective measurement from origin: " << compROT.globalPosition().distance()<<endreq; - msg()<< " ("<< compROT.globalPosition().x() << ", "<< compROT.globalPosition().y() << ", "<< compROT.globalPosition().z() << ")" <<endreq; - /* msg()<<" - clone()"<<endreq; + //msg()<<" distance of effective measurement from origin: " << compROT.globalPosition().distance()<<endmsg; + msg()<< " ("<< compROT.globalPosition().x() << ", "<< compROT.globalPosition().y() << ", "<< compROT.globalPosition().z() << ")" <<endmsg; + /* msg()<<" - clone()"<<endmsg; CompetingSCT_ClustersOnTrack* newcompROT = compROT.clone(); if (!newcompROT){ - m_log<<MSG::ERROR<<" Got no clone!"<<endreq; + m_log<<MSG::ERROR<<" Got no clone!"<<endmsg; } else { - msg()<<" Got the clone: do the same tests with it:"<<endreq; + msg()<<" Got the clone: do the same tests with it:"<<endmsg; - msg()<<" clone- associatedSurface()"<<endreq; + msg()<<" clone- associatedSurface()"<<endmsg; const Trk::Surface* cloneassocsurface = &(newcompROT->associatedSurface()); - msg()<<" distance of surface center from origin: " << cloneassocsurface->center().distance()<<endreq; + msg()<<" distance of surface center from origin: " << cloneassocsurface->center().distance()<<endmsg; - msg()<<" clone- containedROTs()"<<endreq; - msg()<<" size of ROT vector: " << newcompROT->containedROTs().size()<<endreq; - msg()<<" clone- numberOfContainedROTs(): " << newcompROT->numberOfContainedROTs()<<endreq; + msg()<<" clone- containedROTs()"<<endmsg; + msg()<<" size of ROT vector: " << newcompROT->containedROTs().size()<<endmsg; + msg()<<" clone- numberOfContainedROTs(): " << newcompROT->numberOfContainedROTs()<<endmsg; - msg()<<" clone- localParameters()"<<endreq; - msg()<<" dimension of the effective local params: " << newcompROT->localParameters().dimension()<<endreq; + msg()<<" clone- localParameters()"<<endmsg; + msg()<<" dimension of the effective local params: " << newcompROT->localParameters().dimension()<<endmsg; - msg()<<" clone- localErrorMatrix()"<<endreq; - msg()<<" dimension of covariance matrix: " << newcompROT->localErrorMatrix().covariance().num_row()<<endreq; - msg()<<" error of first local coordinate: " << newcompROT->localErrorMatrix().error(Trk::loc1)<<endreq; - msg()<<" weight value of first local coordinate: " << newcompROT->localErrorMatrix().weightValue(Trk::loc1)<<endreq; + msg()<<" clone- localErrorMatrix()"<<endmsg; + msg()<<" dimension of covariance matrix: " << newcompROT->localErrorMatrix().covariance().num_row()<<endmsg; + msg()<<" error of first local coordinate: " << newcompROT->localErrorMatrix().error(Trk::loc1)<<endmsg; + msg()<<" weight value of first local coordinate: " << newcompROT->localErrorMatrix().weightValue(Trk::loc1)<<endmsg; - msg()<<" clone- assignmentProbability(index) and rioOnTrack(index)"<<endreq; + msg()<<" clone- assignmentProbability(index) and rioOnTrack(index)"<<endmsg; for (unsigned int i=0; i<newcompROT->numberOfContainedROTs(); i++) { - msg()<<" ["<< i <<"] assgnProb: "<< newcompROT->assignmentProbability(i)<< "ROT identifier:"<< newcompROT->rioOnTrack(i)->identify().getString() <<endreq; + msg()<<" ["<< i <<"] assgnProb: "<< newcompROT->assignmentProbability(i)<< "ROT identifier:"<< newcompROT->rioOnTrack(i)->identify().getString() <<endmsg; } - msg()<<" clone- globalPosition()"<<endreq; - msg()<<" distance of effective measurement from origin: " << newcompROT->globalPosition().distance()<<endreq; + msg()<<" clone- globalPosition()"<<endmsg; + msg()<<" distance of effective measurement from origin: " << newcompROT->globalPosition().distance()<<endmsg; } delete newcompROT;*/ diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx index 433c75d46a2..505c3479539 100755 --- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx +++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/CompetingTRT_DriftCirclesOnTrackTool.cxx @@ -1068,76 +1068,76 @@ void InDet::CompetingTRT_DriftCirclesOnTrackTool::testCompetingROT(const InDet:: msg(MSG::VERBOSE) <<" - associatedSurface(): "; const Trk::Surface* assocsurface = &(compROT.associatedSurface()); - //msg()<<MSG::VERBOSE<<" distance of surface center from origin: " << assocsurface->center().distance()<<endreq; - msg()<< assocsurface << " at ("<< assocsurface->center().x() << ", "<< assocsurface->center().y() << ", "<< assocsurface->center().z() << ")" <<endreq; + //msg()<<MSG::VERBOSE<<" distance of surface center from origin: " << assocsurface->center().distance()<<endmsg; + msg()<< assocsurface << " at ("<< assocsurface->center().x() << ", "<< assocsurface->center().y() << ", "<< assocsurface->center().z() << ")" <<endmsg; msg()<<" - containedROTs(): "; - //msg()<<" size of ROT vector: " << compROT.containedROTs().size()<<endreq; - msg()<<" numberOfContainedROTs(): " << compROT.numberOfContainedROTs()<<endreq; + //msg()<<" size of ROT vector: " << compROT.containedROTs().size()<<endmsg; + msg()<<" numberOfContainedROTs(): " << compROT.numberOfContainedROTs()<<endmsg; msg()<<" - eff. localParameters():"; - //msg()<<" dimension of the effective local params: " << compROT.localParameters().dimension()<<endreq; + //msg()<<" dimension of the effective local params: " << compROT.localParameters().dimension()<<endmsg; msg()<<" dim: " << compROT.localParameters().dimension(); - //msg()<<" effective localPar[locX]: " << compROT.localParameters()[Trk::locX] <<endreq; - msg()<<" [locX]: " << compROT.localParameters()[Trk::locX] <<endreq; + //msg()<<" effective localPar[locX]: " << compROT.localParameters()[Trk::locX] <<endmsg; + msg()<<" [locX]: " << compROT.localParameters()[Trk::locX] <<endmsg; if (compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) > 0. ) { // if maxAssgnProb==0 the weight matrix is 0 and therefore singular => can not get covariance msg()<<" - localErrorMatrix():"; msg()<<" dimCov: " << compROT.localCovariance().rows(); - msg()<<" cov[loc1]: " << compROT.localCovariance()(Trk::loc1,Trk::loc1)<<endreq; + msg()<<" cov[loc1]: " << compROT.localCovariance()(Trk::loc1,Trk::loc1)<<endmsg; } - msg()<<" - indexOfMaxAssignProb(): " << compROT.indexOfMaxAssignProb() <<endreq; - //msg()<<" assignmentProbability( indexOfMaxAssignProb() ): " << compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) <<endreq; + msg()<<" - indexOfMaxAssignProb(): " << compROT.indexOfMaxAssignProb() <<endmsg; + //msg()<<" assignmentProbability( indexOfMaxAssignProb() ): " << compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) <<endmsg; - msg()<<" - assignmentProbability(index) and rioOnTrack(index)"<<endreq; + msg()<<" - assignmentProbability(index) and rioOnTrack(index)"<<endmsg; for (unsigned int i=0; i<compROT.numberOfContainedROTs(); i++) { msg()<<" ["<< i <<"] assgnProb: "<< compROT.assignmentProbability(i) << " ROT ID: "<< compROT.rioOnTrack(i).identify().getString() << " [locX]: "<< compROT.rioOnTrack(i).localParameters()[Trk::locX] << " ROT surf: "<< &(compROT.rioOnTrack(i).associatedSurface()) - << endreq; + << endmsg; if (compROT.assignmentProbability(i) > compROT.assignmentProbability(compROT.indexOfMaxAssignProb()) ) { - msg(MSG::ERROR)<<" assignment probability larger than maximum assignment probability!!!"<<endreq; - msg(MSG::VERBOSE)<<endreq; + msg(MSG::ERROR)<<" assignment probability larger than maximum assignment probability!!!"<<endmsg; + msg(MSG::VERBOSE)<<endmsg; } } msg()<<" - eff. globalPosition(): "; - //msg()<<" distance of effective measurement from origin: " << compROT.globalPosition().distance()<<endreq; - msg()<< " ("<< compROT.globalPosition().x() << ", "<< compROT.globalPosition().y() << ", "<< compROT.globalPosition().z() << ")" <<endreq; - /* msg()<<" - clone()"<<endreq; + //msg()<<" distance of effective measurement from origin: " << compROT.globalPosition().distance()<<endmsg; + msg()<< " ("<< compROT.globalPosition().x() << ", "<< compROT.globalPosition().y() << ", "<< compROT.globalPosition().z() << ")" <<endmsg; + /* msg()<<" - clone()"<<endmsg; CompetingTRT_DriftCirclesOnTrack* newcompROT = compROT.clone(); if (!newcompROT){ - m_log<<MSG::ERROR<<" Got no clone!"<<endreq; + m_log<<MSG::ERROR<<" Got no clone!"<<endmsg; } else { - msg()<<" Got the clone: do the same tests with it:"<<endreq; + msg()<<" Got the clone: do the same tests with it:"<<endmsg; - msg()<<" clone- associatedSurface()"<<endreq; + msg()<<" clone- associatedSurface()"<<endmsg; const Trk::Surface* cloneassocsurface = &(newcompROT->associatedSurface()); - msg()<<" distance of surface center from origin: " << cloneassocsurface->center().distance()<<endreq; + msg()<<" distance of surface center from origin: " << cloneassocsurface->center().distance()<<endmsg; - msg()<<" clone- containedROTs()"<<endreq; - msg()<<" size of ROT vector: " << newcompROT->containedROTs().size()<<endreq; - msg()<<" clone- numberOfContainedROTs(): " << newcompROT->numberOfContainedROTs()<<endreq; + msg()<<" clone- containedROTs()"<<endmsg; + msg()<<" size of ROT vector: " << newcompROT->containedROTs().size()<<endmsg; + msg()<<" clone- numberOfContainedROTs(): " << newcompROT->numberOfContainedROTs()<<endmsg; - msg()<<" clone- localParameters()"<<endreq; - msg()<<" dimension of the effective local params: " << newcompROT->localParameters().dimension()<<endreq; + msg()<<" clone- localParameters()"<<endmsg; + msg()<<" dimension of the effective local params: " << newcompROT->localParameters().dimension()<<endmsg; - msg()<<" clone- localErrorMatrix()"<<endreq; - msg()<<" dimension of covariance matrix: " << newcompROT->localErrorMatrix().covariance().num_row()<<endreq; - msg()<<" error of first local coordinate: " << newcompROT->localErrorMatrix().error(Trk::loc1)<<endreq; - msg()<<" weight value of first local coordinate: " << newcompROT->localErrorMatrix().weightValue(Trk::loc1)<<endreq; + msg()<<" clone- localErrorMatrix()"<<endmsg; + msg()<<" dimension of covariance matrix: " << newcompROT->localErrorMatrix().covariance().num_row()<<endmsg; + msg()<<" error of first local coordinate: " << newcompROT->localErrorMatrix().error(Trk::loc1)<<endmsg; + msg()<<" weight value of first local coordinate: " << newcompROT->localErrorMatrix().weightValue(Trk::loc1)<<endmsg; - msg()<<" clone- assignmentProbability(index) and rioOnTrack(index)"<<endreq; + msg()<<" clone- assignmentProbability(index) and rioOnTrack(index)"<<endmsg; for (unsigned int i=0; i<newcompROT->numberOfContainedROTs(); i++) { - msg()<<" ["<< i <<"] assgnProb: "<< newcompROT->assignmentProbability(i)<< "ROT identifier:"<< newcompROT->rioOnTrack(i)->identify().getString() <<endreq; + msg()<<" ["<< i <<"] assgnProb: "<< newcompROT->assignmentProbability(i)<< "ROT identifier:"<< newcompROT->rioOnTrack(i)->identify().getString() <<endmsg; } - msg()<<" clone- globalPosition()"<<endreq; - msg()<<" distance of effective measurement from origin: " << newcompROT->globalPosition().distance()<<endreq; + msg()<<" clone- globalPosition()"<<endmsg; + msg()<<" distance of effective measurement from origin: " << newcompROT->globalPosition().distance()<<endmsg; } delete newcompROT;*/ diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx index 0c531c334ea..89f1ad4ed9b 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/DivisiveMultiSeedFinder.cxx @@ -24,46 +24,46 @@ namespace InDet if(m_trkFilter.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track filter retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track filter retrieved"<<endmsg; if(m_sortingTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_sortingTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_sortingTool<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endmsg; if(m_vtxSeedFinder.retrieve().isFailure()) { - msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endreq; + msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endreq; + }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endmsg; if(m_cleaningTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_cleaningTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_cleaningTool<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endmsg; if(m_beamService.retrieve().isFailure()) { - msg(MSG::ERROR)<<"Unable to retrieve "<<m_beamService<<endreq; + msg(MSG::ERROR)<<"Unable to retrieve "<<m_beamService<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"BeamSpot service retrieved"<<endreq; + }else msg(MSG::INFO)<<"BeamSpot service retrieved"<<endmsg; if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; - } else msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + } else msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; return StatusCode::SUCCESS; }//end of initialize mtehod StatusCode DivisiveMultiSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -114,7 +114,7 @@ namespace InDet //selecting with respect to the beam spot Trk::RecVertex beamrecposition(m_beamService->beamVtx()); for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr,&beamrecposition)) preselectedTracks.push_back(*tr); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; Trk::Vertex* beamposition=&beamrecposition; if (m_ignoreBeamSpot) @@ -123,7 +123,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition=myVertex; } @@ -149,7 +149,7 @@ namespace InDet if(exPerigee) { lastTrackZ0 = exPerigee->parameters()[Trk::z0]; delete exPerigee; } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; if (m_ignoreBeamSpot) delete beamposition; return result; } @@ -222,7 +222,7 @@ namespace InDet //-------------------End of debug output ----------------------------------------- if(core_cluster.size()==0) { - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -238,8 +238,8 @@ namespace InDet }else if(core_outl.size()>1){ clean_again = false; - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check @@ -272,7 +272,7 @@ namespace InDet Trk::RecVertex beamrecposition(m_beamService->beamVtx()); for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr, &beamrecposition)) preselectedTracks.push_back(*tr); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; Trk::Vertex* beamposition=&beamrecposition; @@ -291,7 +291,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition=myVertex; } @@ -319,7 +319,7 @@ namespace InDet if(exPerigee) { lastTrackZ0 = exPerigee->parameters()[Trk::z0]; delete exPerigee; } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; if (m_ignoreBeamSpot) delete beamposition; return result; } @@ -354,7 +354,7 @@ namespace InDet //storing the last (or the only) cluster preClusters.push_back(tmp_cluster); - msg(MSG::DEBUG)<<"The preselection returns clusters: "<<preClusters.size()<<endreq; + msg(MSG::DEBUG)<<"The preselection returns clusters: "<<preClusters.size()<<endmsg; //step 4 iterative cleaning of clusters // std::cout<<"Number of clusters before cleaning: "<<preClusters.size()<<std::endl; @@ -399,7 +399,7 @@ namespace InDet if(core_cluster.size()==0) { - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -416,8 +416,8 @@ namespace InDet }else if(core_outl.size()>1) { clean_again = false; - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check @@ -453,7 +453,7 @@ namespace InDet beamposition->setPosition(m_beamService->beamVtx().position()); beamposition->setCovariancePosition(m_beamService->beamVtx().covariancePosition()); // for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr, &beamrecposition)) preselectedTracks.push_back(*tr); - // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; //Trk::Vertex* beamposition=&beamrecposition; for (std::vector<const xAOD::TrackParticle*>::const_iterator itr = tracks.begin(); itr != tracks.end(); ++itr) { @@ -479,7 +479,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition->setPosition(myVertex->position()); beamposition->setCovariancePosition(myVertex->covariancePosition()); } @@ -512,7 +512,7 @@ namespace InDet } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; delete beamposition; delete myVertex; return result; @@ -549,7 +549,7 @@ namespace InDet //storing the last (or the only) cluster preClusters.push_back(tmp_cluster); - msg(MSG::DEBUG)<<"The preselection returns clusters: "<<preClusters.size()<<endreq; + msg(MSG::DEBUG)<<"The preselection returns clusters: "<<preClusters.size()<<endmsg; //step 4 iterative cleaning of clusters // std::cout<<"Number of clusters before cleaning: "<<preClusters.size()<<std::endl; @@ -593,7 +593,7 @@ namespace InDet if(core_cluster.size()==0) { - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -610,8 +610,8 @@ namespace InDet }else if(core_outl.size()>1) { clean_again = false; - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check @@ -663,7 +663,7 @@ namespace InDet perigee =0; }else{ - msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endreq; + msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endmsg; // no_perigee.push_back(j); }//end of perigee existance check ++j; @@ -699,7 +699,7 @@ namespace InDet unsigned int cluster_size = 0; - msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endreq; + msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endmsg; Trk::PerigeeSurface perigeeSurface(reference->position()); @@ -713,17 +713,17 @@ namespace InDet if(perigee) { z_center += perigee->parameters()[Trk::z0]; - msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endreq; + msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endmsg; ++cluster_size; }else{ - msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endreq; + msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endmsg; }//end of perigee security check }//end of loop definig the center of a cluster - msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endreq; + msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endmsg; z_center = z_center/cluster_size; - msg(MSG::DEBUG)<<"Looping over the cluster" <<endreq; + msg(MSG::DEBUG)<<"Looping over the cluster" <<endmsg; for(std::vector<const xAOD::TrackParticle*>::const_iterator i = inb; i != ine; ++i) { @@ -736,10 +736,10 @@ namespace InDet const AmgSymMatrix(5) * cov = measPerigee->covariance(); double sigma_z0 = Amg::error(*cov,Trk::z0); - msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endreq; - msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endreq; - msg(MSG::DEBUG)<<"Offset "<<3.0<<endreq; - msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endreq; + msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endmsg; + msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endmsg; + msg(MSG::DEBUG)<<"Offset "<<3.0<<endmsg; + msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endmsg; //if the track is closer than several standard deviations, keep it if(fabs(z_center-z0)< sigma_z0*3.0) clusterSeed.push_back(&((*i)->perigeeParameters())); @@ -748,7 +748,7 @@ namespace InDet else outliers.push_back(*i); }else{ outliers.push_back(*i); - msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endreq; + msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endmsg; }//end of measured perigee check }//end of separation loop diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx index 33efb9d2ec2..247330103fd 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/HistogrammingMultiSeedFinder.cxx @@ -21,40 +21,40 @@ namespace InDet if(m_trkFilter.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track summary tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track summary tool retrieved"<<endmsg; if(m_cleaningTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_cleaningTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_cleaningTool<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Cluster cleaning tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Cluster cleaning tool retrieved"<<endmsg; if(m_beamService.retrieve().isFailure()) { - msg(MSG::ERROR)<<"Unable to retrieve "<<m_beamService<<endreq; + msg(MSG::ERROR)<<"Unable to retrieve "<<m_beamService<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"BeamSpot service retrieved"<<endreq; + }else msg(MSG::INFO)<<"BeamSpot service retrieved"<<endmsg; if(m_vtxSeedFinder.retrieve().isFailure()) { - msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endreq; + msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endreq; + }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endmsg; if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; - } else msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + } else msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; return StatusCode::SUCCESS; }//end of initialize mtehod StatusCode HistogrammingMultiSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -106,7 +106,7 @@ namespace InDet //beamposition Trk::RecVertex beamrecposition(m_beamService->beamVtx()); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr,&beamrecposition)) preselectedTracks.push_back(*tr); Trk::Vertex* beamposition=&beamrecposition; @@ -116,7 +116,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition=myVertex; } @@ -222,7 +222,7 @@ namespace InDet if(core_cluster.size()==0) { - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -240,8 +240,8 @@ namespace InDet { clean_again = false; - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check }while(clean_again);//end of loop @@ -267,7 +267,7 @@ namespace InDet //beamposition Trk::RecVertex beamrecposition(m_beamService->beamVtx()); for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr, &beamrecposition)) preselectedTracks.push_back(*tr); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; Trk::Vertex* beamposition=&beamrecposition; @@ -286,7 +286,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition=myVertex; } @@ -300,7 +300,7 @@ namespace InDet //getting the bin size double bin_size = 2.* m_histoRange/ m_nBins; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamposition->position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamposition->position()<<endmsg; //getting a perigee surface to be used Trk::PerigeeSurface perigeeSurface(beamposition->position()); @@ -383,7 +383,7 @@ namespace InDet if(core_cluster.size()==0) { MsgStream log(msgSvc(), name()); - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -401,8 +401,8 @@ namespace InDet { clean_again = false; MsgStream log(msgSvc(), name()); - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check }while(clean_again);//end of loop @@ -434,7 +434,7 @@ namespace InDet beamposition->setPosition(m_beamService->beamVtx().position()); beamposition->setCovariancePosition(m_beamService->beamVtx().covariancePosition()); // for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr, &beamrecposition)) preselectedTracks.push_back(*tr); - // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; //Trk::Vertex* beamposition=&beamrecposition; for (std::vector<const xAOD::TrackParticle*>::const_iterator itr = tracks.begin(); itr != tracks.end(); ++itr) { @@ -459,7 +459,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition->setPosition(myVertex->position()); beamposition->setCovariancePosition(myVertex->covariancePosition()); //hmm, will this leak? I think so. @@ -477,7 +477,7 @@ namespace InDet //getting the bin size double bin_size = 2.* m_histoRange/ m_nBins; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamposition->position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamposition->position()<<endmsg; //getting a perigee surface to be used Trk::PerigeeSurface perigeeSurface(beamposition->position()); @@ -575,7 +575,7 @@ namespace InDet if(core_cluster.size()==0) { - msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endreq; + msg(MSG::INFO) << "Core cluster has 0 size, remaining tracks are discarded. "<< endmsg; clean_again = false; }else{ @@ -592,8 +592,8 @@ namespace InDet }else if(core_outl.size()>1) { clean_again = false; - msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endreq; - msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endreq; + msg(MSG::INFO) << "There were remaining outliers of size: "<< core_outl.size()<< endmsg; + msg(MSG::INFO) << "Not evident, whether these tracks form a cluster. Rejected..."<< endmsg; }else clean_again = false;//end of outlier size check }//end of core cluster 0 check @@ -630,7 +630,7 @@ namespace InDet unsigned int cluster_size = 0; - msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endreq; + msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endmsg; Trk::PerigeeSurface perigeeSurface(reference->position()); @@ -644,17 +644,17 @@ namespace InDet if(perigee) { z_center += perigee->parameters()[Trk::z0]; - msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endreq; + msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endmsg; ++cluster_size; }else{ - msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endreq; + msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endmsg; }//end of perigee security check }//end of loop definig the center of a cluster - msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endreq; + msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endmsg; z_center = z_center/cluster_size; - msg(MSG::DEBUG)<<"Looping over the cluster" <<endreq; + msg(MSG::DEBUG)<<"Looping over the cluster" <<endmsg; for(std::vector<const xAOD::TrackParticle*>::const_iterator i = inb; i != ine; ++i) { @@ -667,10 +667,10 @@ namespace InDet const AmgSymMatrix(5) * cov = measPerigee->covariance(); double sigma_z0 = Amg::error(*cov,Trk::z0); - msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endreq; - msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endreq; - msg(MSG::DEBUG)<<"Offset "<<3.0<<endreq; - msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endreq; + msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endmsg; + msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endmsg; + msg(MSG::DEBUG)<<"Offset "<<3.0<<endmsg; + msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endmsg; //if the track is closer than several standard deviations, keep it if(fabs(z_center-z0)< sigma_z0*3.0) clusterSeed.push_back(&((*i)->perigeeParameters())); @@ -679,7 +679,7 @@ namespace InDet else outliers.push_back(*i); }else{ outliers.push_back(*i); - msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endreq; + msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endmsg; }//end of measured perigee check }//end of separation loop diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx index 7badd534048..a7f30922033 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/SlidingWindowMultiSeedFinder.cxx @@ -22,42 +22,42 @@ namespace InDet { if(m_trkFilter.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_trkFilter<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track selector tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track selector tool retrieved"<<endmsg; if(m_sortingTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_sortingTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_sortingTool<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endreq; + }else msg(MSG::INFO)<<"Track sorting tool retrieved"<<endmsg; if(m_beamService.retrieve().isFailure()) { - msg(MSG::ERROR)<<"Unable to retieve "<<m_beamService<<endreq; + msg(MSG::ERROR)<<"Unable to retieve "<<m_beamService<<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<< "BeamSpot service retrieved"<<endreq; + }else msg(MSG::INFO)<< "BeamSpot service retrieved"<<endmsg; if(m_vtxSeedFinder.retrieve().isFailure()) { - msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endreq; + msg(MSG::ERROR) << "Unable to retrieve " << m_vtxSeedFinder <<endmsg; return StatusCode::FAILURE; - }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endreq; + }else msg(MSG::INFO)<< "Vertex seed finder retriever" << endmsg; if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } return StatusCode::SUCCESS; }//end of initialize mtehod StatusCode SlidingWindowMultiSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -110,7 +110,7 @@ namespace InDet Trk::RecVertex beamRecVertex(m_beamService->beamVtx()); for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr,&beamRecVertex)) preselectedTracks.push_back(*tr); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamRecVertex.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamRecVertex.position()<<endmsg; Trk::Vertex* beamVertex=&beamRecVertex; @@ -120,7 +120,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamVertex=myVertex; } @@ -146,7 +146,7 @@ namespace InDet if(exPerigee) { lastTrackZ0 = exPerigee->parameters()[Trk::z0]; delete exPerigee; } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; if (m_ignoreBeamSpot) delete beamVertex; return result; } @@ -166,7 +166,7 @@ namespace InDet if(!i) prevTrackZ0 = currentTrackZ0; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endmsg; if((fabs(currentTrackZ0 - lastTrackZ0)>m_clusterLength && fabs(currentTrackZ0 - prevTrackZ0)>m_addingDistance )|| fabs(currentTrackZ0 - prevTrackZ0)>m_breakingDistance) @@ -213,7 +213,7 @@ namespace InDet Trk::RecVertex beamRecVertex(m_beamService->beamVtx()); for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr,&beamRecVertex)) preselectedTracks.push_back(*tr); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamRecVertex.position()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamRecVertex.position()<<endmsg; Trk::Vertex* beamVertex=&beamRecVertex; @@ -232,7 +232,7 @@ namespace InDet if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamVertex=myVertex; } @@ -257,12 +257,12 @@ namespace InDet if(exPerigee) { lastTrackZ0 = exPerigee->parameters()[Trk::z0]; delete exPerigee; } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; if (m_ignoreBeamSpot) delete beamVertex; return result; } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of last track"<< lastTrackZ0<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of last track"<< lastTrackZ0<<endmsg; //looping over sorted container: storing the Z0 of last iteration... @@ -280,7 +280,7 @@ namespace InDet if(!i)prevTrackZ0 = currentTrackZ0; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endmsg; if((fabs(currentTrackZ0 - lastTrackZ0)>m_clusterLength && fabs(currentTrackZ0 - prevTrackZ0)>m_addingDistance )|| fabs(currentTrackZ0 - prevTrackZ0)>m_breakingDistance) { @@ -290,14 +290,14 @@ namespace InDet tmp_cluster.clear(); tmp_cluster.push_back(preselectedTracks[indexOfSorted[i]]); lastTrackZ0 = currentTrackZ0; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Finishing a cluster, starting the new one"<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Finishing a cluster, starting the new one"<<endmsg; }else{ //this track is within the current cluster or the distance to next is too short. Keeping populating it. tmp_cluster.push_back(preselectedTracks[indexOfSorted[i]]); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Pushing a track to a cluster"<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Pushing a track to a cluster"<<endmsg; if(i==indexOfSorted.size()-1 && int(tmp_cluster.size())>m_ignoreLevel) result.push_back(tmp_cluster); @@ -313,7 +313,7 @@ namespace InDet }//end of loop }//end of preselection size check - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Returning number of clusters: "<< result.size()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Returning number of clusters: "<< result.size()<<endmsg; if (m_ignoreBeamSpot) delete beamVertex; return result; @@ -335,7 +335,7 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF beamposition->setPosition(m_beamService->beamVtx().position()); beamposition->setCovariancePosition(m_beamService->beamVtx().covariancePosition()); // for(;tr!=tre;++tr) if(m_trkFilter->decision(**tr, &beamrecposition)) preselectedTracks.push_back(*tr); - // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endreq; + // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Beam spot position is: "<< beamrecposition.position()<<endmsg; //Trk::Vertex* beamposition=&beamrecposition; for (std::vector<const xAOD::TrackParticle*>::const_iterator itr = tracks.begin(); itr != tracks.end(); ++itr) { @@ -360,7 +360,7 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " vtx seed x: " << myVertex->position().x() << " vtx seed y: " << myVertex->position().y() << - " vtx seed z: " << myVertex->position().z() << endreq; + " vtx seed z: " << myVertex->position().z() << endmsg; beamposition->setPosition(myVertex->position()); beamposition->setCovariancePosition(myVertex->covariancePosition()); //hmm, will this leak? I think so. @@ -388,13 +388,13 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF if(exPerigee) { lastTrackZ0 = exPerigee->parameters()[Trk::z0]; delete exPerigee; } else { - msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endreq; + msg(MSG::WARNING)<<"Impossible to extrapolate the first track; returning 0 container for this event"<<endmsg; delete beamposition; delete myVertex; return result; } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of last track"<< lastTrackZ0<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of last track"<< lastTrackZ0<<endmsg; //looping over sorted container: storing the Z0 of last iteration... @@ -412,7 +412,7 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF if(!i)prevTrackZ0 = currentTrackZ0; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Z0 of current track"<< currentTrackZ0<<endmsg; if((fabs(currentTrackZ0 - lastTrackZ0)>m_clusterLength && fabs(currentTrackZ0 - prevTrackZ0)>m_addingDistance )|| fabs(currentTrackZ0 - prevTrackZ0)>m_breakingDistance) { @@ -422,14 +422,14 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF tmp_cluster.clear(); tmp_cluster.push_back(&(preselectedTracks[indexOfSorted[i]]->perigeeParameters())); lastTrackZ0 = currentTrackZ0; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Finishing a cluster, starting the new one"<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Finishing a cluster, starting the new one"<<endmsg; }else{ //this track is within the current cluster or the distance to next is too short. Keeping populating it. tmp_cluster.push_back(&(preselectedTracks[indexOfSorted[i]]->perigeeParameters())); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Pushing a track to a cluster"<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Pushing a track to a cluster"<<endmsg; if(i==indexOfSorted.size()-1 && int(tmp_cluster.size())>m_ignoreLevel) result.push_back(tmp_cluster); @@ -445,7 +445,7 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF }//end of loop }//end of preselection size check - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Returning number of clusters: "<< result.size()<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Returning number of clusters: "<< result.size()<<endmsg; delete beamposition; delete myVertex; return result; @@ -480,7 +480,7 @@ std::vector< std::vector<const Trk::TrackParameters *> > SlidingWindowMultiSeedF perigee =0; }else{ - msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endreq; + msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endmsg; // no_perigee.push_back(j); }//end of perigee existance check ++j; diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx index 8e633e664c2..e9ff208c483 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackClusterCleaningTool.cxx @@ -17,10 +17,10 @@ namespace InDet { if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } return StatusCode::SUCCESS; @@ -28,7 +28,7 @@ namespace InDet StatusCode InDetTrackClusterCleaningTool::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; }//end of finalize method @@ -69,13 +69,13 @@ namespace InDet if(perigee) { z_center += perigee->parameters()[Trk::z0]; - msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endreq; + msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endmsg; ++cluster_size; }else{ - msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endreq; + msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endmsg; }//end of perigee security check }//end of loop definig the center of a cluster - msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endreq; + msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endmsg; if(cluster_size != 0) { z_center = z_center/cluster_size; @@ -108,7 +108,7 @@ namespace InDet else outliers.push_back(*i); }else{ outliers.push_back(*i); - msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endreq; + msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endmsg; }//end of meas perigee protection check }//end of selection loop over all the tracks @@ -131,7 +131,7 @@ namespace InDet unsigned int cluster_size = 0; - msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endreq; + msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endmsg; Trk::PerigeeSurface perigeeSurface(reference->position()); @@ -145,19 +145,19 @@ namespace InDet if(perigee) { z_center += perigee->parameters()[Trk::z0]; - msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endreq; + msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endmsg; ++cluster_size; }else{ - msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endreq; + msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endmsg; }//end of perigee security check }//end of loop definig the center of a cluster - msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endreq; + msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endmsg; if(cluster_size != 0) { z_center = z_center/cluster_size; } - msg(MSG::DEBUG)<<"Looping over the cluster" <<endreq; + msg(MSG::DEBUG)<<"Looping over the cluster" <<endmsg; for(std::vector<const Trk::TrackParticleBase*>::const_iterator i = inb; i != ine; ++i) { @@ -171,10 +171,10 @@ namespace InDet const AmgSymMatrix(5) * cov = measPerigee->covariance(); double sigma_z0 = Amg::error(*cov,Trk::z0); - msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endreq; - msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endreq; - msg(MSG::DEBUG)<<"Offset "<<m_zOffset<<endreq; - msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*m_zOffset <<endreq; + msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endmsg; + msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endmsg; + msg(MSG::DEBUG)<<"Offset "<<m_zOffset<<endmsg; + msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*m_zOffset <<endmsg; //if the track is closer than several standard deviations, keep it if(fabs(z_center-z0)< sigma_z0*m_zOffset) clusterSeed.push_back(*i); @@ -183,7 +183,7 @@ namespace InDet else outliers.push_back(*i); }else{ outliers.push_back(*i); - msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endreq; + msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endmsg; }//end of measured perigee check }//end of separation loop @@ -205,7 +205,7 @@ namespace InDet unsigned int cluster_size = 0; - msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endreq; + msg(MSG::DEBUG)<<"Receiving a cluster of size: "<< cluster.size()<<endmsg; Trk::PerigeeSurface perigeeSurface(reference->position()); @@ -219,19 +219,19 @@ namespace InDet if(perigee) { z_center += perigee->parameters()[Trk::z0]; - msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endreq; + msg(MSG::DEBUG)<<"Adding parameters: "<<perigee->parameters()[Trk::z0] <<endmsg; ++cluster_size; }else{ - msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endreq; + msg(MSG::WARNING)<<" The TrackParticleBase provided does not contain perigee parameters"<<endmsg; }//end of perigee security check }//end of loop definig the center of a cluster - msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endreq; + msg(MSG::DEBUG)<<"Z center is: "<<z_center<<" for tracks: "<<cluster_size<<endmsg; if(cluster_size != 0) { z_center = z_center/cluster_size; } - msg(MSG::DEBUG)<<"Looping over the cluster" <<endreq; + msg(MSG::DEBUG)<<"Looping over the cluster" <<endmsg; for(std::vector<const xAOD::TrackParticle*>::const_iterator i = inb; i != ine; ++i) { @@ -244,10 +244,10 @@ namespace InDet const AmgSymMatrix(5) * cov = measPerigee->covariance(); double sigma_z0 = Amg::error(*cov,Trk::z0); - msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endreq; - msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endreq; - msg(MSG::DEBUG)<<"Offset "<<3.0<<endreq; - msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endreq; + msg(MSG::DEBUG)<<"Perigee Z0 and corresponding sigma "<<z0<<" "<<sigma_z0<<endmsg; + msg(MSG::DEBUG)<<"Center of the cluster "<<z_center<<endmsg; + msg(MSG::DEBUG)<<"Offset "<<3.0<<endmsg; + msg(MSG::DEBUG)<<"discriminant "<<fabs(z_center-z0)<<" "<< sigma_z0*3.0 <<endmsg; //if the track is closer than several standard deviations, keep it if(fabs(z_center-z0)< sigma_z0*3.0) clusterSeed.push_back(&((*i)->perigeeParameters())); @@ -256,7 +256,7 @@ namespace InDet else outliers.push_back(*i); }else{ outliers.push_back(*i); - msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endreq; + msg(MSG::WARNING) << "This track has no meas perigee. Regarded as outlyer" << endmsg; }//end of measured perigee check }//end of separation loop diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx index 521487cf707..286beb825ed 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/InDetTrackZ0SortingTool.cxx @@ -16,10 +16,10 @@ namespace InDet { if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } return StatusCode::SUCCESS; @@ -28,7 +28,7 @@ namespace InDet StatusCode InDetTrackZ0SortingTool::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; }//end of finalize method @@ -79,7 +79,7 @@ namespace InDet delete perigee; perigee=0; } - }else msg(MSG::WARNING)<<"This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector"<<endreq; + }else msg(MSG::WARNING)<<"This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector"<<endmsg; ++j; }//end of loop over all the tracks @@ -127,7 +127,7 @@ namespace InDet } }else{ - msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endreq; + msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endmsg; // no_perigee.push_back(j); }//end of perigee existance check ++j; @@ -176,7 +176,7 @@ namespace InDet perigee =0; }else{ - msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endreq; + msg(MSG::WARNING) << "This track particle has no perigee state. Not egligible for sorting. Will NOT be written to the sorted vector" << endmsg; // no_perigee.push_back(j); }//end of perigee existance check ++j; diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx index c6a54ac4fb5..2be96486d9f 100644 --- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx +++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx @@ -14,22 +14,22 @@ namespace Trk StatusCode sc = AlgTool::initialize(); if(sc.isFailure()) { - log<<MSG::ERROR<<" Unable to initialize the AlgTool"<<endreq; + log<<MSG::ERROR<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } if(m_trackSumTool.retrieve().isFailure()) { - log<<MSG::ERROR<<" Unable to retrieve "<<m_trackSumTool<<endreq; + log<<MSG::ERROR<<" Unable to retrieve "<<m_trackSumTool<<endmsg; return StatusCode::FAILURE; - }else log<<MSG::INFO<<"Track summary tool retrieved"<<endreq; + }else log<<MSG::INFO<<"Track summary tool retrieved"<<endmsg; return StatusCode::SUCCESS; }//end of initialize method StatusCode PVFindingTrackFilter::finalize() { MsgStream log(msgSvc(), name()); - log << MSG::INFO << "Finalize successful" << endreq; + log << MSG::INFO << "Finalize successful" << endmsg; return StatusCode::SUCCESS; }//end of finalize method @@ -62,7 +62,7 @@ namespace Trk if(0==track) { MsgStream log(msgSvc(),name()); - log << MSG::INFO << "Track preselection: Zero track pointer received. This track will not pass." << endreq; + log << MSG::INFO << "Track preselection: Zero track pointer received. This track will not pass." << endmsg; return false; } //getting the perigee parameters of the track @@ -70,7 +70,7 @@ namespace Trk if(0 == perigee) { MsgStream log(msgSvc(),name()); - log << MSG::INFO << "Track preselection: cannot make a measured perigee. This track will not pass." << endreq; + log << MSG::INFO << "Track preselection: cannot make a measured perigee. This track will not pass." << endmsg; return false; } @@ -100,7 +100,7 @@ namespace Trk if (0==summary ) { MsgStream log(msgSvc(),name()); - log << MSG::INFO << "Track preselection: cannot create a track summary. This track will not pass." << endreq; + log << MSG::INFO << "Track preselection: cannot create a track summary. This track will not pass." << endmsg; return false; } diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx index a85736bd388..42596b217a9 100644 --- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx +++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx @@ -526,7 +526,7 @@ namespace InDet if (m_linearizedTrackFactoryIsAvailable==false) { - msg(MSG::ERROR) << "Cannot perform requested extrapolation. No extrapolator defined...Returning 0 compatibility..." << endreq; + msg(MSG::ERROR) << "Cannot perform requested extrapolation. No extrapolator defined...Returning 0 compatibility..." << endmsg; return std::pair<double,double>(0,0); } diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx index af5c2c337a7..5fd8ae12744 100644 --- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx @@ -62,60 +62,60 @@ namespace InDet { // retrieve ID helpers: if (detStore()->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endreq; + msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endmsg; return StatusCode::FAILURE; } sc = detStore()->retrieve(m_pixelId, "PixelID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get PixelID helper !" << endreq; + msg(MSG::ERROR) << "Could not get PixelID helper !" << endmsg; return StatusCode::FAILURE; } m_configured=true; if( m_extrapolator.empty() ){ - msg(MSG::INFO) << "Extrapolator not configured " << endreq; //n + msg(MSG::INFO) << "Extrapolator not configured " << endmsg; //n m_configured=false; } else{ if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; //n + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; //n return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; //n + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; //n } } // Get PixelConditionsSummarySvc if( m_pixelCondSummarySvc.empty() ){ - msg(MSG::INFO) << "PixelConditionsSummarySvc not configured " << endreq; //n + msg(MSG::INFO) << "PixelConditionsSummarySvc not configured " << endmsg; //n m_configured=false; } else{ if ( m_pixelCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endreq; //n + msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg; //n return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endreq; //n + msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endmsg; //n } } if(!m_configured){ - msg(MSG::INFO) << "you are using an unconfigured tool" << endreq; - msg(MSG::INFO) << "will not be able to extrapolate to the blayer" << endreq; - msg(MSG::INFO) << "the values from the track summary will be returned" << endreq; + msg(MSG::INFO) << "you are using an unconfigured tool" << endmsg; + msg(MSG::INFO) << "will not be able to extrapolate to the blayer" << endmsg; + msg(MSG::INFO) << "the values from the track summary will be returned" << endmsg; } if (m_residualPullCalculator.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_residualPullCalculator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_residualPullCalculator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endmsg; } - msg(MSG::VERBOSE) << " Initialization of InDetTestBLayerTool succesfull" << endreq; + msg(MSG::VERBOSE) << " Initialization of InDetTestBLayerTool succesfull" << endmsg; return StatusCode::SUCCESS; } @@ -130,7 +130,7 @@ namespace InDet { const Trk::Track* track = trackparticle->originalTrack(); if (!track) { - msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endreq; + msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endmsg; return 0; } @@ -144,7 +144,7 @@ namespace InDet { const Trk::Track* track = trackparticle->originalTrack(); if (!track) { - msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endreq; + msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endmsg; return 0; } @@ -158,7 +158,7 @@ namespace InDet { const Trk::Track* track = trackparticle->originalTrack(); if (!track) { - msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endreq; + msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endmsg; return 0; } @@ -183,7 +183,7 @@ namespace InDet { it!=trackStates->end(); it++) { if (!(*it)) { - msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endreq; + msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endmsg; continue; } @@ -212,7 +212,7 @@ namespace InDet { { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "Found Innermost Pixel Layer " << id.get_compact() << endreq; + msg(MSG::DEBUG) << "Found Innermost Pixel Layer " << id.get_compact() << endmsg; } return m_residualPullCalculator->residualPull(measurement,(*it)->trackParameters(),Trk::ResidualPull::Biased); @@ -237,7 +237,7 @@ namespace InDet { it!=trackStates->end(); it++) { if (!(*it)) { - msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endreq; + msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endmsg; continue; } @@ -266,7 +266,7 @@ namespace InDet { { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "Found Next To Innermost Pixel Layer " << id.get_compact() << endreq; + msg(MSG::DEBUG) << "Found Next To Innermost Pixel Layer " << id.get_compact() << endmsg; } return m_residualPullCalculator->residualPull(measurement,(*it)->trackParameters(),Trk::ResidualPull::Biased); @@ -720,13 +720,13 @@ namespace InDet { if( siElement->nearBondGap(trackpar->localPosition(), etatol) ) { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "---> extrapolation on bond gap within " << etatol << ", return" << endreq; + msg(MSG::DEBUG) << "---> extrapolation on bond gap within " << etatol << ", return" << endmsg; } } else if (!siIn.in()) { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "---> extrapolation not inside (active?) detector within "<< phitol << " " << - etatol << ", return" << endreq; + etatol << ", return" << endmsg; } } else { return true; diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx index 1e891406f01..440e6f74589 100644 --- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx @@ -62,60 +62,60 @@ namespace InDet { // retrieve ID helpers: if (detStore()->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endreq; + msg(MSG::FATAL) << "Could not get AtlasDetectorID helper" << endmsg; return StatusCode::FAILURE; } sc = detStore()->retrieve(m_pixelId, "PixelID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get PixelID helper !" << endreq; + msg(MSG::ERROR) << "Could not get PixelID helper !" << endmsg; return StatusCode::FAILURE; } m_configured=true; if( m_extrapolator.empty() ){ - msg(MSG::INFO) << "Extrapolator not configured " << endreq; //n + msg(MSG::INFO) << "Extrapolator not configured " << endmsg; //n m_configured=false; } else{ if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; //n + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; //n return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; //n + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; //n } } // Get PixelConditionsSummarySvc if( m_pixelCondSummarySvc.empty() ){ - msg(MSG::INFO) << "PixelConditionsSummarySvc not configured " << endreq; //n + msg(MSG::INFO) << "PixelConditionsSummarySvc not configured " << endmsg; //n m_configured=false; } else{ if ( m_pixelCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endreq; //n + msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg; //n return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endreq; //n + msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endmsg; //n } } if(!m_configured){ - msg(MSG::INFO) << "you are using an unconfigured tool" << endreq; - msg(MSG::INFO) << "will not be able to extrapolate to the pixelLayer" << endreq; - msg(MSG::INFO) << "the values from the track summary will be returned" << endreq; + msg(MSG::INFO) << "you are using an unconfigured tool" << endmsg; + msg(MSG::INFO) << "will not be able to extrapolate to the pixelLayer" << endmsg; + msg(MSG::INFO) << "the values from the track summary will be returned" << endmsg; } if (m_residualPullCalculator.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_residualPullCalculator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_residualPullCalculator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_residualPullCalculator << endmsg; } - msg(MSG::VERBOSE) << " Initialization of InDetTestPixelLayerTool succesfull" << endreq; + msg(MSG::VERBOSE) << " Initialization of InDetTestPixelLayerTool succesfull" << endmsg; return StatusCode::SUCCESS; } @@ -145,7 +145,7 @@ namespace InDet { const Trk::Track* track = trackparticle->originalTrack(); if (!track) { - msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endreq; + msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endmsg; return 0; } @@ -159,7 +159,7 @@ namespace InDet { const Trk::Track* track = trackparticle->originalTrack(); if (!track) { - msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endreq; + msg(MSG::DEBUG) << "No original track, residual calculation can not be performed" << endmsg; return; } @@ -179,7 +179,7 @@ namespace InDet { it!=trackStates->end(); it++) { if (!(*it)) { - msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endreq; + msg(MSG::WARNING) << "TrackStateOnSurface == Null" << endmsg; continue; } @@ -557,13 +557,13 @@ namespace InDet { if( siElement->nearBondGap(trackpar->localPosition(), etatol) ) { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "---> extrapolation on bond gap within " << etatol << ", return" << endreq; + msg(MSG::DEBUG) << "---> extrapolation on bond gap within " << etatol << ", return" << endmsg; } } else if (!siIn.in()) { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "---> extrapolation not inside (active?) detector within "<< phitol << " " << - etatol << ", return" << endreq; + etatol << ", return" << endmsg; } } else { return true; diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx index 33b07500ea0..26390e08f75 100644 --- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx @@ -72,32 +72,32 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize() sc = detStore()->retrieve(m_atlasId, "AtlasID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get AtlasID helper !" << endreq; + msg(MSG::ERROR) << "Could not get AtlasID helper !" << endmsg; return StatusCode::FAILURE; } // Get TrkExtrapolator from ToolService if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } if (m_usepix) { // Get PixelConditionsSummarySvc if ( m_pixelCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endmsg; } // Get InDetPixelLayerTool from ToolService if ( m_pixelLayerTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelLayerTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelLayerTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_pixelLayerTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_pixelLayerTool << endmsg; } } @@ -105,17 +105,17 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize() if (m_usesct) { // Get SctConditionsSummarySvc if ( m_sctCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_sctCondSummarySvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_sctCondSummarySvc << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_sctCondSummarySvc << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_sctCondSummarySvc << endmsg; } } if (m_extendedListOfHoles) - msg(MSG::INFO) << "Search for extended list of holes " << endreq; + msg(MSG::INFO) << "Search for extended list of holes " << endmsg; - msg(MSG::INFO) << "initialize() successful in " << name() << endreq; + msg(MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -284,9 +284,9 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track , ++imeas; if (!(*iterTSOS)->trackParameters() && m_warning<10) { m_warning++; - msg(MSG::WARNING) << "No track parameters available for state of type measurement" << endreq; - msg(MSG::WARNING) << "Don't run this tool on slimmed tracks!" << endreq; - if (m_warning==10) msg(MSG::WARNING) << "(last message!)" << endreq; + msg(MSG::WARNING) << "No track parameters available for state of type measurement" << endmsg; + msg(MSG::WARNING) << "Don't run this tool on slimmed tracks!" << endmsg; + if (m_warning==10) msg(MSG::WARNING) << "(last message!)" << endmsg; } } // for cosmics: remember parameters of first SI TSOS @@ -524,20 +524,20 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track , { if (!foundFirst && !(*iterTSOS)->type(Trk::TrackStateOnSurface::Outlier)) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Found first Si measurement !" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Found first Si measurement !" << endmsg; foundFirst = true; } // is this a surface which might have a better prediction ? if (iTSOS->second->trackParameters()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Found track parameter on Si surface, take it" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Found track parameter on Si surface, take it" << endmsg; delete startParameters; startParameters = iTSOS->second->trackParameters()->clone(); } else { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No parameter, take extrapolation" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No parameter, take extrapolation" << endmsg; delete startParameters; startParameters = thisParameters->clone(); } @@ -547,10 +547,10 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track , const Trk::TrackParameters *clonepar=thisParameters->clone(); std::pair<const Trk::TrackParameters*,const bool> trackparampair (clonepar,true); if (mapOfPredictions.insert(std::pair<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >(id2,trackparampair)).second){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Added Si surface to mapOfPredictions" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Added Si surface to mapOfPredictions" << endmsg; } else { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Had this, it is a double, skipped" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Had this, it is a double, skipped" << endmsg; delete clonepar; } } @@ -565,7 +565,7 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track , if ( !(m_atlasId->is_pixel(id) || m_atlasId->is_sct(id)) ) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Target was no longer an Si element, break loop" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Target was no longer an Si element, break loop" << endmsg; break; } @@ -799,7 +799,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I else if (iter->second->type(Trk::TrackStateOnSurface::Measurement)) ++imeasurements; else - msg(MSG::ERROR) << "Found wrong TSOS in map !!!" << endreq; + msg(MSG::ERROR) << "Found wrong TSOS in map !!!" << endmsg; } if ( imeasurements > 0 ) { @@ -924,7 +924,7 @@ bool InDet::InDetTrackHoleSearchTool::isSensitive(const Trk::TrackParameters* pa } } } else { - msg(MSG::WARNING) << "unknown identifier type, this should not happen !" << endreq; + msg(MSG::WARNING) << "unknown identifier type, this should not happen !" << endmsg; return false; } // the extrapolation of the track plus its error might not @@ -987,7 +987,7 @@ const Trk::Track* InDet::InDetTrackHoleSearchTool::addHolesToTrack(const Trk::T DataVector doesn't have stable sort, so we need to tamper with its vector content in order to avoid sort to get caught in DV full object ownership */ - if (msgLvl(MSG::DEBUG)) msg() << "sorting vector with stable_sort "<<endreq; + if (msgLvl(MSG::DEBUG)) msg() << "sorting vector with stable_sort "<<endmsg; std::vector<const Trk::TrackStateOnSurface*>* PtrVector = const_cast<std::vector<const Trk::TrackStateOnSurface*>* > (&trackTSOS->stdcont()); stable_sort( PtrVector->begin(), PtrVector->end(), *CompFunc ); diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetConversionTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetConversionTrackSelectorTool.cxx index 7a573e37c24..996861d969a 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetConversionTrackSelectorTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetConversionTrackSelectorTool.cxx @@ -70,30 +70,30 @@ namespace InDet { StatusCode sc = AthAlgTool::initialize(); if(sc.isFailure()){ - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } /* Get the track summary tool from ToolSvc */ if ( m_trkSumTool.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_trkSumTool << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_trkSumTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_trkSumTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_trkSumTool << endmsg; } /* Get the extrapolator tool from ToolSvc */ if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } /* Get BeamCondSvc */ sc = m_iBeamCondSvc.retrieve(); if (sc.isFailure()) { - msg(MSG::INFO) << "Could not find BeamCondSvc. Will use (0,0,0) if no vertex is given and extrapolation is needed." << endreq; + msg(MSG::INFO) << "Could not find BeamCondSvc. Will use (0,0,0) if no vertex is given and extrapolation is needed." << endmsg; } return StatusCode::SUCCESS; @@ -101,7 +101,7 @@ namespace InDet StatusCode InDetConversionTrackSelectorTool::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -116,7 +116,7 @@ namespace InDet if (!m_iBeamCondSvc.empty()) { myVertex=new Trk::RecVertex(m_iBeamCondSvc->beamVtx()); } else { - msg(MSG::WARNING) << " Cannot get beamSpot center from iBeamCondSvc. Using (0,0,0)... " << endreq; + msg(MSG::WARNING) << " Cannot get beamSpot center from iBeamCondSvc. Using (0,0,0)... " << endmsg; myVertex=new Trk::Vertex(Amg::Vector3D(0,0,0)); } } @@ -134,7 +134,7 @@ namespace InDet //no track selection if firstmeas + perigee does not exist ! firstmeaspar=track.perigeeParameters(); if (!firstmeaspar){ - msg(MSG::WARNING) << " First measurment on track is missing. Using perigee Parameters, but they are missing: 0 pointer! Track selection failed " << endreq; + msg(MSG::WARNING) << " First measurment on track is missing. Using perigee Parameters, but they are missing: 0 pointer! Track selection failed " << endmsg; //clean up vertex if (myVertex!=vx) { delete myVertex; @@ -148,9 +148,9 @@ namespace InDet // const Trk::TrackParameters * extrapolatedParameters= firstmeaspar ? m_extrapolator->extrapolate(*firstmeaspar,perigeeSurface,Trk::anyDirection,true,track.info().particleHypothesis() ) : 0; perigee = extrapolatedParameters ? dynamic_cast<const Trk::Perigee*>(extrapolatedParameters) : 0; if (perigee==0 || !perigee->covariance() ) { - msg(MSG::WARNING) << "Track Selector failed to extrapolate track to the vertex: " << myVertex->position() << endreq; + msg(MSG::WARNING) << "Track Selector failed to extrapolate track to the vertex: " << myVertex->position() << endmsg; if (extrapolatedParameters!=0) { - msg(MSG::WARNING) << "The return object of the extrapolator was not a perigee even if a perigeeSurface was used!" << endreq; + msg(MSG::WARNING) << "The return object of the extrapolator was not a perigee even if a perigeeSurface was used!" << endmsg; delete extrapolatedParameters; if (myVertex!=vx) delete myVertex; return false; @@ -228,7 +228,7 @@ namespace InDet if (!m_iBeamCondSvc.empty()) { myVertex=new Trk::RecVertex(m_iBeamCondSvc->beamVtx()); } else { - msg(MSG::WARNING) << " Cannot get beamSpot center from iBeamCondSvc. Using (0,0,0)... " << endreq; + msg(MSG::WARNING) << " Cannot get beamSpot center from iBeamCondSvc. Using (0,0,0)... " << endmsg; myVertex=new Trk::Vertex(Amg::Vector3D(0,0,0)); } } @@ -246,7 +246,7 @@ namespace InDet //using perigee instead of firstmeasurement, since first measurement was not found... firstmeaspar=&(track.definingParameters()); if (!firstmeaspar){ - msg(MSG::DEBUG) << " Track Paraemters at first measurement not found. Perigee not found. Cannot do TrackSelection..." << endreq; + msg(MSG::DEBUG) << " Track Paraemters at first measurement not found. Perigee not found. Cannot do TrackSelection..." << endmsg; if (myVertex!=vx) { delete myVertex; myVertex=0; @@ -259,9 +259,9 @@ namespace InDet //const Trk::TrackParameters * extrapolatedParameters= firstmeaspar ? m_extrapolator->extrapolate(*firstmeaspar,perigeeSurface,Trk::anyDirection,true,Trk::pion ) : 0; perigee = extrapolatedParameters ? dynamic_cast<const Trk::Perigee*>(extrapolatedParameters) : 0; if (perigee==0 || !perigee->covariance()) { - msg(MSG::WARNING) << "Track Selector failed to extrapolate track to the vertex: " << myVertex->position() << endreq; + msg(MSG::WARNING) << "Track Selector failed to extrapolate track to the vertex: " << myVertex->position() << endmsg; if (extrapolatedParameters!=0) { - msg(MSG::WARNING) << "The return object of the extrapolator was not a perigee even if a perigeeSurface was used!" << endreq; + msg(MSG::WARNING) << "The return object of the extrapolator was not a perigee even if a perigeeSurface was used!" << endmsg; delete extrapolatedParameters; if (myVertex!=vx) delete myVertex; return false; diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx index b9cd19fe987..5e58cfafe7b 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetCosmicTrackSelectorTool.cxx @@ -48,7 +48,7 @@ namespace InDet StatusCode InDetCosmicTrackSelectorTool::initialize() { if(AthAlgTool::initialize().isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } @@ -56,7 +56,7 @@ namespace InDet if (!m_trackSumTool.empty()) { if(m_trackSumTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_trackSumTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_trackSumTool<<endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Track summary tool retrieved"); @@ -64,7 +64,7 @@ namespace InDet } if (m_magFieldSvc.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_magFieldSvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_magFieldSvc << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool "<<m_magFieldSvc); diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx index 423cd5b2460..89ccd5229aa 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx @@ -143,7 +143,7 @@ namespace InDet StatusCode sc = AthAlgTool::initialize(); if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } @@ -152,18 +152,18 @@ namespace InDet { if(m_trackSumTool.retrieve().isFailure()) { - msg(MSG::INFO)<<" Unable to retrieve. OK if running on AOD. "<<m_trackSumTool<<endreq; + msg(MSG::INFO)<<" Unable to retrieve. OK if running on AOD. "<<m_trackSumTool<<endmsg; } else { - msg(MSG::INFO)<<"Track summary tool retrieved"<<endreq; + msg(MSG::INFO)<<"Track summary tool retrieved"<<endmsg; m_trackSumToolAvailable=true; } } if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool " << m_extrapolator); @@ -175,11 +175,11 @@ namespace InDet if (m_useEtaDepententMinHitTrt || m_useEtaDepententMinHitTrtWithOutliers) { if(m_trtDCTool.empty()) { - msg(MSG::ERROR)<<" Eta delendent cut on number of TRT hits requested but TrtDCCutTool not specified. "<<endreq; + msg(MSG::ERROR)<<" Eta delendent cut on number of TRT hits requested but TrtDCCutTool not specified. "<<endmsg; return StatusCode::FAILURE; } else if(m_trtDCTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve tool "<<m_trtDCTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve tool "<<m_trtDCTool<<endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool "<<m_trtDCTool); @@ -192,18 +192,18 @@ namespace InDet if (m_magFieldSvc.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_magFieldSvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_magFieldSvc << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool "<<m_magFieldSvc); if(m_inDetTestBLayerTool.empty()) { - msg(MSG::INFO)<<" The BLayerTool not specified, turning off cut. "<<endreq; + msg(MSG::INFO)<<" The BLayerTool not specified, turning off cut. "<<endmsg; } else if ( m_inDetTestBLayerTool.retrieve().isFailure() ) { - msg(MSG::ERROR)<< "Failed to retrieve tool " << m_inDetTestBLayerTool<<endreq; + msg(MSG::ERROR)<< "Failed to retrieve tool " << m_inDetTestBLayerTool<<endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Using cuts on the number of Silicon hits"); @@ -213,11 +213,11 @@ namespace InDet //checking whether sizes of cuts and pt interval expressed in vectors match if( m_ptBenchmarks.size() != m_nSCTValues.size()) { - msg(MSG::ERROR)<< "Number of cuts DOES NOT match the number of intervals to apply. Please check jobOptions. "<<endreq; + msg(MSG::ERROR)<< "Number of cuts DOES NOT match the number of intervals to apply. Please check jobOptions. "<<endmsg; return StatusCode::FAILURE; } else if (m_ptBenchmarks.size() == 0) { - msg(MSG::ERROR)<< "Zero vectors for number of cuts and pt intervals. Please check jobOptions. "<<endreq; + msg(MSG::ERROR)<< "Zero vectors for number of cuts and pt intervals. Please check jobOptions. "<<endmsg; return StatusCode::FAILURE; }//end of vector size protection block }//end of memory protection @@ -228,7 +228,7 @@ namespace InDet // --------------------------------------------------------------------- StatusCode InDetDetailedTrackSelectorTool::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx index e4811046328..8d04bf92252 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx @@ -51,7 +51,7 @@ StatusCode InDetTrackSelectorTool::initialize() { StatusCode sc = AthAlgTool::initialize(); if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } @@ -59,7 +59,7 @@ StatusCode InDetTrackSelectorTool::initialize() if (!m_trackSumTool.empty()) { if(m_trackSumTool.retrieve().isFailure()) { - msg(MSG::ERROR)<<" Unable to retrieve "<<m_trackSumTool<<endreq; + msg(MSG::ERROR)<<" Unable to retrieve "<<m_trackSumTool<<endmsg; return StatusCode::FAILURE; } else { @@ -69,7 +69,7 @@ StatusCode InDetTrackSelectorTool::initialize() } if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } ATH_MSG_INFO("Retrieved tool " << m_extrapolator); diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx index 87cb4913023..b4fee43dc18 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx @@ -12,15 +12,15 @@ StatusCode InDet::InDetTrtDriftCircleCutTool::initialize() /* Get the trt active fraction tool */ if(m_useTRT){ if ( m_trtCondSvc.retrieve().isFailure() ) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_trtCondSvc << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_trtCondSvc << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_trtCondSvc << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_trtCondSvc << endmsg; } } if(sc.isFailure()){ - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } @@ -29,7 +29,7 @@ StatusCode InDet::InDetTrtDriftCircleCutTool::initialize() StatusCode InDet::InDetTrtDriftCircleCutTool::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx index 90249bea0bf..16b4efd8c3e 100755 --- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx @@ -110,7 +110,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, InDetVKalPriVxFinderTool::~InDetVKalPriVxFinderTool() { //MsgStream log( msgSvc(), name() ) ; //m_sc.isSuccess(); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< "InDetVKalPriVxFinderTool destructor called" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< "InDetVKalPriVxFinderTool destructor called" << endmsg; } @@ -118,24 +118,24 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, //__________________________________________________________________________ StatusCode InDetVKalPriVxFinderTool::initialize() { - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"InDetVKalVrtPriVxTool initialize()" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"InDetVKalVrtPriVxTool initialize()" << endmsg; m_SummaryToolExist = 0; // --------------- /* Tool Service initialisation. NOT NEEDED now*/ // IToolSvc* toolSvc; // StatusCode sc = service("ToolSvc", toolSvc); // if (sc.isFailure()) { -// if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Could not find ToolSvc" << endreq; +// if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Could not find ToolSvc" << endmsg; // return StatusCode::SUCCESS; // } //TrkVKalVrtFitter // sc = toolSvc->retrieveTool("TrkVKalVrtFitter",m_fitSvc,this); // if (sc.isFailure()) { -// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " No VKalVrtFitSvc for InDetVKalPriVxFinderTool !" << endreq; +// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " No VKalVrtFitSvc for InDetVKalPriVxFinderTool !" << endmsg; // return StatusCode::SUCCESS; // } -// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "VKalVrtPromCpp's VKalVrtFitSvc found" << endreq; +// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "VKalVrtPromCpp's VKalVrtFitSvc found" << endmsg; //----------------------------------------------------------------------------------------- // // Temporary to use old VKalVrt interface @@ -143,21 +143,21 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, // Trk::IVertexFitter * tmp; // sc = toolSvc->retrieveTool("Trk::TrkVKalVrtFitter",tmp,this); // if (sc.isFailure()) { -// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " No Trk::TrkVKalVrtFitter for InDetVKalPriVxFinderTool !" << endreq; +// if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " No Trk::TrkVKalVrtFitter for InDetVKalPriVxFinderTool !" << endmsg; // }else{ // m_fitSvc = dynamic_cast<Trk::TrkVKalVrtFitter*>(tmp); -// if(!m_fitSvc && msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" No Trk::TrkVKalVrtFitter" << endreq; +// if(!m_fitSvc && msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" No Trk::TrkVKalVrtFitter" << endmsg; // } if (m_fitSvc.retrieve().isFailure()) { - if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "No Trk::TrkVKalVrtFitter for InDetVKalPriVxFinderTool !" << endreq; + if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "No Trk::TrkVKalVrtFitter for InDetVKalPriVxFinderTool !" << endmsg; }else{ - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::TrkVKalVrtFitter found" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::TrkVKalVrtFitter found" << endmsg; } // //TrackSummaryTool // if (m_sumSvc.retrieve().isFailure()) { - if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Could not find TrackSummaryTool" << endreq; + if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Could not find TrackSummaryTool" << endmsg; } else { m_SummaryToolExist = 1;} // // Data for beam spot constraint @@ -173,7 +173,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, if(m_BeamConstraint){ //StatusCode sc = service("BeamCondSvc", m_iBeamCondSvc); if (m_iBeamCondSvc.retrieve().isFailure() ) - { if(msgLvl(MSG::INFO))msg(MSG::INFO) << "Could not find BeamCondSvc." << endreq; + { if(msgLvl(MSG::INFO))msg(MSG::INFO) << "Could not find BeamCondSvc." << endmsg; m_BeamCondSvcExist=0; }else{ m_BeamCondSvcExist=1; @@ -184,14 +184,14 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, // if (m_trkSelector.name() == "DefaultTrackSelection" ){ m_trkSelectorExist=0; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Use internal track selection - see default/jobO cuts" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Use internal track selection - see default/jobO cuts" << endmsg; }else{ if (m_trkSelector.retrieve().isFailure()) { - if(msgLvl(MSG::ERROR)){ msg(MSG::ERROR) << "Could not find TrackSelectorTool" << endreq; - msg(MSG::ERROR) << "Use internal track selection - see default/jobO cuts" << endreq;} + if(msgLvl(MSG::ERROR)){ msg(MSG::ERROR) << "Could not find TrackSelectorTool" << endmsg; + msg(MSG::ERROR) << "Use internal track selection - see default/jobO cuts" << endmsg;} m_trkSelectorExist=0; }else{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Finder uses TrackSelectorTool" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Finder uses TrackSelectorTool" << endmsg; m_trkSelectorExist=1; } } @@ -206,7 +206,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, StatusCode InDetVKalPriVxFinderTool::finalize() { - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) <<"InDetVKalPriVxFinderTool finalize()" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) <<"InDetVKalPriVxFinderTool finalize()" << endmsg; return StatusCode::SUCCESS; } @@ -216,8 +216,8 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetVKalPriVxFinderTool::findVertex(const xAOD::TrackParticleContainer* trackTES) { if(msgLvl(MSG::DEBUG)){ - msg(MSG::DEBUG) << "N="<<trackTES->size()<<" xAOD::TrackParticles found" << endreq; - msg(MSG::DEBUG) << "No InDetVKalPriVxFinderTool implementation for xAOD::TrackParticle" << endreq; + msg(MSG::DEBUG) << "N="<<trackTES->size()<<" xAOD::TrackParticles found" << endmsg; + msg(MSG::DEBUG) << "No InDetVKalPriVxFinderTool implementation for xAOD::TrackParticle" << endmsg; } return std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> (0,0); } @@ -229,7 +229,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, { //............................................. - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary vertex with InDetVKalPriVxFinderTool starts" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary vertex with InDetVKalPriVxFinderTool starts" << endmsg; // // savedTrkFittedPerigees.clear(); @@ -271,8 +271,8 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, m_BeamCnstWid[0]=m_iBeamCondSvc->beamSigma(0); m_BeamCnstWid[1]=m_iBeamCondSvc->beamSigma(1); if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "BeamSpot from SVC="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<< - ", "<<m_BeamCnst[2]<<" wid="<<m_BeamCnstWid[0]<<", "<<m_BeamCnstWid[1]<<endreq; - if(msgLvl(MSG::DEBUG) && m_BeamCnst[2]!=0.)msg(MSG::DEBUG) << "BeamSpot Z must be 0 in finder!!! Make Z=0."<<endreq; + ", "<<m_BeamCnst[2]<<" wid="<<m_BeamCnstWid[0]<<", "<<m_BeamCnstWid[1]<<endmsg; + if(msgLvl(MSG::DEBUG) && m_BeamCnst[2]!=0.)msg(MSG::DEBUG) << "BeamSpot Z must be 0 in finder!!! Make Z=0."<<endmsg; m_BeamCnst[2]=0.; } }else{ @@ -280,17 +280,17 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, m_BeamCnst[0]=approx_beam.x(); m_BeamCnst[1]=approx_beam.y(); m_BeamCnst[2]=0.; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Approx. BeamSpot="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Approx. BeamSpot="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<<endmsg; } Trk::Vertex selectionVertex(m_BeamCnst); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::Track number=" <<newTrkCol->size()<< endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::Track number=" <<newTrkCol->size()<< endmsg; DataVector<Trk::Track>::const_iterator i_ntrk; for (i_ntrk = newTrkCol->begin(); i_ntrk < newTrkCol->end(); ++i_ntrk) { TrkQual = (*i_ntrk)->fitQuality(); m_mPer=GetPerigee( (*i_ntrk) ) ; if( m_mPer == NULL ){ - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) <<" Error!!! No Perigee in TrackParameters"<< endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) <<" Error!!! No Perigee in TrackParameters"<< endmsg; continue; } VectPerig = m_mPer->parameters(); @@ -325,7 +325,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, } SelectedTrkTracks.push_back(*i_ntrk); } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found="<<SelectedTrkTracks.size()<<" tracks" <<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found="<<SelectedTrkTracks.size()<<" tracks" <<endmsg; if(SelectedTrkTracks.size()<2){ SelectedTrkTracks.clear(); for (i_ntrk = newTrkCol->begin(); i_ntrk < newTrkCol->end(); ++i_ntrk) { @@ -361,7 +361,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, // } SelectedTrkTracks.push_back(*i_ntrk); } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found relaxed="<<SelectedTrkTracks.size()<<" tracks" <<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found relaxed="<<SelectedTrkTracks.size()<<" tracks" <<endmsg; } /* And now primary vertex search itself*/ // @@ -383,10 +383,10 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, //-------------------------------------------------------------------- if( NFoundVrt == 0){ - if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Primary vertex not found" <<endreq; + if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Primary vertex not found" <<endmsg; }else{ if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"VKalVrtCpp Primary Vertex=" << PrimVrtList[0].x()<<", "<< - PrimVrtList[0].y()<<", "<<PrimVrtList[0].z()<< endreq; + PrimVrtList[0].y()<<", "<<PrimVrtList[0].z()<< endmsg; } //------------------------------------------------------------------------------- // @@ -411,7 +411,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, { //............................................. - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary vertex with InDetVKalPriVxFinderTool starts" << endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary vertex with InDetVKalPriVxFinderTool starts" << endmsg; // // savedTrkFittedPerigees.clear(); @@ -448,18 +448,18 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, m_BeamCnstWid[0]=m_iBeamCondSvc->beamSigma(0); m_BeamCnstWid[1]=m_iBeamCondSvc->beamSigma(1); if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "BeamSpot from SVC="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<< - ", "<<m_BeamCnst[2]<<" wid="<<m_BeamCnstWid[0]<<", "<<m_BeamCnstWid[1]<<endreq; + ", "<<m_BeamCnst[2]<<" wid="<<m_BeamCnstWid[0]<<", "<<m_BeamCnstWid[1]<<endmsg; } }else{ Amg::Vector3D approx_beam=findIniXY(newPrtCol); m_BeamCnst[0]=approx_beam.x(); m_BeamCnst[1]=approx_beam.y(); m_BeamCnst[2]=0.; - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Approx. BeamSpot="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Approx. BeamSpot="<<m_BeamCnst[0]<<", "<<m_BeamCnst[1]<<endmsg; } Trk::Vertex selectionVertex(m_BeamCnst); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::TrackParticleBase number=" <<newPrtCol->size()<< endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Trk::TrackParticleBase number=" <<newPrtCol->size()<< endmsg; Trk::TrackParticleBaseCollection::const_iterator i_nprt = newPrtCol->begin(); for (i_nprt = newPrtCol->begin(); i_nprt < newPrtCol->end(); ++i_nprt) { m_mPer=GetPerigee( (*i_nprt) ); if( m_mPer == NULL ){ continue; } @@ -467,7 +467,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, TrkQual = (*i_nprt)->fitQuality(); double CovTrkMtx11 = (*(m_mPer->covariance()))(0,0); double CovTrkMtx22 = (*(m_mPer->covariance()))(2,2); -//if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Error track matrix="<<CovTrkMtx11<<", "<<CovTrkMtx22<<endreq; +//if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Error track matrix="<<CovTrkMtx11<<", "<<CovTrkMtx22<<endmsg; if ( CovTrkMtx11 > m_A0TrkErrorCut*m_A0TrkErrorCut ) continue; if ( CovTrkMtx22 > m_ZTrkErrorCut*m_ZTrkErrorCut ) continue; if( m_trkSelectorExist ) { @@ -484,7 +484,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, //double ImpactSignif = m_fitSvc->VKalGetImpact((*i_nprt), m_BeamCnst, 1, Impact, ImpactError); //VK ImpactSignif not needed m_fitSvc->VKalGetImpact((*i_nprt), m_BeamCnst, 1, Impact, ImpactError); double ImpactA0=VectPerig[0]; //double ImpactZ=VectPerig[1]; // Temporary -//if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Track impact="<<ImpactA0<<", "<<ImpactZ<<", "<<ImpactSignif<<endreq; +//if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Track impact="<<ImpactA0<<", "<<ImpactZ<<", "<<ImpactSignif<<endmsg; ImpactA0=Impact[0]; //ImpactZ=Impact[1]; StatusCode sc = CutTrk( VectPerig[4] , VectPerig[3] , ImpactA0 , @@ -495,7 +495,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, SelectedTrackParticles.push_back(*i_nprt); } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found="<<SelectedTrackParticles.size()<<" particles" <<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Found="<<SelectedTrackParticles.size()<<" particles" <<endmsg; /* And now primary vertex search itself*/ if(SelectedTrackParticles.size()<2){ SelectedTrackParticles.clear(); @@ -526,7 +526,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, // } SelectedTrackParticles.push_back(*i_nprt); } - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " Found relaxed="<<SelectedTrackParticles.size()<<" particles" <<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " Found relaxed="<<SelectedTrackParticles.size()<<" particles" <<endmsg; /* And now primary vertex search itself*/ } //--- Cleaning @@ -546,10 +546,10 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type, //-------------------------------------------------------------------- if( NFoundVrt == 0){ - if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Primary vertex not found" <<endreq; + if(msgLvl(MSG::ERROR))msg(MSG::ERROR) << "Primary vertex not found" <<endmsg; }else{ if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<"Found Primary Vertex=" << PrimVrtList[0].x()<<", "<< - PrimVrtList[0].y()<<", "<<PrimVrtList[0].z()<< endreq; + PrimVrtList[0].y()<<", "<<PrimVrtList[0].z()<< endmsg; } //------------------------------------------------------------------------------- // diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFind.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFind.cxx index b7de8551c07..ddef1cc4563 100755 --- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFind.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFind.cxx @@ -25,7 +25,7 @@ namespace InDet { std::vector< std::vector<const Trk::Track*> > & TrkPerVrt, std::vector< std::vector<double> > & TrkWgtPerVrt ) { - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary Vertex Finder called " <<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Primary Vertex Finder called " <<endmsg; // Select track type for vertex finding. @@ -36,8 +36,8 @@ namespace InDet { if( ListParticles.size() == 0 && ListTracks.size() != 0 ){ Selector =2; NTracksVrt=ListTracks.size();} if( NTracksVrt == 0) return 0; if( NTracksVrt == 1 && !m_BeamConstraint) return 0; - if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::TrackParticlesBase are used for vertex search!!!="<<NTracksVrt<<endreq; - if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::Tracks are used for vertex search!!!="<<NTracksVrt<<endreq; + if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::TrackParticlesBase are used for vertex search!!!="<<NTracksVrt<<endmsg; + if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::Tracks are used for vertex search!!!="<<NTracksVrt<<endmsg; // int NFoundVertices = 0; std::vector<const Trk::TrackParticleBase*> SelectedParticles; @@ -61,7 +61,7 @@ namespace InDet { while ( 1 ) { if(Selector==1) ZStartFit = FindZPosTrk( ListParticles, ControlVariable); if(Selector==2) ZStartFit = FindZPosTrk( ListTracks, ControlVariable); - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " Z pos estimation= " <<ZStartFit<<" for vertex="<<NFoundVertices<< endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< " Z pos estimation= " <<ZStartFit<<" for vertex="<<NFoundVertices<< endmsg; if(ZStartFit < -10000.) return NFoundVertices; // No more candidates if(NFoundVertices > m_NPVertexMax) return NFoundVertices; // Too many candidates Amg::Vector3D IniVertex(m_BeamCnst[0], m_BeamCnst[1], ZStartFit); diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFit.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFit.cxx index 73e7149a7c6..ab20799e007 100755 --- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFit.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/PVrtFit.cxx @@ -30,7 +30,7 @@ namespace InDet { if( ListParticles.size() == 0 && ListTracks.size() == 0 )return; if( ListParticles.size() != 0 && ListTracks.size() == 0 ){ Selector =1; NTracksVrt=ListParticles.size(); } if( ListParticles.size() == 0 && ListTracks.size() != 0 ){ Selector =2; NTracksVrt=ListTracks.size();} - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< "CleanTrkSet() called. Total tracks= " << NTracksVrt<< endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<< "CleanTrkSet() called. Total tracks= " << NTracksVrt<< endmsg; if( NTracksVrt<10 ) return; //nothing to do // // @@ -135,9 +135,9 @@ namespace InDet { if( ListParticles.size() != 0 && ListTracks.size() == 0 ){ Selector =1; NTracksVrt=ListParticles.size(); } if( ListParticles.size() == 0 && ListTracks.size() != 0 ){ Selector =2; NTracksVrt=ListTracks.size();} - if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "FitCommonVrt() called. Total tracks= " << NTracksVrt<< endreq; - if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::TrackParticleBases are used for common Vrt!!!"<<endreq; - if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::Tracks are used for common Vrt!!!"<<endreq; + if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "FitCommonVrt() called. Total tracks= " << NTracksVrt<< endmsg; + if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::TrackParticleBases are used for common Vrt!!!"<<endmsg; + if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << " Trk::Tracks are used for common Vrt!!!"<<endmsg; //preparation std::vector<double> Chi2PerTrk; std::vector< std::vector<double> > TrkAtVrt; @@ -178,7 +178,7 @@ namespace InDet { double dof=0.; for(int itk=0; itk<NTracksVrt; itk++)dof += TrkWeights[itk]; long int nDoF=(long int)(5.*dof-3.*NTracksVrt-3.); if(m_BeamConstraint)nDoF += 2; if(nDoF<1)nDoF=1; float vrtProb=TMath::Prob(Chi2,nDoF); -if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" Out1="<< Chi2PerTrk[Outlier]<<", Wei="<<TrkWeights[Outlier]<<" Z="<<FitVertex.z()<<" prob="<<vrtProb<<" iter="<<i<<endreq; +if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" Out1="<< Chi2PerTrk[Outlier]<<", Wei="<<TrkWeights[Outlier]<<" Z="<<FitVertex.z()<<" prob="<<vrtProb<<" iter="<<i<<endmsg; if( Chi2PerTrk[FindMax(Chi2PerTrk)] < m_SecTrkChi2Cut ){ //if(NTracksVrt<3) break; break; @@ -231,7 +231,7 @@ if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" Out1="<< Chi2PerTrk[Outlier]<<", Wei="< if(Selector==2)NTracksVrt=ListTracks.size(); if(NTracksVrt<1)return -10000.; //Protection if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" Primary Vertex fit converged N,Chi2,ChiT="<< NTracksVrt<<", " - <<Chi2<<", "<<Chi2PerTrk[Outlier]<<" Z="<<FitVertex.z()<<endreq; + <<Chi2<<", "<<Chi2PerTrk[Outlier]<<" Z="<<FitVertex.z()<<endmsg; //-- if( Chi2PerTrk[Outlier] > m_SecTrkChi2Cut && NTracksVrt<=2) // VK 6.02.2008 Wrong!!! Chi2/NTracksVrt > 4. ) diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx index c7139f35199..bb3270365d4 100755 --- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx @@ -46,8 +46,8 @@ namespace InDet { if(Selector==1)SelectedParticles.push_back( ListParticles[i] ); if(Selector==2)SelectedTracks.push_back( ListTracks[i] ); } - if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Chosen for vertex fit="<<SelectedParticles.size()<<endreq; - if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Chosen for vertex fit="<<SelectedTracks.size()<<endreq; + if(Selector==1 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Chosen for vertex fit="<<SelectedParticles.size()<<endmsg; + if(Selector==2 && msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Chosen for vertex fit="<<SelectedTracks.size()<<endmsg; return; } diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx index ae63a4d56f9..315f6f16be4 100755 --- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx @@ -1059,7 +1059,7 @@ namespace InDet{ if(m_useMaterialRejection && (SelectedTracks[i]->pt()<m_MaterialPtCut || SelectedTracks[j]->pt()<m_MaterialPtCut) ){ //if(m_materialMap){ // if(m_materialMap->inMaterial(FitVertex)) BadTracks=4; - // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" MaterialMap test="<< BadTracks<<endreq; + // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG)<<" MaterialMap test="<< BadTracks<<endmsg; //}else{ float Dist2DBP=sqrt( (xvt-m_Xbeampipe)*(xvt-m_Xbeampipe) + (yvt-m_Ybeampipe)*(yvt-m_Ybeampipe) ); float Dist2DBL=sqrt( (xvt-m_XlayerB)*(xvt-m_XlayerB) + (yvt-m_YlayerB)*(yvt-m_YlayerB) ); diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx index 7e07688536e..605e8909d68 100755 --- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx +++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/InDetVKalVxInJetTool.cxx @@ -211,9 +211,9 @@ InDetVKalVxInJetTool::InDetVKalVxInJetTool(const std::string& type, } //if (m_materialMap.retrieve().isFailure()) { // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "Could not find InDetMaterialRejTool." - // << "Use radial rejection"<< endreq; + // << "Use radial rejection"<< endmsg; //} else { - // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "InDetMaterialRejTool found" << endreq; + // if(msgLvl(MSG::DEBUG))msg(MSG::DEBUG) << "InDetMaterialRejTool found" << endmsg; //} //------ // if ( m_trackToVertexIP.retrieve().isFailure() ) { diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_AmbiguitySolver.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_AmbiguitySolver.cxx index 66293b0f3e5..3bca0e81397 100755 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_AmbiguitySolver.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_AmbiguitySolver.cxx @@ -47,16 +47,16 @@ StatusCode InDet::ZVTOP_AmbiguitySolver::initialize() if (sc.isFailure()) return sc; //Gaussian Probability Tube for the Track Trajectory if ( m_TrkProbTubeCalc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_TrkProbTubeCalc<< endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_TrkProbTubeCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_TrkProbTubeCalc << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_TrkProbTubeCalc << endmsg; //Vertex Probability Function if ( m_VtxProbCalc.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_VtxProbCalc<< endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_VtxProbCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_VtxProbCalc << endreq; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_VtxProbCalc << endmsg; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SecVtxTool.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SecVtxTool.cxx index 03807a7f35a..f1528d8cdf8 100644 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SecVtxTool.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SecVtxTool.cxx @@ -61,40 +61,40 @@ StatusCode InDet::ZVTOP_SecVtxTool::initialize() { StatusCode sc = AlgTool::initialize(); - msg (MSG::INFO) << name() << " initialize()" << endreq; + msg (MSG::INFO) << name() << " initialize()" << endmsg; if (sc.isFailure()) return sc; /* Retrieve Tools*/ //SpatialPointFinder if ( m_iSpatialPointFinder.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iSpatialPointFinder << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iSpatialPointFinder << endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iSpatialPointFinder << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iSpatialPointFinder << endmsg; //Gaussian Probability Tube for the Track Trajectory if ( m_iTrkProbTubeCalc.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iTrkProbTubeCalc<< endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iTrkProbTubeCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iTrkProbTubeCalc << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iTrkProbTubeCalc << endmsg; //Vertex Probability Function if ( m_iVtxProbCalc.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVtxProbCalc<< endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVtxProbCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iVtxProbCalc << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iVtxProbCalc << endmsg; //VxFitter if ( m_iVertexFitter.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVertexFitter << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVertexFitter << endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iVertexFitter << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iVertexFitter << endmsg; if ( m_iAmbiguitySolver.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iAmbiguitySolver << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iAmbiguitySolver << endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iAmbiguitySolver << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iAmbiguitySolver << endmsg; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -117,8 +117,8 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re std::vector<xAOD::Vertex*> secVertices; //std::vector<Trk::VxCandidate*> new_secVertices(0); --David S. std::vector<xAOD::Vertex*> new_secVertices(0); - //if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et s= "<<jetMomentum.et() << endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et s= "<<jetMomentum.Et() << endreq; + //if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et s= "<<jetMomentum.et() << endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et s= "<<jetMomentum.Et() << endmsg; if (inputTracks.size() != 0) { //some variables typedef std::vector<const Trk::TrackParticleBase*>::const_iterator TrkPartVecIter; @@ -129,7 +129,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re //-------step1: find spatial points & calculate vtx probabilities-------// //--------------------------------------------------------------------------// std::vector< std::vector<InDet::ZVTOP_TrkPartBaseVertexState*> > vertex_objects; //vector of vtx candidate & track collection pairs - if (msgLvl(MSG::DEBUG)) msg () << "step ONE search for the spatial points, number of tracks = "<<inputTracks.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg () << "step ONE search for the spatial points, number of tracks = "<<inputTracks.size() << endmsg; for (TrkPartVecIter itr_1 = inputTracks.begin(); itr_1 != inputTracks.end()-1; itr_1++) { double sum_TrkProbTube = 0.; @@ -178,7 +178,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re } delete spatialPoint; } - if (msgLvl(MSG::DEBUG)) msg () << " number of spatial points = "<<vtxState_org.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg () << " number of spatial points = "<<vtxState_org.size()<<endmsg; //reduce the spatial point collection typedef std::vector<InDet::ZVTOP_TrkPartBaseVertexState*>::iterator Sp_Iter; std::vector< InDet::ZVTOP_TrkPartBaseVertexState*> vtxState; @@ -216,7 +216,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re //------------------------------------------------------------------------------// if (vtxState.size() != 0 ){ - if (msgLvl(MSG::DEBUG)) msg () << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg () << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endmsg; //sort the vtxState collection, starting with a highest vtx probability std::vector<InDet::ZVTOP_TrkPartBaseVertexState*> vtxState_sorted; std::multimap<double, InDet::ZVTOP_TrkPartBaseVertexState*>::reverse_iterator s= vtxProb_map.rbegin(); @@ -304,7 +304,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re //--------------------step3: call vertex fitter----------------------------------// //--------------------------------------------------------------------------------// - if (msgLvl(MSG::DEBUG)) msg () << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg () << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endmsg; //std::vector<Trk::VxCandidate* > theVxContainer; --David S. std::vector<xAOD::Vertex*> theVertexContainer; //prepare trk coll --> remove double tracks @@ -319,7 +319,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re { for ( std::vector <const Trk::TrackParticleBase*>::iterator vs_itr = ((*itr)->tracks()).begin(); vs_itr!= ((*itr)->tracks()).end(); vs_itr++) { - if (msgLvl(MSG::DEBUG)) msg () <<"old trk coll size = "<<trk_coll.size()<<", new track = "<<(*vs_itr)<<endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"old trk coll size = "<<trk_coll.size()<<", new track = "<<(*vs_itr)<<endmsg; bool found = false; for (std::vector <const Trk::TrackParticleBase*>::iterator trk_itr = trk_coll.begin(); trk_itr!= trk_coll.end(); trk_itr++) { if (*vs_itr == *trk_itr) found = true; @@ -327,7 +327,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re if (!found) trk_coll.push_back(*vs_itr); } if ((*itr)->beam_spot()) with_IP = true; - if (msgLvl(MSG::DEBUG)) msg () <<"new track collection size = "<<trk_coll.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"new track collection size = "<<trk_coll.size()<<endmsg; } //call the fitter //Trk::VxCandidate * myVxCandidate(0); --David S. @@ -343,8 +343,8 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re { while (bad_chi2) { - //if (msgLvl(MSG::DEBUG)) msg () <<"rec Vertex = "<<myVxCandidate->recVertex().position()<<endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg () << "Vertex pos = " << myxAODVertex->position() << endreq; + //if (msgLvl(MSG::DEBUG)) msg () <<"rec Vertex = "<<myVxCandidate->recVertex().position()<<endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg () << "Vertex pos = " << myxAODVertex->position() << endmsg; //std::vector< Trk::VxTrackAtVertex*> trkAtVtx = *(myVxCandidate->vxTrackAtVertex()); --David S. std::vector<Trk::VxTrackAtVertex> trkAtVtx = myxAODVertex->vxTrackAtVertex(); //std::vector< Trk::VxTrackAtVertex*>::iterator trkAtVtx_Iter = trkAtVtx.begin(); --David S. @@ -382,11 +382,11 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re if (myxAODVertex && bad_chi2 == false) secVertices.push_back(myxAODVertex); } new_secVertices = m_iAmbiguitySolver->solveAmbiguities(secVertices); - if (msgLvl(MSG::DEBUG)) msg () <<"vertex container size = "<<secVertices.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"vertex container size = "<<secVertices.size()<<endmsg; for (Sp_Iter iter = vtxState_org.begin(); iter != vtxState_org.end(); iter++) delete *iter; } else { - if (msgLvl(MSG::DEBUG)) msg () <<"No tracks in this event, provide to the next event" << endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"No tracks in this event, provide to the next event" << endmsg; } return new Trk::VxSecVertexInfo(secVertices); @@ -399,8 +399,8 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const xAOD::Vertex & primaryVertex, const TLorentzVector & jetMomentum,const std::vector<const xAOD::IParticle*> & inputTracks) const { if(msgLvl(MSG::DEBUG)){ - msg(MSG::DEBUG) << "No ZVTOP_SecVtxTool implementation for xAOD::IParticle" << endreq; - msg(MSG::DEBUG) << "Returning null VxSecVertexInfo*" << endreq; + msg(MSG::DEBUG) << "No ZVTOP_SecVtxTool implementation for xAOD::IParticle" << endmsg; + msg(MSG::DEBUG) << "Returning null VxSecVertexInfo*" << endmsg; } Trk::VxSecVertexInfo* returnInfo(0); @@ -415,8 +415,8 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re { //std::vector<Trk::VxCandidate*> secVertices; --David S. std::vector<xAOD::Vertex*> secVertices; - //if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et = "<<jetMomentum.et() << endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et = "<<jetMomentum.Et() << endreq; + //if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et = "<<jetMomentum.et() << endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg () << "jet momentum Et = "<<jetMomentum.Et() << endmsg; if (inputTracks.size() != 0) { //some variables typedef std::vector<const Trk::Track*>::const_iterator TrackDataVecIter; @@ -429,7 +429,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re std::vector< std::vector<InDet::ZVTOP_VertexState*> > vertex_objects(0); //vector of vtx candidate & track collection pairs - if (msgLvl(MSG::DEBUG)) msg () << "step ONE search for the spatial points, number of tracks = "<<inputTracks.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg () << "step ONE search for the spatial points, number of tracks = "<<inputTracks.size() << endmsg; for (TrackDataVecIter itr_1 = inputTracks.begin(); itr_1 != inputTracks.end()-1; itr_1++) { double sum_TrkProbTube = 0.; @@ -478,7 +478,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re } delete spatialPoint; } - if (msgLvl(MSG::DEBUG)) msg () << " number of spatial points = "<<vtxState_org.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg () << " number of spatial points = "<<vtxState_org.size()<<endmsg; //reduce the spatial point collection typedef std::vector<InDet::ZVTOP_VertexState*>::iterator Sp_Iter; std::vector< InDet::ZVTOP_VertexState*> vtxState; @@ -516,7 +516,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re if (vtxState.size() != 0 ){ - if (msgLvl(MSG::DEBUG)) msg () << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg () << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endmsg; //sort the vtxState collection, starting with a highest vtx probability std::vector<InDet::ZVTOP_VertexState*> vtxState_sorted; unsigned int IP_counter = 0; @@ -607,7 +607,7 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re //--------------------step3: call vertex fitter----------------------------------// //--------------------------------------------------------------------------------// - if (msgLvl(MSG::DEBUG)) msg () << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg () << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endmsg; //std::vector<Trk::VxCandidate* > theVxContainer; --David S. std::vector<xAOD::Vertex*> theVertexContainer; //prepare trk coll --> remove double tracks @@ -676,10 +676,10 @@ const Trk::VxSecVertexInfo* InDet::ZVTOP_SecVtxTool::findSecVertex(const Trk::Re //if (myVxCandidate && bad_chi2 == false) secVertices.push_back(myVxCandidate); --David S. if (myxAODVertex && bad_chi2 == false) secVertices.push_back(myxAODVertex); } - if (msgLvl(MSG::DEBUG)) msg () <<"vertex container size = "<<secVertices.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"vertex container size = "<<secVertices.size()<<endmsg; for (Sp_Iter iter = vtxState_org.begin(); iter != vtxState_org.end(); iter++) delete *iter; } else { - if (msgLvl(MSG::DEBUG)) msg () <<"No tracks in this event, provide to the next event" << endreq; + if (msgLvl(MSG::DEBUG)) msg () <<"No tracks in this event, provide to the next event" << endmsg; } return new Trk::VxSecVertexInfo(secVertices); diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SimpleVtxProbCalc.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SimpleVtxProbCalc.cxx index 1d34c95e781..66c2c238aaa 100755 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SimpleVtxProbCalc.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SimpleVtxProbCalc.cxx @@ -37,7 +37,7 @@ StatusCode InDet::ZVTOP_SimpleVtxProbCalc::initialize() if (sc.isFailure()) return sc; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SlowSpatialPointFinder.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SlowSpatialPointFinder.cxx index be39abd1ff8..90339dc5c39 100644 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SlowSpatialPointFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SlowSpatialPointFinder.cxx @@ -43,11 +43,11 @@ StatusCode InDet::ZVTOP_SlowSpatialPointFinder::initialize() // get tool svc if(m_linFactory.retrieve().isFailure()) { - msg (MSG::ERROR) <<"Could not find ToolSvc."<<endreq; + msg (MSG::ERROR) <<"Could not find ToolSvc."<<endmsg; return sc; - } else msg (MSG::INFO) << "Retrieved tool " << m_linFactory << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -64,7 +64,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Tr const Trk::TrackParameters* perigee_1(dynamic_cast<const Trk::TrackParameters*>(trk_1->perigeeParameters())); const Trk::TrackParameters* perigee_2(dynamic_cast<const Trk::TrackParameters*>(trk_2->perigeeParameters())); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex* vertex = findSpatialPoint(perigee_1, perigee_2); @@ -78,7 +78,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Re { const Trk::TrackParameters *perigee_1(dynamic_cast<const Trk::TrackParameters*>(trk_1->perigeeParameters())); if (!perigee_1) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { //we need Trk::Vertex @@ -93,7 +93,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Rec::Tr const Trk::TrackParameters* perigee_1(trk_1->measuredPerigee()); const Trk::TrackParameters* perigee_2(trk_2->measuredPerigee()); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { //we need Trk::Vertex @@ -107,7 +107,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Re { const Trk::TrackParameters* perigee_1(trk_1->measuredPerigee()); if (!perigee_1) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex* vertex = findSpatialPoint(vtx, perigee_1); @@ -121,7 +121,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Tr const Trk::TrackParameters* perigee_1 = dynamic_cast<const Trk::TrackParameters*>(&(trk_1)->definingParameters()); const Trk::TrackParameters* perigee_2 = dynamic_cast<const Trk::TrackParameters*>(&(trk_2)->definingParameters()); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { //we need Trk::Vertex @@ -134,7 +134,7 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Re { const Trk::TrackParameters* perigee_1 = dynamic_cast<const Trk::TrackParameters*>(&(trk_1)->definingParameters()); if (!perigee_1) { - if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex* vertex = findSpatialPoint(vtx, perigee_1); @@ -190,15 +190,15 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Tr spatialPoint[0] += linPoint.position()[0]; spatialPoint[1] += linPoint.position()[1]; spatialPoint[2] += linPoint.position()[2]; - if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endreq; - if (msgLvl(MSG::VERBOSE)) msg() <<"chi2 = "<<chi2<<endreq; + if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endmsg; + if (msgLvl(MSG::VERBOSE)) msg() <<"chi2 = "<<chi2<<endmsg; linPoint = Trk::Vertex(spatialPoint); } delete linTrack1; linTrack1=0; delete linTrack2; linTrack2=0; }// two iterations if (chi2 <= m_chi2) return new Trk::Vertex(spatialPoint); else { - if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endmsg; return 0; } } @@ -242,15 +242,15 @@ Trk::Vertex* InDet::ZVTOP_SlowSpatialPointFinder::findSpatialPoint(const Trk::Re spatialPoint[0] += linPoint.position()[0]; spatialPoint[1] += linPoint.position()[1]; spatialPoint[2] += linPoint.position()[2]; - if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endreq; - if (msgLvl(MSG::VERBOSE)) msg() <<"chi2 = "<<chi2<<endreq; + if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endmsg; + if (msgLvl(MSG::VERBOSE)) msg() <<"chi2 = "<<chi2<<endmsg; linPoint = Trk::Vertex (spatialPoint); } delete linTrack1; linTrack1=0; } if (chi2 <= m_chi2) return new Trk::Vertex(spatialPoint); else { - if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endmsg; return 0; } } diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SpatialPointFinder.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SpatialPointFinder.cxx index 50cee085697..09d8c3c2bb8 100755 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SpatialPointFinder.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_SpatialPointFinder.cxx @@ -41,7 +41,7 @@ StatusCode InDet::ZVTOP_SpatialPointFinder::initialize() if (sc.isFailure()) return sc; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -58,7 +58,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::Track* const Trk::TrackParameters* perigee_1(dynamic_cast<const Trk::TrackParameters*>(trk_1->perigeeParameters())); const Trk::TrackParameters* perigee_2(dynamic_cast<const Trk::TrackParameters*>(trk_2->perigeeParameters())); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(perigee_1,perigee_2); @@ -71,7 +71,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::RecVer { const Trk::TrackParameters *perigee_1(dynamic_cast<const Trk::TrackParameters*>(trk_1->perigeeParameters())); if (!perigee_1) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(vtx,perigee_1); @@ -85,7 +85,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Rec::TrackP const Trk::TrackParameters* perigee_1(trk_1->measuredPerigee()); const Trk::TrackParameters* perigee_2(trk_2->measuredPerigee()); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(perigee_1,perigee_2); @@ -98,7 +98,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::RecVer { const Trk::TrackParameters* perigee_1(trk_1->measuredPerigee()); if (!perigee_1) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(vtx,perigee_1); @@ -111,7 +111,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::TrackP const Trk::TrackParameters* perigee_1 = dynamic_cast<const Trk::TrackParameters*>(&trk_1->definingParameters()); const Trk::TrackParameters* perigee_2 = dynamic_cast<const Trk::TrackParameters*>(&trk_2->definingParameters()); if (!perigee_1 | !perigee_2) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(perigee_1,perigee_2); @@ -124,7 +124,7 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::RecVer { const Trk::TrackParameters* perigee_1 = dynamic_cast<const Trk::TrackParameters*>(&trk_1->definingParameters()); if (!perigee_1) { - if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Dynamic cast to MeasuredPerigee failed. Skipping this pair" << endmsg; return 0; } else { Trk::Vertex * vertex = findSpatialPoint(vtx,perigee_1); @@ -190,11 +190,11 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::TrackP chi2 = XpVec_sp_1.dot(DtWD_1*XpVec_sp_1) + XpVec_sp_2.dot(DtWD_2*XpVec_sp_2); if (chi2 <= m_chi2) { - if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endmsg; return new Trk::Vertex(spatialPoint); } else { - if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endmsg; return 0; } @@ -238,11 +238,11 @@ Trk::Vertex* InDet::ZVTOP_SpatialPointFinder::findSpatialPoint(const Trk::RecVer chi2 = XpVec_sp_1.dot(DtWD_1*XpVec_sp_1) + sp_vtx.dot(vtx_weight*sp_vtx); if (chi2 <= m_chi2) { - if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point = ("<<spatialPoint[0]<<", "<<spatialPoint[1]<<", "<<spatialPoint[2]<<")"<< endmsg; return new Trk::Vertex(spatialPoint); } else { - if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"found spatial point candidate doesn't pass chi2_cut" << endmsg; return 0; } diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_Tool.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_Tool.cxx index c1c280d0488..cc25201d6ff 100755 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_Tool.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_Tool.cxx @@ -68,41 +68,41 @@ StatusCode InDet::ZVTOP_Tool::initialize() { StatusCode sc = AlgTool::initialize(); - msg (MSG::INFO) << name() << " initialize()" << endreq; + msg (MSG::INFO) << name() << " initialize()" << endmsg; if (sc.isFailure()) return sc; /* Retrieve Tools*/ //SpatialPointFinder if ( m_iSpatialPointFinder.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iSpatialPointFinder << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iSpatialPointFinder << endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iSpatialPointFinder << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iSpatialPointFinder << endmsg; //Gaussian Probability Tube for the Track Trajectory if ( m_iTrkProbTubeCalc.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iTrkProbTubeCalc<< endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iTrkProbTubeCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iTrkProbTubeCalc << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iTrkProbTubeCalc << endmsg; //Vertex Probability Function if ( m_iVtxProbCalc.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVtxProbCalc<< endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVtxProbCalc<< endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iVtxProbCalc << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iVtxProbCalc << endmsg; //Beam Spot sc = m_iBeamCondSvc.retrieve(); if (sc.isFailure()) { - msg (MSG::ERROR) << "Could not find BeamCondSvc." << endreq; + msg (MSG::ERROR) << "Could not find BeamCondSvc." << endmsg; return sc; } //VxFitter if ( m_iVertexFitter.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVertexFitter << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_iVertexFitter << endmsg; return StatusCode::FAILURE; - } else msg (MSG::INFO) << "Retrieved tool " << m_iVertexFitter << endreq; - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + } else msg (MSG::INFO) << "Retrieved tool " << m_iVertexFitter << endmsg; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -142,7 +142,7 @@ if (trackTES->size() != 0) { std::vector< std::vector<InDet::ZVTOP_VertexState*> > vertex_objects(0); //vector of vtx candidate & track collection pairs - if (msgLvl(MSG::DEBUG)) msg() << "step ONE search for the spatial points, number of tracks = "<<(*trackTES).size() << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "step ONE search for the spatial points, number of tracks = "<<(*trackTES).size() << endmsg; for (TrackDataVecIter itr_1 = (*trackTES).begin(); itr_1 != (*trackTES).end()-1; itr_1++) { double sum_TrkProbTube = 0.; @@ -191,7 +191,7 @@ if (trackTES->size() != 0) { } delete spatialPoint; } - if (msgLvl(MSG::DEBUG)) msg() << " number of spatial points = "<<vtxState_org.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg() << " number of spatial points = "<<vtxState_org.size()<<endmsg; //reduce the spatial point collection typedef std::vector<InDet::ZVTOP_VertexState*>::iterator Sp_Iter; std::vector< InDet::ZVTOP_VertexState*> vtxState; @@ -228,7 +228,7 @@ if (trackTES->size() != 0) { if (vtxState.size() != 0 ){ - if (msgLvl(MSG::DEBUG)) msg() << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg() << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endmsg; //sort the vtxState collection, starting with a highest vtx probability std::vector<InDet::ZVTOP_VertexState*> vtxState_sorted; unsigned int IP_counter = 0; @@ -319,7 +319,7 @@ if (trackTES->size() != 0) { //--------------------step3: call vertex fitter----------------------------------// //--------------------------------------------------------------------------------// - if (msgLvl(MSG::DEBUG)) msg() << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg() << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endmsg; //std::vector<Trk::VxCandidate* > theVxContainer; --David S. std::vector< xAOD::Vertex* > theVertexContainer; //prepare trk coll --> remove double tracks @@ -394,8 +394,8 @@ if (trackTES->size() != 0) { //if (myVxCandidate && bad_chi2 == false && !with_beam_spot) theVxContainer.push_back(myVxCandidate); --David S. if (myxAODVertex && bad_chi2 == false && !with_beam_spot) theVertexContainer.push_back(myxAODVertex); } - //if (msgLvl(MSG::DEBUG)) msg() <<"vertex container size = "<<theVxContainer.size()<<endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg() << "vertex container size = " << theVertexContainer.size() << endreq; + //if (msgLvl(MSG::DEBUG)) msg() <<"vertex container size = "<<theVxContainer.size()<<endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg() << "vertex container size = " << theVertexContainer.size() << endmsg; //ambiguity solving for two track vertices //typedef std::vector<Trk::VxCandidate* >::iterator theVxContainerIter; --David S. @@ -463,11 +463,11 @@ if (trackTES->size() != 0) { else delete *twoTrk_itr; //}//end loop over two track Vx Candidates --David S. }//end loop over two track Vertices - //if (msgLvl(MSG::DEBUG)) msg() <<"new VxContainer size = "<<newVxContainer->size()<<endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg() << "new VertexContainer size = " << newVertexContainer->size() << endreq; + //if (msgLvl(MSG::DEBUG)) msg() <<"new VxContainer size = "<<newVxContainer->size()<<endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg() << "new VertexContainer size = " << newVertexContainer->size() << endmsg; for (Sp_Iter iter = vtxState_org.begin(); iter != vtxState_org.end(); iter++) delete *iter; } else { - if (msgLvl(MSG::DEBUG)) msg() <<"No tracks in this event, provide to the next event" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"No tracks in this event, provide to the next event" << endmsg; } //return newVxContainer; --David S. @@ -503,7 +503,7 @@ if (trackTES->size() != 0) { std::vector< std::vector<InDet::ZVTOP_TrkPartBaseVertexState*> > vertex_objects(0); //vector of vtx candidate & track collection pairs - if (msgLvl(MSG::DEBUG)) msg() << "step ONE search for the spatial points, number of tracks = "<<(*trackTES).size() << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "step ONE search for the spatial points, number of tracks = "<<(*trackTES).size() << endmsg; for (TrackDataVecIter itr_1 = (*trackTES).begin(); itr_1 != (*trackTES).end()-1; itr_1++) { double sum_TrkProbTube = 0.; @@ -552,7 +552,7 @@ if (trackTES->size() != 0) { } delete spatialPoint; } - if (msgLvl(MSG::DEBUG)) msg() << " number of spatial points = "<<vtxState_org.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg() << " number of spatial points = "<<vtxState_org.size()<<endmsg; //reduce the spatial point collection typedef std::vector<InDet::ZVTOP_TrkPartBaseVertexState*>::iterator Sp_Iter; std::vector< InDet::ZVTOP_TrkPartBaseVertexState*> vtxState; @@ -589,7 +589,7 @@ if (trackTES->size() != 0) { if (vtxState.size() != 0 ){ - if (msgLvl(MSG::DEBUG)) msg() << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg() << " step TWO vertex clustering, number of reduced vertices = "<<vtxState.size()<< endmsg; //sort the vtxState collection, starting with a highest vtx probability std::vector<InDet::ZVTOP_TrkPartBaseVertexState*> vtxState_sorted; unsigned int IP_counter = 0; @@ -680,7 +680,7 @@ if (trackTES->size() != 0) { //--------------------step3: call vertex fitter----------------------------------// //--------------------------------------------------------------------------------// - if (msgLvl(MSG::DEBUG)) msg() << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endreq; + if (msgLvl(MSG::DEBUG)) msg() << " step THREE, vertex fit, vertex_objects size = "<<vertex_objects.size()<< endmsg; //std::vector<Trk::VxCandidate* > theVxContainer; --David S. std::vector< xAOD::Vertex* > theVertexContainer; //prepare trk coll --> remove double tracks @@ -759,8 +759,8 @@ if (trackTES->size() != 0) { //if (myVxCandidate && bad_chi2 == false && !with_beam_spot) theVxContainer.push_back(myVxCandidate); --David S. if (myxAODVertex && bad_chi2 == false && !with_beam_spot) theVertexContainer.push_back(myxAODVertex); } - //if (msgLvl(MSG::DEBUG)) msg() <<"vertex container size = "<<theVxContainer.size()<<endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg() << "vertex container size = " << theVertexContainer.size() << endreq; + //if (msgLvl(MSG::DEBUG)) msg() <<"vertex container size = "<<theVxContainer.size()<<endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg() << "vertex container size = " << theVertexContainer.size() << endmsg; //ambiguity solving for two track vertices //typedef std::vector<Trk::VxCandidate* >::iterator theVxContainerIter; --David S. @@ -828,11 +828,11 @@ if (trackTES->size() != 0) { else delete *twoTrk_itr; //}//end loop over two track Vx Candidates --David S. }//end loop over two track Vertices - //if (msgLvl(MSG::DEBUG)) msg() <<"new VxContainer size = "<<newVxContainer->size()<<endreq; --David S. - if (msgLvl(MSG::DEBUG)) msg() << "new VertexContainer size = " << newVertexContainer->size() << endreq; + //if (msgLvl(MSG::DEBUG)) msg() <<"new VxContainer size = "<<newVxContainer->size()<<endmsg; --David S. + if (msgLvl(MSG::DEBUG)) msg() << "new VertexContainer size = " << newVertexContainer->size() << endmsg; for (Sp_Iter iter = vtxState_org.begin(); iter != vtxState_org.end(); iter++) delete *iter; } else { - if (msgLvl(MSG::DEBUG)) msg() <<"No tracks in this event, provide to the next event" << endreq; + if (msgLvl(MSG::DEBUG)) msg() <<"No tracks in this event, provide to the next event" << endmsg; } //return newVxContainer; --David S. @@ -843,8 +843,8 @@ return std::make_pair(newVertexContainer, newVertexAuxContainer); std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDet::ZVTOP_Tool::findVertex(const xAOD::TrackParticleContainer* trackParticles) { if(msgLvl(MSG::DEBUG)){ - msg(MSG::DEBUG) << "N="<<trackParticles->size()<<" xAOD::TrackParticles found" << endreq; - msg(MSG::DEBUG) << "No ZVTOP_Tool implementation for xAOD::TrackParticle" << endreq; + msg(MSG::DEBUG) << "N="<<trackParticles->size()<<" xAOD::TrackParticles found" << endmsg; + msg(MSG::DEBUG) << "No ZVTOP_Tool implementation for xAOD::TrackParticle" << endmsg; } xAOD::VertexContainer *xAODContainer(0); xAOD::VertexAuxContainer *xAODAuxContainer(0); diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_TrkProbTubeCalc.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_TrkProbTubeCalc.cxx index cbf6aa0f19d..f78f8140dc1 100755 --- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_TrkProbTubeCalc.cxx +++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/ZVTOP_TrkProbTubeCalc.cxx @@ -45,12 +45,12 @@ StatusCode InDet::ZVTOP_TrkProbTubeCalc::initialize() /* Get the right extrapolator tool from ToolSvc */ if ( m_extrapolator.retrieve().isFailure() ) { - msg (MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg (MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg (MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg (MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } - msg (MSG::INFO) << "initialize() successful in " << name() << endreq; + msg (MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -122,10 +122,10 @@ double InDet::ZVTOP_TrkProbTubeCalc::calcProbTube(const Trk::Perigee* trkPer, Tr AmgMatrix(5,5) exp_perigee_weight = (*extrapolatedPerigee->covariance()).inverse(); probTube = exp(-0.5*diff.transpose()*exp_perigee_weight*diff); } else { - if (msgLvl(MSG::DEBUG)) msg() << "extrapolateted perigee has NO information on the covariance matrix" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "extrapolateted perigee has NO information on the covariance matrix" << endmsg; } } else { - if (msgLvl(MSG::DEBUG)) msg() << "Perigee was not extrapolated!" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Perigee was not extrapolated!" << endmsg; } delete extrapolatedPerigee; return probTube; diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx index a2fe2a62047..691cc602bc5 100644 --- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx +++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx @@ -99,7 +99,7 @@ void InDet::SeedToTrackConversionTool::endEvent() // Print event information // if (outputLevel()<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } const TrackCollection* inputTracks = 0; @@ -111,18 +111,18 @@ void InDet::SeedToTrackConversionTool::endEvent() } msg(MSG::INFO)<<"Check SiSPSeedSegments Collection "<<m_seedsegmentsCollection->size()<<" inputTracks: " - <<inputTracks->size()<<" trackinfo: "<<m_trackinfo<< endreq; + <<inputTracks->size()<<" trackinfo: "<<m_trackinfo<< endmsg; StatusCode s = evtStore()->overwrite(m_seedsegmentsCollection,m_seedsegmentsOutput,true); if (s.isFailure() ) { - msg(MSG::ERROR)<<"Could not overwrite converted SiSPSeedSegments tracks" <<endreq; + msg(MSG::ERROR)<<"Could not overwrite converted SiSPSeedSegments tracks" <<endmsg; } } else{ msg(MSG::INFO)<<" Check SiSPSeedSegments Collection "<<m_seedsegmentsCollection->size()<<" trackinfo: " - <<m_trackinfo<<endreq; + <<m_trackinfo<<endmsg; StatusCode s = evtStore()->record(m_seedsegmentsCollection,m_seedsegmentsOutput,true); if (s.isFailure() ) { - msg(MSG::ERROR)<<"Could not save converted SiSPSeedSegments tracks" <<endreq; + msg(MSG::ERROR)<<"Could not save converted SiSPSeedSegments tracks" <<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx index ad12eea65e6..0ce50f048f2 100755 --- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx +++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx @@ -97,28 +97,28 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::initialize() // Get RungeKutta propagator tool // if ( m_proptool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_proptool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_proptool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_proptool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_proptool << endmsg; } // Get updator tool // if ( m_updatortool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_updatortool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_updatortool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_updatortool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_updatortool << endmsg; } // Get RIO_OnTrack creator // if ( m_riocreator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_riocreator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_riocreator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_riocreator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_riocreator << endmsg; } Trk::IRIO_OnTrackCreator* riocreator = &(*m_riocreator); @@ -132,10 +132,10 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::initialize() IInDetConditionsSvc* pixcond = 0; if(m_usePIX ) { if ( m_pixelCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_pixelCondSummarySvc << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_pixelCondSummarySvc << endmsg; } pixcond = &(*m_pixelCondSummarySvc); } @@ -145,10 +145,10 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::initialize() IInDetConditionsSvc* sctcond = 0; if(m_useSCT ) { if ( m_sctCondSummarySvc.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_sctCondSummarySvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_sctCondSummarySvc << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_sctCondSummarySvc << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_sctCondSummarySvc << endmsg; } sctcond = &(*m_sctCondSummarySvc); } @@ -159,10 +159,10 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::initialize() std::string tagInfoKey = ""; if(tagInfoKeys.size()==0) - msg(MSG::WARNING) << " No TagInfo keys in DetectorStore "<< endreq; + msg(MSG::WARNING) << " No TagInfo keys in DetectorStore "<< endmsg; else { if(tagInfoKeys.size() > 1) { - msg(MSG::WARNING) <<"More than one TagInfo key in the DetectorStore, using the first one "<< endreq; + msg(MSG::WARNING) <<"More than one TagInfo key in the DetectorStore, using the first one "<< endmsg; } tagInfoKey = tagInfoKeys[0]; } @@ -177,9 +177,9 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::initialize() this,tagInfoH,m_callbackString); if(sc==StatusCode::SUCCESS) { - msg(MSG::INFO) << "Registered callback for geometry " << name() << endreq; + msg(MSG::INFO) << "Registered callback for geometry " << name() << endmsg; } else { - msg(MSG::ERROR) << "Could not book callback for geometry " << name () << endreq; + msg(MSG::ERROR) << "Could not book callback for geometry " << name () << endmsg; return StatusCode::FAILURE; } @@ -434,7 +434,7 @@ void InDet::SiCombinatorialTrackFinder_xk::endEvent() // Print event information // if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -759,7 +759,7 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::mapDetectorElementsProduction if(m_usePIX) { sc = detStore()->retrieve(pixmgr,m_pixm); if (sc.isFailure() || !pixmgr) { - msg(MSG::FATAL)<<"Could not get PixelDetectorManager !"<<endreq; + msg(MSG::FATAL)<<"Could not get PixelDetectorManager !"<<endmsg; return StatusCode::FAILURE; } } @@ -770,7 +770,7 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::mapDetectorElementsProduction if(m_useSCT) { sc = detStore()->retrieve(sctmgr,m_sctm); if (sc.isFailure() || !sctmgr) { - msg(MSG::FATAL)<<"Could not get SCT_DetectorManager !"<<endreq; + msg(MSG::FATAL)<<"Could not get SCT_DetectorManager !"<<endmsg; return StatusCode::FAILURE; } } @@ -791,12 +791,12 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::mapDetectorElementsProduction const SCT_ID* IDs = 0; if (m_usePIX && detStore()->retrieve(IDp, "PixelID").isFailure()) { - msg(MSG::FATAL) << "Could not get Pixel ID helper" << endreq; + msg(MSG::FATAL) << "Could not get Pixel ID helper" << endmsg; return StatusCode::FAILURE; } if (m_useSCT && detStore()->retrieve(IDs, "SCT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get SCT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get SCT ID helper" << endmsg; return StatusCode::FAILURE; } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx index ce842ca9dd3..aae52604c17 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx @@ -205,10 +205,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_ATLxk::initialize() // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -221,7 +221,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_ATLxk::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; } @@ -576,7 +576,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>& i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -609,7 +609,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>& m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -642,7 +642,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>& m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -677,7 +677,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp (const std::list<Trk::Vertex>& m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx index 1b97bbb5832..6ddfd00d800 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx @@ -180,10 +180,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::initialize() // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -195,7 +195,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; @@ -451,7 +451,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex> i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -479,7 +479,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex> i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>& lv,const double*) @@ -512,7 +512,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp (const std::list<Trk::Vertex i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx index 41f21c3e7d5..fbf6800ab1c 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx @@ -144,10 +144,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_Cosmic::initialize() // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -160,7 +160,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_Cosmic::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; @@ -405,7 +405,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>& i_seede = l_seeds.end (); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -436,7 +436,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>& i_seede = l_seeds.end (); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -471,7 +471,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp (const std::list<Trk::Vertex> i_seede = l_seeds.end (); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx index f9314ee30ac..739deda7e6d 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx @@ -189,7 +189,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; } @@ -422,7 +422,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -454,7 +454,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -491,7 +491,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Verte i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx index e52a5be668b..358fe7bceff 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx @@ -214,10 +214,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::initialize() // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -232,7 +232,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } m_umax = 100.-fabs(m_umax)*300.; return sc; @@ -544,7 +544,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -577,7 +577,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -610,7 +610,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -645,7 +645,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp (const std::list<Trk::Vertex>& l m_seed = m_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx index 1e5eae345d7..ce7b60342fc 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx @@ -184,10 +184,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::initialize() // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -199,7 +199,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; } @@ -420,7 +420,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Ver i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -449,7 +449,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Ver i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -484,7 +484,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp (const std::list<Trk::Ve i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx index dcf14bf9403..68fc6c02892 100755 --- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx +++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx @@ -191,7 +191,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_Trigger::initialize() // m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } return sc; } @@ -467,7 +467,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex> i_seed = l_seeds.begin(); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -500,7 +500,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex> m_seede = m_mapSeeds.end (); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -539,7 +539,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp (const std::list<Trk::Vertex m_seede = m_mapSeeds.end (); if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackRecalibrateTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackRecalibrateTool.cxx index 45421c69b8d..d08d0ae677d 100755 --- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackRecalibrateTool.cxx +++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackRecalibrateTool.cxx @@ -56,22 +56,22 @@ StatusCode InDet::TRT_DriftCircleOnTrackRecalibrateTool::initialize() StatusCode sc = AlgTool::initialize(); if(m_drifttool.retrieve().isFailure()){ - msg(MSG::FATAL) << "Failed to retrieve tool " << m_drifttool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_drifttool << endmsg; return StatusCode::FAILURE; } if(m_riontrackTube.retrieve().isFailure()){ - msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackTube << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackTube << endmsg; return StatusCode::FAILURE; } if ( m_errorScalingTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_errorScalingTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_errorScalingTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_errorScalingTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_errorScalingTool << endmsg; m_scaleTrtCov = m_errorScalingTool->needToScaleTrt(); - if (m_scaleTrtCov) msg(MSG::DEBUG) << "Detected need for scaling TRT errors." << endreq; + if (m_scaleTrtCov) msg(MSG::DEBUG) << "Detected need for scaling TRT errors." << endmsg; } return sc; @@ -113,7 +113,7 @@ const Trk::RIO_OnTrack* InDet::TRT_DriftCircleOnTrackRecalibrateTool::correct double distance=fabs(fabs(TP.parameters()[0])-driftradius); - msg(MSG::VERBOSE)<<"Old radius: "<< DC->localPosition()[Trk::driftRadius]<<" -> new radius: "<<driftradius<<endreq; + msg(MSG::VERBOSE)<<"Old radius: "<< DC->localPosition()[Trk::driftRadius]<<" -> new radius: "<<driftradius<<endmsg; if(distance>error*m_scalefactor){ diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackTool.cxx index ae4893296a0..8a1682d4239 100755 --- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackTool.cxx +++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackTool.cxx @@ -51,12 +51,12 @@ StatusCode InDet::TRT_DriftCircleOnTrackTool::initialize() // get error scaling tool // if ( m_errorScalingTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_errorScalingTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_errorScalingTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_errorScalingTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_errorScalingTool << endmsg; m_scaleTrtCov = m_errorScalingTool->needToScaleTrt(); - if (m_scaleTrtCov) msg(MSG::DEBUG) << "Detected need for scaling TRT errors." << endreq; + if (m_scaleTrtCov) msg(MSG::DEBUG) << "Detected need for scaling TRT errors." << endmsg; } return sc; diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackUniversalTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackUniversalTool.cxx index 29608f3b7ce..5db03763950 100755 --- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackUniversalTool.cxx +++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/TRT_DriftCircleOnTrackUniversalTool.cxx @@ -46,12 +46,12 @@ StatusCode InDet::TRT_DriftCircleOnTrackUniversalTool::initialize() StatusCode sc = AlgTool::initialize(); if(m_riontrackTube.retrieve().isFailure()){ - msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackTube << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackTube << endmsg; return StatusCode::FAILURE; } if(m_riontrackDrift.retrieve().isFailure()){ - msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackDrift << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_riontrackDrift << endmsg; return StatusCode::FAILURE; } diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx index 0afacb4b16c..39b29500da1 100755 --- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx +++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ATLxk.cxx @@ -92,7 +92,7 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ATLxk::initialize() // IToolSvc* toolSvc; if ((sc=service("ToolSvc", toolSvc)).isFailure()) { - msg(MSG::FATAL)<<"Toll service not found !"<<endreq; return sc; + msg(MSG::FATAL)<<"Toll service not found !"<<endmsg; return sc; } // Initiate magnetic field properties @@ -102,29 +102,29 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ATLxk::initialize() // Get propagator tool // if( m_propTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_propTool <<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_propTool <<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_propTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_propTool << endmsg; } // Get tool for track extension to TRT // if( m_extensionTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_extensionTool <<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_extensionTool <<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extensionTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extensionTool << endmsg; } // Get tool for track-prd association // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -133,14 +133,14 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ATLxk::initialize() m_trtmgr = 0; sc = detStore()->retrieve(m_trtmgr,m_ntrtmanager); if (sc.isFailure()) { - msg(MSG::FATAL)<<"Could not get TRT_DetectorManager"<<endreq; return sc; + msg(MSG::FATAL)<<"Could not get TRT_DetectorManager"<<endmsg; return sc; } //m_trtid = m_trtmgr->getIdHelper(); // TRT if (detStore()->retrieve(m_trtid, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } @@ -150,10 +150,10 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ATLxk::initialize() std::string tagInfoKey = ""; if(tagInfoKeys.size()==0) - msg(MSG::WARNING) << " No TagInfo keys in DetectorStore "<< endreq; + msg(MSG::WARNING) << " No TagInfo keys in DetectorStore "<< endmsg; else { if(tagInfoKeys.size() > 1) { - msg(MSG::WARNING) <<"More than one TagInfo key in the DetectorStore, using the first one "<< endreq; + msg(MSG::WARNING) <<"More than one TagInfo key in the DetectorStore, using the first one "<< endmsg; } tagInfoKey = tagInfoKeys[0]; } @@ -168,10 +168,10 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ATLxk::initialize() this,tagInfoH,m_callbackString); if (sc.isFailure()) { - msg(MSG::FATAL)<< "Failed to register the callback " << name() << endreq; + msg(MSG::FATAL)<< "Failed to register the callback " << name() << endmsg; } else { - msg(MSG::INFO) << "Register the callback" << name() << endreq; + msg(MSG::INFO) << "Register the callback" << name() << endmsg; } @@ -213,7 +213,7 @@ void InDet::TRT_TrackSegmentsMaker_ATLxk::newEvent () // StatusCode s = evtStore()->retrieve(m_trtcontainer,m_trtname); if(s.isFailure() && m_outputlevel<=0) { - msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endreq; + msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endmsg; return; } if(!m_trtcontainer) return; @@ -293,7 +293,7 @@ void InDet::TRT_TrackSegmentsMaker_ATLxk::newRegion // StatusCode s = evtStore()->retrieve(m_trtcontainer,m_trtname); if(s.isFailure() && m_outputlevel<=0) { - msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endreq; + msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endmsg; return; } if(!m_trtcontainer) return; @@ -358,7 +358,7 @@ void InDet::TRT_TrackSegmentsMaker_ATLxk::newRegion void InDet::TRT_TrackSegmentsMaker_ATLxk::endEvent () { if(m_outputlevel<=0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } } @@ -864,7 +864,7 @@ void InDet::TRT_TrackSegmentsMaker_ATLxk::mapStrawsProduction() } } if(m_outputlevel<=0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } } diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_BarrelCosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_BarrelCosmics.cxx index ac67ae8bf5c..bd5f366387e 100755 --- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_BarrelCosmics.cxx +++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_BarrelCosmics.cxx @@ -71,36 +71,36 @@ StatusCode InDet::TRT_TrackSegmentsMaker_BarrelCosmics::initialize() { msg(MSG::INFO) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::initialize(), March 2012" << ", magnetic field: " << (m_magneticField?"ON":"OFF") - << " search bins: " << m_nBinsInX << ", " << m_nBinsInPhi << endreq; + << " search bins: " << m_nBinsInX << ", " << m_nBinsInPhi << endmsg; StatusCode sc = StatusCode::SUCCESS; // TRT if (detStore()->retrieve(m_trtid, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } if (m_minHitsForSeed<=0) m_minHitsForSeed = (int) ( 0.601 * m_minHitsForSegment ); if (m_minHitsAboveTOT<=0) m_minHitsAboveTOT = (int) (0.751 * m_minHitsForSegment ); - msg(MSG::INFO) << "m_minHitsForSegment = " << m_minHitsForSegment << endreq; - msg(MSG::INFO) << "m_minHitsForSeed = " << m_minHitsForSeed << endreq; - msg(MSG::INFO) << "m_minHitsAboveTOT = " << m_minHitsAboveTOT << endreq; + msg(MSG::INFO) << "m_minHitsForSegment = " << m_minHitsForSegment << endmsg; + msg(MSG::INFO) << "m_minHitsForSeed = " << m_minHitsForSeed << endmsg; + msg(MSG::INFO) << "m_minHitsAboveTOT = " << m_minHitsAboveTOT << endmsg; if (m_minSeedTOT<0. || m_minSeedTOT>20.) - msg(MSG::WARNING) << "initialize(): are you sure about the MinimalTOTForSeedSearch setting? (set at " << m_minSeedTOT << ")" << endreq; + msg(MSG::WARNING) << "initialize(): are you sure about the MinimalTOTForSeedSearch setting? (set at " << m_minSeedTOT << ")" << endmsg; msg(MSG::INFO) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::initialize(), jobProperties: " << "MinimalNumberOfTRTHits " << m_minHitsForSegment << ", MinimalTOTForSeedSearch: " << m_minSeedTOT - << ", m_minHitsForSeed: " << m_minHitsForSeed << ", m_minHitsAboveTOT: " << m_minHitsAboveTOT << endreq; + << ", m_minHitsForSeed: " << m_minHitsForSeed << ", m_minHitsAboveTOT: " << m_minHitsAboveTOT << endmsg; return sc; } StatusCode InDet::TRT_TrackSegmentsMaker_BarrelCosmics::finalize() { - msg(MSG::INFO) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::finalize()" << endreq; + msg(MSG::INFO) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::finalize()" << endmsg; return StatusCode::SUCCESS; } @@ -111,19 +111,19 @@ StatusCode InDet::TRT_TrackSegmentsMaker_BarrelCosmics::finalize() { void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newEvent() { - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newEvent()" << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newEvent()" << endmsg; clear(); // private method that clears data members from the previous event const InDet::TRT_DriftCircleContainer* TRTDriftCircleContainer; // get TRT_DriftCircle list from StoreGate containers StatusCode sc = evtStore()->retrieve( TRTDriftCircleContainer, m_driftCirclesName ); - if (sc.isFailure()) { msg(MSG::ERROR) << "Could not find TRT_DriftCircles collection!" << endreq; return; } - if (TRTDriftCircleContainer==0) { msg(MSG::ERROR) << "newEvent(): TRTDriftCircleContainer==0" << endreq; return; } + if (sc.isFailure()) { msg(MSG::ERROR) << "Could not find TRT_DriftCircles collection!" << endmsg; return; } + if (TRTDriftCircleContainer==0) { msg(MSG::ERROR) << "newEvent(): TRTDriftCircleContainer==0" << endmsg; return; } for(InDet::TRT_DriftCircleContainer::const_iterator it=TRTDriftCircleContainer->begin(); it!=TRTDriftCircleContainer->end(); it++) { const InDet::TRT_DriftCircleCollection *colNext=&(**it); - if (!colNext) { msg(MSG::WARNING) << "newEvent(): !colNext " << endreq; continue; } + if (!colNext) { msg(MSG::WARNING) << "newEvent(): !colNext " << endmsg; continue; } for (DataVector<InDet::TRT_DriftCircle>::const_iterator circleit=(*colNext).begin();circleit!=(*colNext).end();circleit++){ @@ -142,25 +142,25 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newEvent() { } // end TRTDriftCircleContainer loop if ( m_maxTotalHits && ((int)m_listHits.size()) > m_maxTotalHits ) { - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "skipping high occupancy event of " << m_listHits.size() << " barrel hits, limit at " << m_maxTotalHits << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "skipping high occupancy event of " << m_listHits.size() << " barrel hits, limit at " << m_maxTotalHits << endmsg; clear(); } if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "newEvent(): Number of TRT barrel hits: " << m_listHits.size() - << " Number of hits with TOT > " << m_minSeedTOT << ": " << m_listHitCenter.size() << endreq; + << " Number of hits with TOT > " << m_minSeedTOT << ": " << m_listHitCenter.size() << endmsg; return; } void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newRegion(const std::vector<IdentifierHash> &vTRT) { - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newRegion()" << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newRegion()" << endmsg; clear(); StatusCode sc = evtStore()->retrieve(m_trtcontainer, m_driftCirclesName); if (sc.isFailure() || !m_trtcontainer) { - msg(MSG::ERROR) << "m_trtcontainer is empty!!!" << endreq; + msg(MSG::ERROR) << "m_trtcontainer is empty!!!" << endmsg; return; } @@ -187,23 +187,23 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::newRegion(const std::vector<Id } if ( m_maxTotalHits && ((int)m_listHits.size()) > m_maxTotalHits ) { - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "skipping high occupancy event of " << m_listHits.size() << " barrel hits, limit at " << m_maxTotalHits << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "skipping high occupancy event of " << m_listHits.size() << " barrel hits, limit at " << m_maxTotalHits << endmsg; clear(); } if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "newRegion(): Number of TRT barrel hits: " << m_listHits.size() - << " Number of hits with TOT > " << m_minSeedTOT << ": " << m_listHitCenter.size() << endreq; + << " Number of hits with TOT > " << m_minSeedTOT << ": " << m_listHitCenter.size() << endmsg; return; } void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::endEvent () { - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::endEvent()" << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::endEvent()" << endmsg; if ( m_segmentDriftCirclesCount < m_segments.size() ) { // elements of m_segments created by new have not been passed on - msg(MSG::WARNING) << "endEvent() you called the function t create the segments but not retrived them later??" << endreq; - msg(MSG::WARNING) << "endEvent() deleting remaining elements of m_segments" << endreq; + msg(MSG::WARNING) << "endEvent() you called the function t create the segments but not retrived them later??" << endmsg; + msg(MSG::WARNING) << "endEvent() deleting remaining elements of m_segments" << endmsg; for (unsigned int i=m_segmentDriftCirclesCount; i<m_segments.size(); i++) delete m_segments[i]; } @@ -218,7 +218,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find(){ if (!m_magneticField) { findOld(); return; } - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find()" << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find()" << endmsg; static int eventCount(-1); eventCount++; // FILE *fout = fopen("findSeedInfo.txt", "a"); @@ -227,7 +227,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find(){ if ((int)m_listHitCenter.size()<m_minHitsAboveTOT) return; if (m_segmentDriftCircles.size()) { // debug only - msg(MSG::WARNING) << "TRT_TrackSegmentsMaker_BarrelCosmics::find() probably called twice per event? or newEvent / newRegion have not been called. check your program" << endreq; + msg(MSG::WARNING) << "TRT_TrackSegmentsMaker_BarrelCosmics::find() probably called twice per event? or newEvent / newRegion have not been called. check your program" << endmsg; clear(); return; } @@ -288,7 +288,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find(){ if (m_magneticField) segFit(measx, measy, countMeas, 0, par+3); if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "countAssociatedHits " << countAssociatedHits[0] << " " - << countAssociatedHits[1] << " m_minHitsAboveTOT " << m_minHitsAboveTOT << endreq; + << countAssociatedHits[1] << " m_minHitsAboveTOT " << m_minHitsAboveTOT << endmsg; x0.push_back( par[0] ); phi.push_back( par[1] ); nHitsPosY.push_back( countAssociatedHits[0] ); nHitsNegY.push_back( countAssociatedHits[1] ); pivotX.push_back( par[3] ); pivotY.push_back( par[4] ); Xparabola.push_back( par[5] ); cotanParabola.push_back( par[6] ); InverseR.push_back( par[7] ); @@ -357,7 +357,7 @@ if (m_mergeSegments) { // merge segments, not yet tested properly if (mergeI != mergeJ) { if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "Merge segments " << mergeI << " and " << mergeJ << " of size " << m_segmentDriftCircles[mergeI].size() << ", " << m_segmentDriftCircles[mergeJ].size() - << "; difference in the impact par x: " << mergeX0 << " phi: " << mergePhi << endreq; + << "; difference in the impact par x: " << mergeX0 << " phi: " << mergePhi << endmsg; for (unsigned int i=0; i<m_segmentDriftCircles[mergeJ].size(); i++) m_segmentDriftCircles[mergeI].push_back(m_segmentDriftCircles[mergeJ][i]); m_segmentDriftCircles[mergeJ].clear(); } @@ -368,7 +368,7 @@ if (m_mergeSegments) { // merge segments, not yet tested properly if (m_debugLevel <= MSG::DEBUG) { // debug: check how many hits per found segments msg(MSG::DEBUG) << "find() debug (" << nFoundSegments << ")" ; for (unsigned int i=0; i<m_segmentDriftCircles.size(); i++) msg(MSG::DEBUG) << " " << i << " " << m_segmentDriftCircles[i].size() ; - msg(MSG::DEBUG) << endreq; + msg(MSG::DEBUG) << endmsg; } for (unsigned int i=0; i<m_segmentDriftCircles.size(); i++) { // convert to segments @@ -376,7 +376,7 @@ if (m_mergeSegments) { // merge segments, not yet tested properly double trackpar[] = {x0[i], phi[i]}; convert(m_segmentDriftCircles[i], trackpar); } - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "find(), number of converted segments: " << m_segments.size() << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "find(), number of converted segments: " << m_segments.size() << endmsg; // fclose(fout); @@ -393,11 +393,11 @@ Trk::TrackSegment *InDet::TRT_TrackSegmentsMaker_BarrelCosmics::next() { // next 6 lines: for debugging purposes only if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::next(): return " - << m_segmentDriftCirclesCount << " out of " << m_segments.size() << endreq; + << m_segmentDriftCirclesCount << " out of " << m_segments.size() << endmsg; if (m_segmentDriftCirclesCount > m_segments.size()) msg(MSG::ERROR) << "m_segmentDriftCirclesCount = " << m_segmentDriftCirclesCount << ", m_segments.size() = " - << m_segments.size() << endreq; + << m_segments.size() << endmsg; return (m_segmentDriftCirclesCount<m_segments.size())?(m_segments[m_segmentDriftCirclesCount++]):0; } @@ -408,7 +408,7 @@ Trk::TrackSegment *InDet::TRT_TrackSegmentsMaker_BarrelCosmics::next() { void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::clear() { // clears data members - msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::clear(), current m_segments.size() = " << m_segments.size() << endreq; + msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::clear(), current m_segments.size() = " << m_segments.size() << endmsg; m_listHits.clear(); m_listHitCenter.clear(); @@ -477,7 +477,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findSeedInverseR(double *par) countMeanTransformY++; } if (!countMeanTransformY) { - msg(MSG::WARNING) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findSeedInverseR(), no hits in the seed region???" << endreq; + msg(MSG::WARNING) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findSeedInverseR(), no hits in the seed region???" << endmsg; return; } meanTransformY /= (double) countMeanTransformY; @@ -576,9 +576,9 @@ bool InDet::TRT_TrackSegmentsMaker_BarrelCosmics::sortHits( const InDet::TRT_Dri void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDet::TRT_DriftCircle *> &hits, double *trackpar) { //Track Segment production - based on TRT_TrackSegmentsMaker_ECcosmics Tool - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert() segment " << m_segments.size() << ", N hits = " << hits.size() << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert() segment " << m_segments.size() << ", N hits = " << hits.size() << endmsg; - if (hits.size()<5) { msg(MSG::ERROR) << "convert(): empty list of hits! size: " << hits.size() << endreq; return; } + if (hits.size()<5) { msg(MSG::ERROR) << "convert(): empty list of hits! size: " << hits.size() << endmsg; return; } // sort the vector of hits std::sort( hits.begin(), hits.end(), InDet::TRT_TrackSegmentsMaker_BarrelCosmics::sortHits ); @@ -594,9 +594,9 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDe else { it++; } } if (countOppositeSide>5) - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "convert(): removed " << countOppositeSide << " hits from the other side, N remaining hits: " << hits.size() << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "convert(): removed " << countOppositeSide << " hits from the other side, N remaining hits: " << hits.size() << endmsg; if (hits.size()<5) { - msg(MSG::WARNING) << "convert(): not enough hits after opposite side removal: " << hits.size() << ", removed: " << countOppositeSide << endreq; + msg(MSG::WARNING) << "convert(): not enough hits after opposite side removal: " << hits.size() << ", removed: " << countOppositeSide << endmsg; return; } @@ -628,15 +628,15 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDe } if (iPivot==-1) { - msg(MSG::ERROR) << "SF pivot index not found!!! " << yPivot << " " << iPivot << endreq; + msg(MSG::ERROR) << "SF pivot index not found!!! " << yPivot << " " << iPivot << endmsg; iPivot = 0; } double cotanPhi = mean[2] / mean[4]; double phi = atan(1./cotanPhi); if (phi<0.) phi += M_PI; if (m_debugLevel <= MSG::DEBUG) { - msg(MSG::DEBUG) << "compare parameters X : " << trackpar[0] << " vs. " << mean[0]-mean[1]*cotanPhi << endreq; - msg(MSG::DEBUG) << "compare parameters phi: " << trackpar[1] << " vs. " << phi << endreq; + msg(MSG::DEBUG) << "compare parameters X : " << trackpar[0] << " vs. " << mean[0]-mean[1]*cotanPhi << endmsg; + msg(MSG::DEBUG) << "compare parameters phi: " << trackpar[1] << " vs. " << phi << endmsg; } double qOverp = 0.; // units q / MeV, set only if there is magnetic field @@ -667,9 +667,9 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDe double cosphi = sqrt(1.-sinphi*sinphi); if (cotanParabola<0.) cosphi *= -1.; if (m_debugLevel <= MSG::DEBUG) { - msg(MSG::DEBUG) << "TRT_TrackSegmentsMaker_BarrelCosmics: parabola fit, X: " << Xparabola << endreq; - msg(MSG::DEBUG) << " parabola fit, cotan: " << cotanParabola << " compare to " << cotanPhi << endreq; - msg(MSG::DEBUG) << " parabola fit, 1/R: " << inverseR << "/ mm " << endreq; + msg(MSG::DEBUG) << "TRT_TrackSegmentsMaker_BarrelCosmics: parabola fit, X: " << Xparabola << endmsg; + msg(MSG::DEBUG) << " parabola fit, cotan: " << cotanParabola << " compare to " << cotanPhi << endmsg; + msg(MSG::DEBUG) << " parabola fit, 1/R: " << inverseR << "/ mm " << endmsg; } qOverp = inverseR / 0.6; // [1/MeV]; 1 / (eBRC) = 1 / (e 2T 3 100 M m/s mm) / R[mm] = (1/R[mm]) / 0.6 @@ -715,11 +715,11 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDe // if (sur->center().x()*cos(phi)+sur->center().y()*sin(phi)<0.) phi -= M_PI; // if (mean[0]*cos(phi)+mean[1]*sin(phi)<0.) phi -= M_PI; if (phi>0.) phi -= M_PI; - if (phi<-M_PI || phi>0.) msg(MSG::ERROR) << "phi value problem: " << phi << endreq; + if (phi<-M_PI || phi>0.) msg(MSG::ERROR) << "phi value problem: " << phi << endmsg; Trk::LocalParameters par(0., 0., phi, M_PI_2, qOverp); - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "pivot: " << sur->center() << ", cross-check: " << mean[0] << " " << mean[1] << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "pivot: " << sur->center() << ", cross-check: " << mean[0] << " " << mean[1] << endmsg; // calculate TrackParameters so that one can calculate input for TRT_DriftCircleOnTrack // Global direction of the track parameters @@ -733,7 +733,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::convert(std::vector<const InDe const InDet::TRT_DriftCircle* DC = hits[i]; // Straw identification - const InDetDD::TRT_BaseElement* pE = DC->detectorElement(); if(!pE) {msg(MSG::ERROR) << "convert(): no detectorElement info!" << endreq; continue; } + const InDetDD::TRT_BaseElement* pE = DC->detectorElement(); if(!pE) {msg(MSG::ERROR) << "convert(): no detectorElement info!" << endmsg; continue; } Identifier iD = DC->identify(); IdentifierHash iH = m_trtid->straw_layer_hash(m_trtid->layer_id(iD)); @@ -774,13 +774,13 @@ if (1) { // limit the scope of all these variables double chi2 = mean[3] - 2.*cotanPhi*mean[2] + mean[4]*cotanPhi*cotanPhi; chi2 /= ( 1. + cotanPhi*cotanPhi ); int ndf = (int) hits.size() - 2; - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "Chi2 = " << chi2 << ", ndf = " << ndf << ", chi2/ndf = " << chi2/ndf << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "Chi2 = " << chi2 << ", ndf = " << ndf << ", chi2/ndf = " << chi2/ndf << endmsg; Trk::FitQuality * fqu = new Trk::FitQuality(chi2, ndf); Trk::TrackSegment *segment = new Trk::TrackSegment(par,cov, sur, rio, fqu, Trk::Segment::TRT_SegmentMaker); //add segment to list of segments - msg(MSG::DEBUG) << "Add " << m_segments.size() << "th segment to list" << endreq; + msg(MSG::DEBUG) << "Add " << m_segments.size() << "th segment to list" << endmsg; m_segments.push_back(segment); return; @@ -872,12 +872,12 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::segFit(double *measx, double * void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findOld(){ - msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find()" << endreq; + msg(MSG::DEBUG) << "InDet::TRT_TrackSegmentsMaker_BarrelCosmics::find()" << endmsg; if ((int)m_listHitCenter.size()<m_minHitsAboveTOT) return; if (m_segmentDriftCircles.size()) { // debug only - msg(MSG::WARNING) << "find probably called twice per event? or newEvent / newRegion have not been called. check your program" << endreq; + msg(MSG::WARNING) << "find probably called twice per event? or newEvent / newRegion have not been called. check your program" << endmsg; clear(); return; } @@ -947,7 +947,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findOld(){ // debug: check how many hits per found segments msg(MSG::DEBUG) << "find() debug (" << nFoundSegments << ")" ; for (unsigned int i=0; i<m_segmentDriftCircles.size(); i++) msg(MSG::DEBUG) << " " << i << " " << m_segmentDriftCircles[i].size() ; - msg(MSG::DEBUG) << endreq; + msg(MSG::DEBUG) << endmsg; } for (unsigned int i=0; i<m_segmentDriftCircles.size(); i++) { // convert to segments @@ -955,7 +955,7 @@ void InDet::TRT_TrackSegmentsMaker_BarrelCosmics::findOld(){ double trackpar[] = {x0[i], phi[i]}; convert(m_segmentDriftCircles[i], trackpar); } - if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "find(), number of converted segments: " << m_segments.size() << endreq; + if (m_debugLevel <= MSG::DEBUG) msg(MSG::DEBUG) << "find(), number of converted segments: " << m_segments.size() << endmsg; return; } diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx index a1f9776ce50..01a8174b93c 100755 --- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx +++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/TRT_TrackSegmentsMaker_ECcosmics.cxx @@ -139,43 +139,43 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ECcosmics::initialize() m_trtmanager = 0; sc = detStore()->retrieve(m_trtmanager,m_ntrtmanager); if (sc.isFailure()) { - msg(MSG::FATAL)<<"Could not get TRT_DetectorManager"<<endreq; return sc; + msg(MSG::FATAL)<<"Could not get TRT_DetectorManager"<<endmsg; return sc; } //m_trtid = m_trtmanager->getIdHelper(); // TRT if (detStore()->retrieve(m_trtid, "TRT_ID").isFailure()) { - msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq; + msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg; return StatusCode::FAILURE; } // Get RIO_OnTrack creator with drift time information // if( m_riomakerD.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_riomakerD <<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_riomakerD <<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_riomakerD << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_riomakerD << endmsg; } // Get RIO_OnTrack creator without drift time information // if( m_riomakerN.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_riomakerN <<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_riomakerN <<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_riomakerN << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_riomakerN << endmsg; } // Get tool for track-prd association // if( m_useassoTool ) { if( m_assoTool.retrieve().isFailure()) { - msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endreq; + msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_assoTool<<endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } @@ -215,32 +215,32 @@ StatusCode InDet::TRT_TrackSegmentsMaker_ECcosmics::finalize() { /* if(m_truthCollectionTRT) - msg(MSG::INFO)<<"NUmber of events with real tracks through the endcaps: "<<m_real_counter<<endreq; - msg(MSG::INFO)<<"Number of events with segments: "<<m_seg_counter<<endreq; + msg(MSG::INFO)<<"NUmber of events with real tracks through the endcaps: "<<m_real_counter<<endmsg; + msg(MSG::INFO)<<"Number of events with segments: "<<m_seg_counter<<endmsg; if(m_truthCollectionTRT) - msg(MSG::INFO)<<"Classification:\n\t Real : "<<m_classification[0]<<"\n\t Fake : "<<m_classification[1]<<"\n\t Rest : "<<m_classification[2]<<endreq; + msg(MSG::INFO)<<"Classification:\n\t Real : "<<m_classification[0]<<"\n\t Fake : "<<m_classification[1]<<"\n\t Rest : "<<m_classification[2]<<endmsg; if(m_truthCollectionTRT){ for(int i=0;i<200;i++){ if(m_nHits[0][i]>0) - msg(MSG::INFO)<<"Real segments with "<<i<<" Hits : "<<m_nHits[0][i]<<endreq; + msg(MSG::INFO)<<"Real segments with "<<i<<" Hits : "<<m_nHits[0][i]<<endmsg; } } for(int i=0;i<200;i++){ if(m_nHits[1][i]>0){ if(m_truthCollectionTRT) - msg(MSG::INFO)<<"Fake segments with "<<i<<" Hits : "<<m_nHits[1][i]<<endreq; + msg(MSG::INFO)<<"Fake segments with "<<i<<" Hits : "<<m_nHits[1][i]<<endmsg; else - msg(MSG::INFO)<<"Segments with "<<i<<" Hits : "<<m_nHits[1][i]<<endreq; + msg(MSG::INFO)<<"Segments with "<<i<<" Hits : "<<m_nHits[1][i]<<endmsg; } } if(m_truthCollectionTRT){ for(int i=0;i<200;i++){ if(m_nHits[2][i]>0) - msg(MSG::INFO)<<"Rest segments with "<<i<<" Hits : "<<m_nHits[2][i]<<endreq; + msg(MSG::INFO)<<"Rest segments with "<<i<<" Hits : "<<m_nHits[2][i]<<endmsg; } } */ @@ -305,8 +305,8 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::newEvent () } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of good driftcircles: "<<m_goodHits.size()<<endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of noise driftcircles: "<<m_noiseHits.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of good driftcircles: "<<m_goodHits.size()<<endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of noise driftcircles: "<<m_noiseHits.size()<<endmsg; //retrieve TruthInfo if presen @@ -315,7 +315,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::newEvent () StatusCode sc = evtStore()->retrieve(m_truthCollectionTRT, m_multiTruthCollectionTRTName); if(sc.isFailure()){ - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << " could not open PRD_MultiTruthCollection : " << m_multiTruthCollectionTRTName << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << " could not open PRD_MultiTruthCollection : " << m_multiTruthCollectionTRTName << endmsg; m_truthCollectionTRT=0; } } @@ -386,8 +386,8 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::newRegion } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of good driftcircles: "<<m_goodHits.size()<<endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of noise driftcircles: "<<m_noiseHits.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of good driftcircles: "<<m_goodHits.size()<<endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Number of noise driftcircles: "<<m_noiseHits.size()<<endmsg; @@ -474,7 +474,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::find() int count=m_sectors[endcap][j][i].size(); if(count>0) - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Endcap "<<endcap<<" zslice "<<j<<" sector "<<i<<" : "<<count<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Endcap "<<endcap<<" zslice "<<j<<" sector "<<i<<" : "<<count<<endmsg; if(count>max){ max=count; @@ -490,7 +490,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::find() //check if enough driftcircles present if(max>=3){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of DCs in seed sector: "<<max<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of DCs in seed sector: "<<max<<endmsg; //2nd step: find seed among those driftcircles @@ -505,7 +505,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::find() } } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Found "<<m_seeds.size()<<" initial seeds !"<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Found "<<m_seeds.size()<<" initial seeds !"<<endmsg; //now loop over all seeds and try to create segments out of them @@ -520,7 +520,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::find() } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Found "<<m_segments.size()<<" TRT Segments"<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Found "<<m_segments.size()<<" TRT Segments"<<endmsg; if(m_segments.size()>0) m_seg_counter++; @@ -573,13 +573,13 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, vit=dc.begin(); vitE=dc.end(); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Sorted driftcircles: "<<dc.size()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Sorted driftcircles: "<<dc.size()<<endmsg; for(;vit!=vitE;++vit){ int straw = m_trtid->straw((*vit)->identify()); const Amg::Vector3D& sc = (*vit)->detectorElement()->strawCenter(straw); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"z="<<sc.z()<<" phi="<<sc.phi()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"z="<<sc.z()<<" phi="<<sc.phi()<<endmsg; } @@ -606,12 +606,12 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, } shift=(phimax+phimin)/2.-M_PI/4.; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" -> shift = "<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" -> shift = "<<shift<<endmsg; //protection for boundary at pi,-pi if(phimin<-M_PI/2. && phimax>M_PI/2.){ shift=3./4.*M_PI; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endmsg; } @@ -656,7 +656,7 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, } - //log<<MSG::VERBOSE<<"Investigating seed "<<p[0]<<" "<<p[1]<<endreq; + //log<<MSG::VERBOSE<<"Investigating seed "<<p[0]<<" "<<p[1]<<endmsg; int match=evaluate_seed(endcap,zslice,sector,p); @@ -668,7 +668,7 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, } } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of matching dc from best seed: "<<maxdc<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of matching dc from best seed: "<<maxdc<<endmsg; if(maxdc>=4){ @@ -712,7 +712,7 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, if (corr > M_PI) corr = fmod(corr+M_PI,2.*M_PI)-M_PI; else if(corr <-M_PI) corr = fmod(corr-M_PI,2.*M_PI)+M_PI; - //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endreq; + //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endmsg; if(fabs(phidiff(pred_phi,corr))<=4./650.){ seed->push_back(*it); @@ -729,10 +729,10 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, //do we need to extend the range ?? - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Pattern:"<<endreq; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][0]<<" "<<muster[1][0]<<" "<<muster[2][0]<<endreq; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][1]<<" "<<muster[1][1]<<" "<<muster[2][1]<<endreq; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][2]<<" "<<muster[1][2]<<" "<<muster[2][2]<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Pattern:"<<endmsg; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][0]<<" "<<muster[1][0]<<" "<<muster[2][0]<<endmsg; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][1]<<" "<<muster[1][1]<<" "<<muster[2][1]<<endmsg; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t"<<muster[0][2]<<" "<<muster[1][2]<<" "<<muster[2][2]<<endmsg; int zsl=-1; if(muster[2][0] || muster[2][1] || muster[2][2]){ @@ -765,10 +765,10 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, if (corr > M_PI) corr = fmod(corr+M_PI,2.*M_PI)-M_PI; else if(corr <-M_PI) corr = fmod(corr-M_PI,2.*M_PI)+M_PI; - //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endreq; + //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endmsg; if(fabs(phidiff(pred_phi,corr))<=4./650.){ - if (msgLvl(MSG::VERBOSE)) msg()<<"extended hit at z= "<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg()<<"extended hit at z= "<<sc.z()<<endmsg; if(sc.z()<zmin) zmin=sc.z(); if(sc.z()>zmax) zmax=sc.z(); seed->push_back(*it); @@ -807,10 +807,10 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, if (corr > M_PI) corr = fmod(corr+M_PI,2.*M_PI)-M_PI; else if(corr <-M_PI) corr = fmod(corr-M_PI,2.*M_PI)+M_PI; - //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endreq; + //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endmsg; if(fabs(phidiff(pred_phi,corr))<=4./650.){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"extended hit at z= "<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"extended hit at z= "<<sc.z()<<endmsg; if(sc.z()<zmin) zmin=sc.z(); if(sc.z()>zmax) zmax=sc.z(); seed->push_back(*it); @@ -821,7 +821,7 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, if(seed->size()<(size_t)m_minDCSeed){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Seed has too few hits: "<<seed->size()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Seed has too few hits: "<<seed->size()<<endmsg; seed->clear(); delete seed; return false; @@ -884,12 +884,12 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::find_seed(int endcap, int zslice, if (corr > M_PI) corr = fmod(corr+M_PI,2.*M_PI)-M_PI; else if(corr <-M_PI) corr = fmod(corr-M_PI,2.*M_PI)+M_PI; - //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endreq; + //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endmsg; if(fabs(phidiff(pred_phi,corr))<=4./650.){ if(sc.z()>zmin && sc.z()<zmax){ seed->push_back(*lit); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched seed! z="<< sc.z() <<"MC : "<<isTrueHit(*lit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched seed! z="<< sc.z() <<"MC : "<<isTrueHit(*lit)<<endmsg; } } @@ -930,7 +930,7 @@ int InDet::TRT_TrackSegmentsMaker_ECcosmics::evaluate_seed(int endcap,int zslice if(ps2<0) ps2+=16; else if(ps2>15) ps2-=16; - //log<<MSG::VERBOSE<<"Evaluating zslice "<<zsl<<" sector "<<ps2<<endreq; + //log<<MSG::VERBOSE<<"Evaluating zslice "<<zsl<<" sector "<<ps2<<endmsg; itE=m_sectors[endcap][zsl][ps2].end(); for(it=m_sectors[endcap][zsl][ps2].begin();it!=itE;++it){ @@ -950,7 +950,7 @@ int InDet::TRT_TrackSegmentsMaker_ECcosmics::evaluate_seed(int endcap,int zslice if (corr > M_PI) corr = fmod(corr+M_PI,2.*M_PI)-M_PI; else if(corr <-M_PI) corr = fmod(corr-M_PI,2.*M_PI)+M_PI; - //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endreq; + //log<<MSG::VERBOSE<<"pred_phi="<<pred_phi<<" orig="<<sc.phi()<<" corr="<<corr<<" phidiff="<<phidiff(pred_phi,corr)<<endmsg; if(fabs(phidiff(pred_phi,corr))<=4./650.){ count=count+1; @@ -959,7 +959,7 @@ int InDet::TRT_TrackSegmentsMaker_ECcosmics::evaluate_seed(int endcap,int zslice } } - //log<<MSG::VERBOSE<<"Total dc in this seed: "<<count<<endreq; + //log<<MSG::VERBOSE<<"Total dc in this seed: "<<count<<endmsg; return count; } @@ -968,7 +968,7 @@ int InDet::TRT_TrackSegmentsMaker_ECcosmics::evaluate_seed(int endcap,int zslice void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const InDet::TRT_DriftCircle*> *seed) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in initial seed: "<<seed->size()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in initial seed: "<<seed->size()<<endmsg; double shift=0.; double phimin=10.; @@ -1011,12 +1011,12 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I } shift=(phimax+phimin)/2.-M_PI/4.; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" shift="<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" shift="<<shift<<endmsg; //protection for boundary at pi,-pi if(phimin<-M_PI/2. && phimax>M_PI/2.){ shift=3./4.*M_PI; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endmsg; } @@ -1068,7 +1068,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I } } if(new_hit){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t good hit matched! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t good hit matched! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endmsg; if(sc.z()>zmin-200 && sc.z()<zmax+200){ if(sc.z()<zmin) zmin=sc.z(); @@ -1090,11 +1090,11 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I double z1=-1e5; count=0; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"zmin="<<zmin<<" zmax="<<zmax<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"zmin="<<zmin<<" zmax="<<zmax<<endmsg; for(vit=tobeadded.begin();vit!=tobeadded.end();vit++){ int straw = m_trtid->straw((*vit)->identify()); const Amg::Vector3D& sc = (*vit)->detectorElement()->strawCenter(straw); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Shall we add hit at z="<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Shall we add hit at z="<<sc.z()<<endmsg; if(sc.z()<zmin && sc.z()>z1) { z1=sc.z(); @@ -1106,7 +1106,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I count++; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"index1="<<index1<<" index2="<<index2<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"index1="<<index1<<" index2="<<index2<<endmsg; if(index2>=0){ for(int i=index2;i<count;i++){ @@ -1115,9 +1115,9 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I if(sc.z()<zmax+200){ zmax=sc.z(); seed->push_back(tobeadded[i]); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" added goot hit at z="<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" added goot hit at z="<<sc.z()<<endmsg; }else{ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" rejected goot hit at z="<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" rejected goot hit at z="<<sc.z()<<endmsg; i=count; } } @@ -1129,9 +1129,9 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I if(sc.z()>zmin-200){ zmin=sc.z(); seed->push_back(tobeadded[i]); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" added goot hit at z="<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" added goot hit at z="<<sc.z()<<endmsg; }else{ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" rejected goot hit at z="<<sc.z()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" rejected goot hit at z="<<sc.z()<<endmsg; i=-1; } } @@ -1172,12 +1172,12 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I } shift=(phimax+phimin)/2.-M_PI/4.; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" shift="<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Phimin="<<phimin<<" Phimax="<<phimax<<" shift="<<shift<<endmsg; //protection for boundary at pi,-pi if(phimin<-M_PI/2. && phimax>M_PI/2.){ shift=3./4.*M_PI; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Boundary between pi and -pi!!! use the following shift: "<<shift<<endmsg; } //correct the phi values @@ -1232,10 +1232,10 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I } if(new_hit){ if(sc.z()>zmin-50 && sc.z()<zmax+50){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endmsg; seed->push_back(*lit); }else{ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched but too far away! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t noise hit matched but too far away! fitted_phi="<<fitted_phi<<" z=" <<sc.z()<<"MC : "<<isTrueHit(*lit)<<endmsg; } } } @@ -1252,7 +1252,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I double yfirst=firststraw.y(); double ylast=laststraw.y(); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"zfirst="<<z1<<" zlast="<<z2<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"zfirst="<<z1<<" zlast="<<z2<<endmsg; double Theta=0; int state=0; @@ -1288,7 +1288,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I double firstphi=((*seed)[0]->detectorElement()->strawCenter( m_trtid->straw((*seed)[0]->identify()) )).phi(); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of tube hits matching straight line: "<<seed->size()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of tube hits matching straight line: "<<seed->size()<<endmsg; //estimate Segment parameters from first and last hit @@ -1308,11 +1308,11 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I double tphi=atan2(ty2-ty1,tx2-tx1); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"First hit: "<<sc_first<<" \nLast hit: "<<sc_last<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"First hit: "<<sc_first<<" \nLast hit: "<<sc_last<<endmsg; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" (x1,y1) = ("<<tx1<<","<<ty1<<")"<<endreq; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" (x2,y2) = ("<<tx2<<","<<ty2<<")"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" (x1,y1) = ("<<tx1<<","<<ty1<<")"<<endmsg; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" (x2,y2) = ("<<tx2<<","<<ty2<<")"<<endmsg; @@ -1328,9 +1328,9 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I while(Theta>M_PI) Theta-=M_PI; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" tphi="<<tphi<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<" tphi="<<tphi<<endmsg; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"globaly = "<<globaly<<" phi="<<firstphi<<" theta="<<Theta<<" --> state = "<<state<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"globaly = "<<globaly<<" phi="<<firstphi<<" theta="<<Theta<<" --> state = "<<state<<endmsg; vit=seed->begin(); @@ -1341,13 +1341,13 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I count++; int straw = m_trtid->straw((*vit)->identify()); const Amg::Vector3D& sc = (*vit)->detectorElement()->strawCenter(straw); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit "<<count<<" z="<<sc.z()<<" phi="<<sc.phi()<<" y="<<sc.y()<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit "<<count<<" z="<<sc.z()<<" phi="<<sc.phi()<<" y="<<sc.y()<<endmsg; } if(m_useDriftTime){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"drifttime should be used!!!"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"drifttime should be used!!!"<<endmsg; //refit the seed but this time including the drift time information @@ -1388,11 +1388,11 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I m_a_z_err[count]=0.; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<" z="<<m_a_z[count]<<" phi="<<m_a_phi[count]<<" +- "<< m_a_phi_err[count]<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<" z="<<m_a_z[count]<<" phi="<<m_a_phi[count]<<" +- "<< m_a_phi_err[count]<<endmsg; count++; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in first fit (driftradius): "<<count<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in first fit (driftradius): "<<count<<endmsg; fit=perform_fit(count); if(!fit) return; @@ -1422,9 +1422,9 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I return; // a seed cannot contain that many hits } - if (msgLvl(MSG::VERBOSE)) msg()<<"z="<<sc.z()<<" phi="<<sc.phi()<<" fitted_phi = "<<fitted_phi<<" MC : "<<isTrueHit(*vit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg()<<"z="<<sc.z()<<" phi="<<sc.phi()<<" fitted_phi = "<<fitted_phi<<" MC : "<<isTrueHit(*vit)<<endmsg; if(fabs(phidiff(fitted_phi,sc.phi()-dphi)) < m_scaleFactorDrift* drifte/straw_r){ - if (msgLvl(MSG::VERBOSE)) msg()<<"\t\t matched!!!"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg()<<"\t\t matched!!!"<<endmsg; m_a_z[count]=sc.z(); m_a_phi[count]=sc.phi()+dphi; @@ -1441,7 +1441,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I //refit - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in second fit (driftradius): "<<count<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits in second fit (driftradius): "<<count<<endmsg; if(count>4){ fit=perform_fit(count); @@ -1472,14 +1472,14 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I double dphi=sign*driftr/straw_r; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"z="<<sc.z()<<" phi="<<sc.phi()<<" fitted_phi = "<<fitted_phi<<" MC : "<<isTrueHit(*vit)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"z="<<sc.z()<<" phi="<<sc.phi()<<" fitted_phi = "<<fitted_phi<<" MC : "<<isTrueHit(*vit)<<endmsg; if(fabs(phidiff(fitted_phi,sc.phi()-dphi)) < m_scaleFactorDrift* drifte/straw_r){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t matched!!!"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t\t matched!!!"<<endmsg; count++; } } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits matched after second fit: "<<count<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits matched after second fit: "<<count<<endmsg; } @@ -1544,7 +1544,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I if (temp_phi > M_PI) temp_phi = fmod(temp_phi+M_PI,2.*M_PI)-M_PI; else if(temp_phi <-M_PI) temp_phi = fmod(temp_phi-M_PI,2.*M_PI)+M_PI; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<" fitted_r = "<<fitted_r<<" locz="<<locz<<" temp_phi="<<temp_phi<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<" fitted_r = "<<fitted_r<<" locz="<<locz<<" temp_phi="<<temp_phi<<endmsg; fitted_r*=-1.0; @@ -1587,12 +1587,12 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I if(useDrift){ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"RIO using drift time!"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"RIO using drift time!"<<endmsg; rio->push_back(m_riomakerD->correct(*(*vit),Tp)); }else{ - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"RIO without using drift time!"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"RIO without using drift time!"<<endmsg; chi2+=(fitted_r/1.15)*(fitted_r/1.15); // no drift time used - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<"\t\t chi2 contribution: "<<(fitted_r/1.15)*(fitted_r/1.15)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<count<<"\t\t chi2 contribution: "<<(fitted_r/1.15)*(fitted_r/1.15)<<endmsg; rio->push_back(m_riomakerN->correct(*(*vit),Tp)); } @@ -1665,7 +1665,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I Trk::LocalParameters par(defPar); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Track parameters from segment:"<<par<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Track parameters from segment:"<<par<<endmsg; double m_universal=1.15; @@ -1702,7 +1702,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::create_segment(std::vector<const I //add segment to list of segments - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Add segment to list"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Add segment to list"<<endmsg; m_segments.push_back(segment); @@ -1753,7 +1753,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::retrieveHits(void) StatusCode s = evtStore()->retrieve(m_trtcontainer,m_trtname); if(s.isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Could not get TRT_DriftCircleContainer"<<endmsg; return; } if(!m_trtcontainer) return; @@ -1764,7 +1764,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::retrieveHits(void) if(evtStore()->contains<PRD_MultiTruthCollection>("PRD_MultiTruthTRT")){ s = evtStore()->retrieve(m_truthCollectionTRT, "PRD_MultiTruthTRT"); if(s.isFailure()){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " could not open PRD_MultiTruthCollection ! " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " could not open PRD_MultiTruthCollection ! " << endmsg; return; } }else{ @@ -1832,17 +1832,17 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::retrieveHits(void) //require at least 20 hits if(realhits[0]>19 || realhits[1]>19) m_real_counter++; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"hits in endcap C: "<<realhits[0]<<" Hits in endcap A: "<<realhits[1]<<endreq; - if(realhits[0]>19 || realhits[1]>19) if (msgLvl(MSG::DEBUG)) msg()<<"This event should be reconstructed !!!!"<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"hits in endcap C: "<<realhits[0]<<" Hits in endcap A: "<<realhits[1]<<endmsg; + if(realhits[0]>19 || realhits[1]>19) if (msgLvl(MSG::DEBUG)) msg()<<"This event should be reconstructed !!!!"<<endmsg; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"good hits in endcap: "<<m_goodHits.size()<<endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"noise hits in endcap: "<<m_noiseHits.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"good hits in endcap: "<<m_goodHits.size()<<endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"noise hits in endcap: "<<m_noiseHits.size()<<endmsg; if(m_goodHits.size()>(size_t)m_hitLimit){ // this event is too busy ... - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"This event has more than "<<m_hitLimit<<" good hits. Aborting segment finding ..."<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"This event has more than "<<m_hitLimit<<" good hits. Aborting segment finding ..."<<endmsg; m_goodHits.clear(); m_noiseHits.clear(); return; @@ -2017,7 +2017,7 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::retrieveHits(void) // if(max_r>m_maximald){ if(!accept){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Removing hit in 2nd pass isolation: "<<isTrueHit(*it)<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Removing hit in 2nd pass isolation: "<<isTrueHit(*it)<<endmsg; m_noiseHits.push_back(*it); @@ -2031,8 +2031,8 @@ void InDet::TRT_TrackSegmentsMaker_ECcosmics::retrieveHits(void) remove=false; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"good hits in endcap: "<<m_goodHits.size()<<endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"noise hits in endcap: "<<m_noiseHits.size()<<endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"good hits in endcap: "<<m_goodHits.size()<<endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"noise hits in endcap: "<<m_noiseHits.size()<<endmsg; } @@ -2092,7 +2092,7 @@ TF1 *InDet::TRT_TrackSegmentsMaker_ECcosmics::perform_fit(int count) if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Fit result (ztanphi): a0="<<m_fitf_ztanphi->GetParameter(0) <<" a1="<<m_fitf_ztanphi->GetParameter(1)<<" a2=" - <<m_fitf_ztanphi->GetParameter(2)<<" fitresult="<<fitresult1<<endreq; + <<m_fitf_ztanphi->GetParameter(2)<<" fitresult="<<fitresult1<<endmsg; //copy over the parameters m_fitf_zphi->SetParameter(0,m_fitf_ztanphi->GetParameter(0)); @@ -2122,12 +2122,12 @@ TF1 *InDet::TRT_TrackSegmentsMaker_ECcosmics::perform_fit(int count) if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Fit result (zphi): a0="<< m_fitf_zphi_approx->GetParameter(0) <<" a1="<< m_fitf_zphi_approx->GetParameter(1)<<" a2=" - << m_fitf_zphi_approx->GetParameter(2)<<" fitresult="<<fitresult2<<endreq; + << m_fitf_zphi_approx->GetParameter(2)<<" fitresult="<<fitresult2<<endmsg; double p1=m_fitf_ztanphi->GetProb(); double p2=m_fitf_zphi_approx->GetProb(); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"tanphi prob: "<<p1<<" pol2 prob : "<<p2<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"tanphi prob: "<<p1<<" pol2 prob : "<<p2<<endmsg; delete gre; @@ -2152,7 +2152,7 @@ TF1 *InDet::TRT_TrackSegmentsMaker_ECcosmics::perform_fit(int count) } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits matching this fit: tan="<<match_tan<<" pol2="<<match_phi<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Number of hits matching this fit: tan="<<match_tan<<" pol2="<<match_phi<<endmsg; if(match_tan>match_phi){ return m_fitf_zphi; @@ -2283,15 +2283,15 @@ bool InDet::TRT_TrackSegmentsMaker_ECcosmics::is_suspicious(const InDet::TRT_Dri if(fabs(zmin_sel-mean)>2*var){// || fabs(dcz[index]-meanz)>2*varz){ if(index>=0) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit is suspicious, remove it! "<<fabs(zmin_sel-mean)<<" , "<<2*var<<" -> "<<zmin_sel<< " : "<<dcz[index]<<" <-> "<<meanz<<" ("<<varz<<")"<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit is suspicious, remove it! "<<fabs(zmin_sel-mean)<<" , "<<2*var<<" -> "<<zmin_sel<< " : "<<dcz[index]<<" <-> "<<meanz<<" ("<<varz<<")"<<endmsg; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t -> "<<isTrueHit(dc)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t -> "<<isTrueHit(dc)<<endmsg; return true; }else{ if(index>=0) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit seems to be ok: "<<fabs(zmin_sel-mean)<<" < "<<2*var<<" && "<<fabs(dcz[index]-meanz)<<" < "<<1.5*varz<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"Hit seems to be ok: "<<fabs(zmin_sel-mean)<<" < "<<2*var<<" && "<<fabs(dcz[index]-meanz)<<" < "<<1.5*varz<<endmsg; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t -> "<<isTrueHit(dc)<<endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<<"\t -> "<<isTrueHit(dc)<<endmsg; } return false; } diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx index 041c352e36a..7ec33051421 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx @@ -41,19 +41,19 @@ void TRRegionXMLHandler::Process(const std::string& name) ISvcLocator * svcLocator = Gaudi::svcLocator(); // from Bootstrap if (msgLevel(MSG::DEBUG)) - msg(MSG::DEBUG) << "This is TRRegionXMLHandler. Handler called" << endreq; + msg(MSG::DEBUG) << "This is TRRegionXMLHandler. Handler called" << endmsg; StatusCode sc = svcLocator->service("StoreGateSvc", m_storeGate); if( sc.isFailure() ) { if (msgLevel(MSG::ERROR)) - msg(MSG::ERROR) << "Unable to locate StoreGate! Stopping!" << endreq; + msg(MSG::ERROR) << "Unable to locate StoreGate! Stopping!" << endmsg; throw; } StoreGateSvc* detStore = 0; sc = svcLocator->service( "DetectorStore", detStore); if( sc.isFailure() ) { if (msgLevel(MSG::ERROR)) - msg(MSG::ERROR) << "Unable to locate DetectorStore! Leaving!" << endreq; + msg(MSG::ERROR) << "Unable to locate DetectorStore! Leaving!" << endmsg; throw; } @@ -67,14 +67,14 @@ void TRRegionXMLHandler::Process(const std::string& name) } else { if (msgLevel(MSG::FATAL)) msg(MSG::FATAL) << "Could not retrieve geometry layout. TR process is not to be trusted in the following " - << endreq; + << endmsg; throw; } // Crack open the XML file std::filebuf fb; if (!fb.open(name,std::ios::in)){ - msg(MSG::FATAL) << "Could not open file " << name << " bombing out" << endreq; + msg(MSG::FATAL) << "Could not open file " << name << " bombing out" << endmsg; throw; } std::istream is(&fb); @@ -112,7 +112,7 @@ void TRRegionXMLHandler::Process(const std::string& name) if (msgLevel(MSG::FATAL)) msg(MSG::FATAL) << " Volume-name " << volName <<" not found! Geometry layout " - << m_initialLayoutIdDict << endreq; + << m_initialLayoutIdDict << endmsg; std::abort(); } } diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx index cd035d9bf2e..dd2d71f4bd6 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx @@ -75,10 +75,10 @@ void TRTTransitionRadiation::AddRadiatorParameters(TRTRadiatorParameters p) { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " New Radiator parameters being defined for TR process" - << endreq; - msg(MSG::DEBUG) << " Volume " << p.GetLogicalVolume()->GetName() << endreq; - msg(MSG::DEBUG) << " FoilThickness " << p.GetFoilThickness() << endreq; - msg(MSG::DEBUG) << " GasThickness " << p.GetGasThickness() << endreq; + << endmsg; + msg(MSG::DEBUG) << " Volume " << p.GetLogicalVolume()->GetName() << endmsg; + msg(MSG::DEBUG) << " FoilThickness " << p.GetFoilThickness() << endmsg; + msg(MSG::DEBUG) << " GasThickness " << p.GetGasThickness() << endmsg; } m_radiators.push_back(p); @@ -143,7 +143,7 @@ void TRTTransitionRadiation::Initialize() { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Foil material : " << g4mat_FoilMaterial->GetName() << "; plasma energy : " << m_WplasmaFoil/CLHEP::eV << " eV" - << endreq; + << endmsg; msg(MSG::DEBUG) << "Gas : " << g4mat_Gas->GetName() << "; plasma energy : " << m_WplasmaGas/CLHEP::eV << " eV" << G4endl; diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx index 054d250ff89..1d97c3192a0 100755 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/InDetTrigAmbiguitySolver.cxx @@ -61,18 +61,18 @@ InDetTrigAmbiguitySolver::~InDetTrigAmbiguitySolver(void) /////////////////////////////////////////////////////////////////// HLT::ErrorCode InDetTrigAmbiguitySolver::hltInitialize() { - msg() << MSG::INFO << "InDetTrigAmbiguitySolver::initialize(). "<< endreq; + msg() << MSG::INFO << "InDetTrigAmbiguitySolver::initialize(). "<< endmsg; if (m_resolveTracks){ StatusCode sc = m_ambiTool.retrieve(); if (sc.isFailure()){ - msg() << MSG::FATAL << "Failed to retrieve tool " << m_ambiTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve tool " << m_ambiTool << endmsg; return HLT::BAD_ALGO_CONFIG; } else - msg() << MSG::INFO << "Retrieved tool " << m_ambiTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_ambiTool << endmsg; } @@ -98,10 +98,10 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "InDetTrigAmbiguitySolver::execHLTAlgorithm()" - << endreq; + << endmsg; if (m_doTimeOutChecks && Athena::Timeout::instance().reached() ) { - msg() << MSG::WARNING << "Timeout reached. Aborting sequence." << endreq; + msg() << MSG::WARNING << "Timeout reached. Aborting sequence." << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::TIMEOUT); } @@ -111,22 +111,22 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, //---------------------------------------------------------------------- m_oldTracks = 0; if ( HLT::OK != getFeature(outputTE, m_oldTracks, m_inputTracksLabel) ) { - msg() << MSG::ERROR << " Input track collection could not be found " << endreq; + msg() << MSG::ERROR << " Input track collection could not be found " << endmsg; return HLT::NAV_ERROR; } if(!m_oldTracks){ if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Input track collection was not attached. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Input track collection was not attached. Algorithm not executed!" << endmsg; return HLT::OK; } else { if(outputLevel <= MSG::VERBOSE) - msg() << MSG::VERBOSE << " Input track collection has size " << m_oldTracks->size() << endreq; + msg() << MSG::VERBOSE << " Input track collection has size " << m_oldTracks->size() << endmsg; if ( m_oldTracks->size() == 0 ) { if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endmsg; return HLT::OK; } @@ -138,7 +138,7 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, if (m_resolveTracks){ // okay, and let's call the ambiguity processor, just for a laugh. if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: InDetAmbiguitySolver::resolveTracks() resolving " << m_oldTracks->size()<<" tracks"<<endreq; + msg() << MSG::DEBUG << "REGTEST: InDetAmbiguitySolver::resolveTracks() resolving " << m_oldTracks->size()<<" tracks"<<endmsg; m_trackInCount = m_oldTracks->size(); m_tracks = m_ambiTool->process( m_oldTracks ); @@ -178,7 +178,7 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, // // Attach resolved tracks to the trigger element. if ( HLT::OK != attachFeature(outputTE, m_tracks, m_outputTracksLabel) ) { - msg() << MSG::ERROR << "Could not attache feature to the TE" << endreq; + msg() << MSG::ERROR << "Could not attache feature to the TE" << endmsg; return HLT::NAV_ERROR; } @@ -187,13 +187,13 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, if(outputLevel <= MSG::DEBUG){ msg() << MSG::DEBUG << "REGTEST: Stored " << m_tracks->size() - << " tracks in SG." << endreq; - msg() << MSG::DEBUG << "Track collection " << m_outputTracksLabel << endreq; + << " tracks in SG." << endmsg; + msg() << MSG::DEBUG << "Track collection " << m_outputTracksLabel << endmsg; } if (msgLvl() <= MSG::VERBOSE){ for (size_t i=0; i<m_tracks->size() ; i++){ - msg() << MSG::VERBOSE << *(m_tracks->at(i)) << endreq; + msg() << MSG::VERBOSE << *(m_tracks->at(i)) << endmsg; } } @@ -206,7 +206,7 @@ HLT::ErrorCode InDetTrigAmbiguitySolver::hltExecute(const HLT::TriggerElement*, HLT::ErrorCode InDetTrigAmbiguitySolver::hltFinalize() { msg() << MSG::INFO << "REGTEST: Finalizing with "<< m_TotalTrackInCount - << " tracks processed and " << m_TotalTrackOutCount << " saved. Invoked " << m_ntimesInvoked << " times." << endreq; + << " tracks processed and " << m_TotalTrackOutCount << " saved. Invoked " << m_ntimesInvoked << " times." << endmsg; return HLT::OK; } diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx index 4562b2bddad..442c48301ef 100755 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/InDetTrigExtensProcessor.cxx @@ -69,15 +69,15 @@ InDet::InDetTrigExtensProcessor::InDetTrigExtensProcessor(const std::string &nam // Initialize method: HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltInitialize() { - msg() << MSG::INFO << "InDetTrigExtensProcessor::initialize()" << endreq; + msg() << MSG::INFO << "InDetTrigExtensProcessor::initialize()" << endmsg; // get track fitter tool if ( m_ITrackFitter.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve tool " << m_ITrackFitter << endreq; + msg() << MSG::FATAL << "Failed to retrieve tool " << m_ITrackFitter << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else{ - msg() << MSG::INFO << "Retrieved tool " << m_ITrackFitter << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_ITrackFitter << endmsg; } // Configuration of the material effects @@ -86,11 +86,11 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltInitialize() { // get scoring tool if ( m_scoringTool.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve tool " << m_scoringTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve tool " << m_scoringTool << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else{ - msg() << MSG::INFO << "Retrieved tool " << m_scoringTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_scoringTool << endmsg; } @@ -106,7 +106,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle int outputLevel = msgLvl(); if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " InDetTrigExtensProcessor::execute()" << endreq; + msg() << MSG::DEBUG << " InDetTrigExtensProcessor::execute()" << endmsg; //---------------------------------------------------------------------- // Trigger specific part: navigate throw the trigger element to get the @@ -120,39 +120,39 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle if ( HLT::OK != getFeature(outputTE, m_tracks) ) { - msg() << MSG::ERROR << " Input track collection could not be found " << endreq; + msg() << MSG::ERROR << " Input track collection could not be found " << endmsg; return HLT::NAV_ERROR; } if(m_tracks->size()==0){ if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endmsg; return HLT::OK; } if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " REGTEST: Retrieved track collection correctly. Size = " << m_tracks->size() << endreq; + msg() << MSG::DEBUG << " REGTEST: Retrieved track collection correctly. Size = " << m_tracks->size() << endmsg; // get track ExensionMap from the trigger element // (the ExtensionMap is saved by the TRT_TrigTrackExtension algorithm): if ( HLT::OK != getFeature(outputTE, m_trackExtensionMap, "ExtTracks") ) { - msg() << MSG::ERROR << " Track extension map collection could not be found " << endreq; + msg() << MSG::ERROR << " Track extension map collection could not be found " << endmsg; return HLT::NAV_ERROR; } if(m_trackExtensionMap->size()==0){ if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Track extension map has 0 size. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Track extension map has 0 size. Algorithm not executed!" << endmsg; return HLT::OK; } if(outputLevel <= MSG::DEBUG) msg() <<MSG::DEBUG <<" REGTEST: TrackExtensionMap found, size:" - << m_trackExtensionMap->size() <<endreq; + << m_trackExtensionMap->size() <<endmsg; m_numExtenTracks = 0; m_numOrigTracks = 0; @@ -173,7 +173,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << " REGTEST: track not in extension map, copy original track to output" - << endreq; + << endmsg; // push track into output, does copy, needs fixing m_newtracks->push_back( new Trk::Track(**itr) ); @@ -201,7 +201,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle // we have the PRD Vector, we need to refit the track and see if it is better if(outputLevel <= MSG::DEBUG) msg() << MSG::VERBOSE << "fit track " << itEx->first - << " with PRDs, number: " << vecPrd.size() << endreq; + << " with PRDs, number: " << vecPrd.size() << endmsg; if (!m_cosmics) { newtrack = m_ITrackFitter->fit(*(itEx->first),vecPrd,m_runOutlier,m_ParticleHypothesis); @@ -236,7 +236,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle // we have an extension map with ROTs, we need to refit the track and see if it is better if(outputLevel <= MSG::DEBUG) msg() << MSG::VERBOSE << "fit track " << itEx->first - << " with ROTs, number: " << itEx->second.size() << endreq; + << " with ROTs, number: " << itEx->second.size() << endmsg; if (!m_cosmics) { @@ -268,7 +268,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "refit of extended track failed, copy original track to output" - << endreq; + << endmsg; ++m_numOrigTracks; // push track into output, does copy, needs fixing @@ -281,13 +281,13 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle // score old and new tool and decide which one to push back Trk::TrackScore oldScore = m_scoringTool->score( **itr, m_suppressHoleSearch ); - if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"original track has score: "<<oldScore<<endreq; + if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"original track has score: "<<oldScore<<endmsg; Trk::TrackScore newScore = m_scoringTool->score( *newtrack, m_suppressHoleSearch ); - if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"new track has score : "<<newScore<<endreq; + if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"new track has score : "<<newScore<<endmsg; if (newScore > oldScore) { - if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"take extended track, it's better !"<< endreq; + if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"take extended track, it's better !"<< endmsg; // push track into output m_newtracks->push_back( newtrack ); ++m_numExtenTracks; @@ -297,7 +297,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle // clean up newtrack delete (newtrack); - if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"take original track, new one is worse !"<< endreq; + if (outputLevel <= MSG::DEBUG) msg()<<MSG::DEBUG<<"take original track, new one is worse !"<< endmsg; ++m_numOrigTracks; // push track into output, does copy, needs fixing @@ -312,23 +312,23 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle std::string collKey = "ExtProcTracks"; if ( HLT::OK != attachFeature(outputTE, m_newtracks, collKey) ) { - msg() << MSG::ERROR << "Could not attache feature to the TE" << endreq; + msg() << MSG::ERROR << "Could not attache feature to the TE" << endmsg; return HLT::NAV_ERROR; } if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << " Stored " << m_newtracks->size() - << " tracks in SG. Track collection " << collKey << endreq; + << " tracks in SG. Track collection " << collKey << endmsg; if (m_newtracks->size() != m_tracks->size()){ if(outputLevel <= MSG::DEBUG) - msg() << MSG::ERROR << "Lost tracks after extension ??? This is a bug !" << endreq; + msg() << MSG::ERROR << "Lost tracks after extension ??? This is a bug !" << endmsg; } if (msgLvl() <= MSG::VERBOSE){ for (size_t i=0; i<m_newtracks->size() ; i++){ - msg() << MSG::VERBOSE << *(m_newtracks->at(i)) << endreq; + msg() << MSG::VERBOSE << *(m_newtracks->at(i)) << endmsg; } } @@ -341,7 +341,7 @@ HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltExecute(const HLT::TriggerEle // Finalize method: HLT::ErrorCode InDet::InDetTrigExtensProcessor::hltFinalize() { - msg() << MSG::INFO << "InDetTrigExtensProcessor::finalize()" << endreq; + msg() << MSG::INFO << "InDetTrigExtensProcessor::finalize()" << endmsg; return HLT::OK; } @@ -365,7 +365,7 @@ Trk::Track* InDet::InDetTrigExtensProcessor::trackPlusExtension(const Trk::Track Trk::TrackStateOnSurface* tsos = new Trk::TrackStateOnSurface((**it)); extendedTrajectory->push_back( tsos ); } else - msg() << MSG::WARNING << "NULL trackStateOnSurface" << endreq; + msg() << MSG::WARNING << "NULL trackStateOnSurface" << endmsg; } } @@ -380,7 +380,7 @@ Trk::Track* InDet::InDetTrigExtensProcessor::trackPlusExtension(const Trk::Track const Trk::TrackStateOnSurface* aState = new Trk::TrackStateOnSurface((*it)->clone(),0,0,0,typePattern); extendedTrajectory->push_back( aState ); } else { - msg() << MSG::WARNING << "NULL trackStateOnSurface" << endreq; + msg() << MSG::WARNING << "NULL trackStateOnSurface" << endmsg; } } } @@ -391,6 +391,6 @@ Trk::Track* InDet::InDetTrigExtensProcessor::trackPlusExtension(const Trk::Track ( siTrack->fitQuality() ? siTrack->fitQuality()->clone() : 0 ) ); if (outputLevel <= MSG::DEBUG) msg() << MSG::VERBOSE << "rejected extension saved as Trk::Track with " << nSiStates - << " fitted hits and " << nExtStates << " additional Outliers." << endreq; + << " fitted hits and " << nExtStates << " additional Outliers." << endmsg; return extTrack; } diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx index f02ac46123a..eac9e0ccbb1 100755 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx @@ -132,7 +132,7 @@ namespace InDet{ /* StatusCode sc = m_rawDataProvider->initContainer(); if (sc.isFailure()) - msg() << MSG::WARNING << "RDO container cannot be registered" << endreq; + msg() << MSG::WARNING << "RDO container cannot be registered" << endmsg; */ return HLT::OK; } @@ -505,7 +505,7 @@ namespace InDet{ m_numPixClusters+= m_clusterCollection->size(); /*if ( m_clusterContainer->indexFind(clusterCollection->identifyHash()) != m_clusterContainer->end() ) - msg() << MSG::INFO << "FOUND Cluster collection :" << clusterCollection->identifyHash() << endreq; */ + msg() << MSG::INFO << "FOUND Cluster collection :" << clusterCollection->identifyHash() << endmsg; */ if (m_clusterContainer->addCollection( m_clusterCollection, m_clusterCollection->identifyHash() ).isFailure()) { diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx index 633fcd849c6..ae73262a2e3 100755 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx @@ -130,7 +130,7 @@ namespace InDet{ /* StatusCode sc = m_rawDataProvider->initContainer(); if (sc.isFailure()) - msg() << MSG::WARNING << "RDO container cannot be registered" << endreq; + msg() << MSG::WARNING << "RDO container cannot be registered" << endmsg; */ return HLT::OK; } diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx index 32cfe4f3911..db70ea43a48 100755 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx @@ -91,7 +91,7 @@ namespace InDet{ /* StatusCode sc = m_rawDataProvider->initContainer(); if (sc.isFailure()) - msg() << MSG::WARNING << "RDO container cannot be registered" << endreq; + msg() << MSG::WARNING << "RDO container cannot be registered" << endmsg; */ return HLT::OK; } @@ -494,7 +494,7 @@ namespace InDet{ //sc = store()->setConst(m_riocontainer); //if(sc.isFailure()) { //msg() << MSG::ERROR - //<< " ??? " <<endreq; + //<< " ??? " <<endmsg; //return sc; //} diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx index b952e984226..c968ce91d3c 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx @@ -47,55 +47,55 @@ namespace InDet { // Initialize StatusCode TrigPixRawDataProvider::initialize() { - msg(MSG::INFO) << "TrigPixRawDataProvider::initialize" << endreq; + msg(MSG::INFO) << "TrigPixRawDataProvider::initialize" << endmsg; if ( m_regionSelector.retrieve().isFailure() ) { msg(MSG::FATAL) << m_regionSelector.propertyName() << " : Unable to retrieve RegionSelector tool " - << m_regionSelector.type() << endreq; + << m_regionSelector.type() << endmsg; return StatusCode::FAILURE; } // Get ROBDataProviderSvc if (m_robDataProvider.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endreq; + msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endmsg; // Get PixelRawDataProviderTool if (m_rawDataTool.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endreq; + msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endmsg; // Get an detector store if (m_detStore.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_detStore << endreq; + msg(MSG::INFO) << "Retrieved service " << m_detStore << endmsg; StatusCode sc = m_detStore->retrieve(m_id,"PixelID"); if (sc.isFailure()) { msg(MSG::FATAL) << "Cannot retrieve Pixel ID helper!" - << endreq; + << endmsg; return StatusCode::FAILURE; } // Get StoreGateSvc if (m_storeGate.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve service " << m_storeGate << endreq; + msg(MSG::FATAL) << "Failed to retrieve service " << m_storeGate << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_storeGate << endreq; + msg(MSG::INFO) << "Retrieved service " << m_storeGate << endmsg; // Retrieve id mapping if (m_IdMapping.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_IdMapping << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_IdMapping << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved tool " << m_IdMapping << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_IdMapping << endmsg; //RDO container m_container = new PixelRDO_Container(m_id->wafer_hash_max()); @@ -114,21 +114,21 @@ namespace InDet { // record into StoreGate m_container->cleanup(); if (m_storeGate->record(m_container, m_RDO_Key).isFailure()) { - msg(MSG::FATAL) << "Unable to record Pixel RDO Container" << endreq; + msg(MSG::FATAL) << "Unable to record Pixel RDO Container" << endmsg; return StatusCode::FAILURE; } else { msg(MSG::DEBUG) << "Pixel RDO Container " << m_RDO_Key - << " recorded into SG" << endreq; + << " recorded into SG" << endmsg; } } else { if (!m_storeGate->retrieve(m_container,m_RDO_Key)){ msg(MSG::FATAL) << "Unable to retrieve existing Pixel RDO Container " - << m_RDO_Key << endreq; + << m_RDO_Key << endmsg; return StatusCode::FAILURE; } else { msg(MSG::DEBUG) << "Retrieved existing Pixel RDO Container" - << m_RDO_Key << endreq; + << m_RDO_Key << endmsg; } } return sc; @@ -150,14 +150,14 @@ namespace InDet { *roi, robIDlist); } else { - msg(MSG::ERROR) << name() << " invoked without an RoI data " << endreq; + msg(MSG::ERROR) << name() << " invoked without an RoI data " << endmsg; return StatusCode::FAILURE; //robIDlist = m_IdMapping->getAllRods(); } StatusCode sg = initContainer(); if (sg.isFailure()){ - msg(MSG::ERROR) << "cannot get RDO container" << endreq; + msg(MSG::ERROR) << "cannot get RDO container" << endmsg; return StatusCode::FAILURE; } @@ -170,7 +170,7 @@ namespace InDet { if (m_container){ scon = m_rawDataTool->convert(listOfRobf,m_container); if (scon==StatusCode::FAILURE) - msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq; + msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg; } return scon; } diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx index b7623e7529c..448c7f7f316 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx @@ -49,56 +49,56 @@ namespace InDet { // Initialize StatusCode TrigSCTRawDataProvider::initialize() { - msg(MSG::INFO) << "TrigSCTRawDataProvider::initialize" << endreq; + msg(MSG::INFO) << "TrigSCTRawDataProvider::initialize" << endmsg; if ( m_regionSelector.retrieve().isFailure() ) { msg(MSG::FATAL) << m_regionSelector.propertyName() << " : Unable to retrieve RegionSelector tool " - << m_regionSelector.type() << endreq; + << m_regionSelector.type() << endmsg; return StatusCode::FAILURE; } // Get ROBDataProviderSvc if (m_robDataProvider.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endreq; + msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endmsg; // Get SCTRawDataProviderTool if (m_rawDataTool.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endreq; + msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endmsg; // Get an detector store if (m_detStore.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_detStore << endreq; + msg(MSG::INFO) << "Retrieved service " << m_detStore << endmsg; StatusCode sc = m_detStore->retrieve(m_id,"SCT_ID"); if (sc.isFailure()) { msg(MSG::FATAL) << "Cannot retrieve SCT_ID helper!" - << endreq; + << endmsg; return StatusCode::FAILURE; } // Get StoreGateSvc if (m_storeGate.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve servive " << m_storeGate << endreq; + msg(MSG::FATAL) << "Failed to retrieve servive " << m_storeGate << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_storeGate << endreq; + msg(MSG::INFO) << "Retrieved service " << m_storeGate << endmsg; // Retrieve id mapping if (m_cablingSvc.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve service " << m_cablingSvc << endreq; + msg(MSG::FATAL) << "Failed to retrieve service " << m_cablingSvc << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_cablingSvc << endreq; + msg(MSG::INFO) << "Retrieved service " << m_cablingSvc << endmsg; //RDO Container m_container = new SCT_RDO_Container(m_id->wafer_hash_max()); @@ -109,7 +109,7 @@ namespace InDet { int priority = 100; pIncsvc->addListener( this, "BeginEvent", priority); } else { - msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup" << endreq; + msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup" << endmsg; return StatusCode::FAILURE; } @@ -133,17 +133,17 @@ namespace InDet { // now create the container and register the collections // write into StoreGate if (m_storeGate->record(m_container, m_RDO_Key).isFailure()) { - msg(MSG::FATAL) << "Unable to record SCT RDO Container" << endreq; + msg(MSG::FATAL) << "Unable to record SCT RDO Container" << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::DEBUG) << "SCT RDO Container recorded into SG" << endreq; + msg(MSG::DEBUG) << "SCT RDO Container recorded into SG" << endmsg; } } else { if (!m_storeGate->retrieve(m_container,m_RDO_Key)){ - msg(MSG::FATAL) << "Unable to retrieve existing SCT RDO Container" << endreq; + msg(MSG::FATAL) << "Unable to retrieve existing SCT RDO Container" << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::DEBUG) << "Retrieved existing SCT RDO Container" << endreq; + msg(MSG::DEBUG) << "Retrieved existing SCT RDO Container" << endmsg; } } @@ -174,7 +174,7 @@ namespace InDet { StatusCode sg = initContainer(); if (sg.isFailure()){ - msg(MSG::WARNING) << "RDO container cannot be registered" << endreq; + msg(MSG::WARNING) << "RDO container cannot be registered" << endmsg; return StatusCode::FAILURE; } @@ -187,7 +187,7 @@ namespace InDet { if (m_container){ scon = m_rawDataTool->convert(listOfRobf,m_container); if (scon==StatusCode::FAILURE) - msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq; + msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg; } return scon; diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx index 43333e307ad..aae5d8522a8 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx @@ -44,56 +44,56 @@ namespace InDet { // Initialize StatusCode TrigTRTRawDataProvider::initialize() { - msg(MSG::INFO) << "TrigTRTRawDataProvider::initialize" << endreq; + msg(MSG::INFO) << "TrigTRTRawDataProvider::initialize" << endmsg; if ( m_regionSelector.retrieve().isFailure() ) { msg(MSG::FATAL) << m_regionSelector.propertyName() << " : Unable to retrieve RegionSelector tool " - << m_regionSelector.type() << endreq; + << m_regionSelector.type() << endmsg; return StatusCode::FAILURE; } // Get ROBDataProviderSvc if (m_robDataProvider.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_robDataProvider << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endreq; + msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endmsg; // Get TRTRawDataProviderTool if (m_rawDataTool.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_rawDataTool << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endreq; + msg(MSG::INFO) << "Retrieved service " << m_rawDataTool << endmsg; // Get an detector store if (m_detStore.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endreq; + msg(MSG::FATAL) << "Failed to retrieve " << m_detStore << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_detStore << endreq; + msg(MSG::INFO) << "Retrieved service " << m_detStore << endmsg; StatusCode sc = m_detStore->retrieve(m_id,"TRT_ID"); if (sc.isFailure()) { msg(MSG::FATAL) << "Cannot retrieve TRT ID helper!" - << endreq; + << endmsg; return StatusCode::FAILURE; } // Get StoreGateSvc if (m_storeGate.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve service " << m_storeGate << endreq; + msg(MSG::FATAL) << "Failed to retrieve service " << m_storeGate << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_storeGate << endreq; + msg(MSG::INFO) << "Retrieved service " << m_storeGate << endmsg; // Retrieve id mapping if (m_IdMapping.retrieve().isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve service " << m_IdMapping << endreq; + msg(MSG::FATAL) << "Failed to retrieve service " << m_IdMapping << endmsg; return StatusCode::FAILURE; } else - msg(MSG::INFO) << "Retrieved service " << m_IdMapping << endreq; + msg(MSG::INFO) << "Retrieved service " << m_IdMapping << endmsg; m_container = new TRT_RDO_Container(m_id->straw_layer_hash_max()); m_container ->addRef(); // make sure it is never deleted @@ -107,21 +107,21 @@ namespace InDet { if(!m_storeGate->transientContains<TRT_RDO_Container>(m_RDO_Key)){ - msg(MSG::DEBUG) << "Create TRT RDO Container on first event" << endreq; + msg(MSG::DEBUG) << "Create TRT RDO Container on first event" << endmsg; // now create the container and register the collections // write into StoreGate if (m_storeGate->record(m_container, m_RDO_Key).isFailure()) { - msg(MSG::FATAL) << "Unable to record TRT RDO Container" << endreq; + msg(MSG::FATAL) << "Unable to record TRT RDO Container" << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::DEBUG) << "TRT RDO Container recorded into SG" << endreq; + msg(MSG::DEBUG) << "TRT RDO Container recorded into SG" << endmsg; } } else { if (!m_storeGate->retrieve(m_container,m_RDO_Key)){ - msg(MSG::FATAL) << "Unable to retrieve existing TRT RDO Container" << endreq; + msg(MSG::FATAL) << "Unable to retrieve existing TRT RDO Container" << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::DEBUG) << "Retrieved existing TRT RDO Container" << endreq; + msg(MSG::DEBUG) << "Retrieved existing TRT RDO Container" << endmsg; } } @@ -150,7 +150,7 @@ namespace InDet { StatusCode sg = initContainer(); if (sg.isFailure()){ - msg(MSG::ERROR) << "cannot get RDO container" << endreq; + msg(MSG::ERROR) << "cannot get RDO container" << endmsg; return StatusCode::FAILURE; } @@ -162,7 +162,7 @@ namespace InDet { if (m_container){ scon = m_rawDataTool->convert(listOfRobf,m_container); if (scon==StatusCode::FAILURE) - msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq; + msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg; } return scon; diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx index df1db9af8dc..187a52ad765 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx @@ -168,7 +168,7 @@ namespace InDet // beginRun method: //---------------------------------------------------------------------------- HLT::ErrorCode TrigTrackResidualMonitor::hltBeginRun() { - msg() << MSG::INFO << "TrigTrackResidualMonitor::beginRun()" << endreq; + msg() << MSG::INFO << "TrigTrackResidualMonitor::beginRun()" << endmsg; return HLT::OK; } @@ -179,65 +179,65 @@ namespace InDet /////////////////////////////////////////////////////////////////// HLT::ErrorCode TrigTrackResidualMonitor::hltInitialize() { - msg() << MSG::DEBUG << "initialize() success" << endreq; + msg() << MSG::DEBUG << "initialize() success" << endmsg; //Track Selector Tool if ( m_trackSelectorTool.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve track selector tool " << m_trackSelectorTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve track selector tool " << m_trackSelectorTool << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::INFO << "Retrieved track selector tool " << m_trackSelectorTool << endreq; + msg() << MSG::INFO << "Retrieved track selector tool " << m_trackSelectorTool << endmsg; } //Track Summary Tool if ( m_trkSummaryTool.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve track summary tool " << m_trkSummaryTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve track summary tool " << m_trkSummaryTool << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::INFO << "Retrieved track summary tool " << m_trkSummaryTool << endreq; + msg() << MSG::INFO << "Retrieved track summary tool " << m_trkSummaryTool << endmsg; } //Residual Pool Calculator Tool if ( m_residualPullCalculator.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve ResidualPull Calculator " << m_residualPullCalculator << endreq; + msg() << MSG::FATAL << "Failed to retrieve ResidualPull Calculator " << m_residualPullCalculator << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::INFO << "Retrieved ResidualPull Calculator " << m_residualPullCalculator << endreq; + msg() << MSG::INFO << "Retrieved ResidualPull Calculator " << m_residualPullCalculator << endmsg; } //detStore StoreGateSvc* detStore(0); StatusCode sc = service("DetectorStore", detStore); if (sc.isFailure()){ - msg() << MSG::FATAL << "Detector service not found !" << endreq; + msg() << MSG::FATAL << "Detector service not found !" << endmsg; return HLT::BAD_ALGO_CONFIG; } - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Detector service found" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Detector service found" << endmsg; //idHelper ATLAS ID if (detStore->retrieve(m_idHelper, "AtlasID").isFailure()) { - msg() << MSG::FATAL << "Could not get Atlas ID helper" << endreq; + msg() << MSG::FATAL << "Could not get Atlas ID helper" << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::DEBUG << "Atlas id Helper found !" << endreq; + msg() << MSG::DEBUG << "Atlas id Helper found !" << endmsg; } //Pixel ID const PixelID * IdHelperPixel(0); if (detStore->retrieve(IdHelperPixel, "PixelID").isFailure()) { - msg() << MSG::FATAL << "Could not get Pixel ID helper" << endreq; + msg() << MSG::FATAL << "Could not get Pixel ID helper" << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::DEBUG << "Pixel Id Helper found !" << endreq; + msg() << MSG::DEBUG << "Pixel Id Helper found !" << endmsg; } m_idHelperPixel = IdHelperPixel; @@ -246,11 +246,11 @@ namespace InDet //SCT ID const SCT_ID * IdHelperSCT(0); if (detStore->retrieve(IdHelperSCT, "SCT_ID").isFailure()) { - msg() << MSG::FATAL << "Could not get SCT ID helper" << endreq; + msg() << MSG::FATAL << "Could not get SCT ID helper" << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::DEBUG << "SCT Id Helper found !" << endreq; + msg() << MSG::DEBUG << "SCT Id Helper found !" << endmsg; } m_idHelperSCT = IdHelperSCT; @@ -258,40 +258,40 @@ namespace InDet ///SCT Manager if(detStore->retrieve(m_SCT_Manager, "SCT").isFailure()){ - msg() << MSG::FATAL << "Could not get SCT_Manager !" << endreq; + msg() << MSG::FATAL << "Could not get SCT_Manager !" << endmsg; } else{ - msg() << MSG::DEBUG << "SCT manager found !" << endreq; + msg() << MSG::DEBUG << "SCT manager found !" << endmsg; } // Pixel Manager if(detStore->retrieve(m_Pixel_Manager, "Pixel").isFailure()){ - msg() << MSG::FATAL << "Could not get Pixel_Manager !" << endreq; + msg() << MSG::FATAL << "Could not get Pixel_Manager !" << endmsg; } else{ - msg() << MSG::DEBUG << "Pixel manager found !" << endreq; + msg() << MSG::DEBUG << "Pixel manager found !" << endmsg; } //Get Updator if (m_updator.retrieve().isFailure()) { - msg() << MSG::FATAL << "Can not retrieve Updator of type " << m_updator.typeAndName() << endreq; + msg() << MSG::FATAL << "Can not retrieve Updator of type " << m_updator.typeAndName() << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::INFO << "Retrieved tool " << m_updator.typeAndName() << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_updator.typeAndName() << endmsg; } // Get Propagator if (m_propagator.retrieve().isFailure()) { - msg() << MSG::FATAL << "Can not retrieve Updator of type " << m_propagator.typeAndName() << endreq; + msg() << MSG::FATAL << "Can not retrieve Updator of type " << m_propagator.typeAndName() << endmsg; return HLT::BAD_ALGO_CONFIG; } else{ - msg() << MSG::INFO << "Retrieved tool " << m_propagator.typeAndName() << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_propagator.typeAndName() << endmsg; } return HLT::OK; @@ -311,7 +311,7 @@ namespace InDet int outputLevel = msgLvl(); if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << "execHLTAlgorithm()" << endreq; + msg() << MSG::DEBUG << "execHLTAlgorithm()" << endmsg; ////// histogram variables ///////// @@ -388,21 +388,21 @@ namespace InDet //initialize monitored objects m_allTracksFromStoreGate = 0; if ( HLT::OK != getFeature(outputTE, m_allTracksFromStoreGate) ) { - msg() << MSG::ERROR << " Input track collection could not be found " << endreq; + msg() << MSG::ERROR << " Input track collection could not be found " << endmsg; return HLT::NAV_ERROR; } if(!m_allTracksFromStoreGate){ if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Input track collection was not attached. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Input track collection was not attached. Algorithm not executed!" << endmsg; return HLT::OK; } else { if(outputLevel <= MSG::VERBOSE) - msg() << MSG::VERBOSE << " Input track collection has size " << m_allTracksFromStoreGate->size() << endreq; + msg() << MSG::VERBOSE << " Input track collection has size " << m_allTracksFromStoreGate->size() << endmsg; if ( m_allTracksFromStoreGate->size() == 0 ) { if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endreq; + msg() << MSG::DEBUG << " Input track collection has 0 size. Algorithm not executed!" << endmsg; return HLT::OK; } } @@ -692,7 +692,7 @@ namespace InDet HLT::ErrorCode TrigTrackResidualMonitor::hltFinalize() { - msg() << MSG::DEBUG << "finalize() success" << endreq; + msg() << MSG::DEBUG << "finalize() success" << endmsg; return HLT::OK; } @@ -701,7 +701,7 @@ namespace InDet //---------------------------------------------------------------------------- HLT::ErrorCode TrigTrackResidualMonitor::hltEndRun() { - msg() << MSG::INFO << "TrigTrackResidualMonitor::endRun()" << endreq; + msg() << MSG::INFO << "TrigTrackResidualMonitor::endRun()" << endmsg; return HLT::OK; } diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx index 0b75d9744ba..4d3a2e91165 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx @@ -38,7 +38,7 @@ namespace InDet // beginRun method: //---------------------------------------------------------------------------- HLT::ErrorCode TrigTrackSlimmer::hltBeginRun() { - msg() << MSG::INFO << "TrigTrackSlimmer::beginRun()" << endreq; + msg() << MSG::INFO << "TrigTrackSlimmer::beginRun()" << endmsg; return HLT::OK; } @@ -49,21 +49,21 @@ namespace InDet /////////////////////////////////////////////////////////////////// HLT::ErrorCode TrigTrackSlimmer::hltInitialize() { - msg() << MSG::DEBUG << "initialize() success" << endreq; + msg() << MSG::DEBUG << "initialize() success" << endmsg; if ( m_trackSlimmingTool.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Failed to retrieve tool " << m_trackSlimmingTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve tool " << m_trackSlimmingTool << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else{ - msg() << MSG::INFO << "Retrieved tool " << m_trackSlimmingTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_trackSlimmingTool << endmsg; } if ( m_sumTool.retrieve().isFailure()){ - msg() << MSG::FATAL << "Failed to retrieve trk::summary tool " << m_sumTool << endreq; + msg() << MSG::FATAL << "Failed to retrieve trk::summary tool " << m_sumTool << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else { - msg() << MSG::INFO << "Retrieved tool " << m_sumTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_sumTool << endmsg; } @@ -80,7 +80,7 @@ namespace InDet int inputTracks(-1); if(outputLevel <= MSG::DEBUG) - msg() << MSG::DEBUG << "execHLTAlgorithm()" << endreq; + msg() << MSG::DEBUG << "execHLTAlgorithm()" << endmsg; //---------------------------------------------------------------------- // Navigate throw the trigger element to retrieve the last TrackCollection @@ -89,7 +89,7 @@ namespace InDet //initialize monitored objects m_allTracksFromStoreGate = 0; if ( HLT::OK != getFeature(outputTE, m_allTracksFromStoreGate) ) { - msg() << MSG::ERROR << " Input track collection could not be found " << endreq; + msg() << MSG::ERROR << " Input track collection could not be found " << endmsg; return HLT::NAV_ERROR; } @@ -98,11 +98,11 @@ namespace InDet if(!m_allTracksFromStoreGate){ msg() << MSG::INFO - << " Input track collection was not attached. Algorithm not executed!" << endreq; + << " Input track collection was not attached. Algorithm not executed!" << endmsg; } else { inputTracks = m_allTracksFromStoreGate->size(); if(outputLevel <= MSG::VERBOSE) - msg() << MSG::VERBOSE << " Input track collection has size " << inputTracks << endreq; + msg() << MSG::VERBOSE << " Input track collection has size " << inputTracks << endmsg; for (TrackCollection::const_iterator it = m_allTracksFromStoreGate->begin() ; it != m_allTracksFromStoreGate->end() ; ++it) { @@ -117,14 +117,14 @@ namespace InDet } if ( HLT::OK != attachFeature(outputTE, slimmedTracks, name()) ) { - msg() << MSG::ERROR << "Could not attach feature to the TE" << endreq; + msg() << MSG::ERROR << "Could not attach feature to the TE" << endmsg; return HLT::NAV_ERROR; } else{ if(outputLevel <= MSG::DEBUG){ msg() << MSG::DEBUG << "REGTEST: after TrackSlimmer " << slimmedTracks->size() - << " of " << inputTracks << " tracks." << endreq; + << " of " << inputTracks << " tracks." << endmsg; } } @@ -138,7 +138,7 @@ namespace InDet HLT::ErrorCode TrigTrackSlimmer::hltFinalize() { - msg() << MSG::DEBUG << "finalize() success" << endreq; + msg() << MSG::DEBUG << "finalize() success" << endmsg; return HLT::OK; } @@ -147,7 +147,7 @@ namespace InDet //---------------------------------------------------------------------------- HLT::ErrorCode TrigTrackSlimmer::hltEndRun() { - msg() << MSG::INFO << "TrigTrackSlimmer::endRun()" << endreq; + msg() << MSG::INFO << "TrigTrackSlimmer::endRun()" << endmsg; return HLT::OK; } diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SCT_TrigSpacePointTool.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SCT_TrigSpacePointTool.cxx index 29642905095..239b24d7d46 100755 --- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SCT_TrigSpacePointTool.cxx +++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SCT_TrigSpacePointTool.cxx @@ -138,17 +138,17 @@ addSCT_SpacePoints(const SCT_ClusterCollection* clusCollection, if(!m_Sct_clcontainer || m_Sct_clcontainer->size() <1){ msg(MSG::ERROR) << " Received an invalid cluster container " - << endreq; + << endmsg; return; } if(!clusCollection){ msg(MSG::ERROR) << " Received an invalid cluster collection " - << endreq; + << endmsg; return; } if(clusCollection->size()==0){ - msg(MSG::ERROR) << " Received empty cluster collection" << endreq; + msg(MSG::ERROR) << " Received empty cluster collection" << endmsg; return; } diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx index 2ade315e4e9..edec62dcf90 100755 --- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx +++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx @@ -369,7 +369,7 @@ namespace InDet{ sc = store()->retrieve(m_spOverlapColl, m_spOverlapName); if (sc.isFailure()) { - msg() << MSG::ERROR << "Failed to get " << m_spOverlapName << endreq; + msg() << MSG::ERROR << "Failed to get " << m_spOverlapName << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else { diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectoryManipulatorID.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectoryManipulatorID.cxx index 7565acae7c8..8d4e6df50a6 100644 --- a/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectoryManipulatorID.cxx +++ b/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectoryManipulatorID.cxx @@ -25,7 +25,7 @@ StatusCode InDet::PRD_TruthTrajectoryManipulatorID::initialize() { ATH_MSG_VERBOSE("Initializing ..."); StatusCode sc = detStore()->retrieve(m_atlasId, "AtlasID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get AtlasID helper !" << endreq; + msg(MSG::ERROR) << "Could not get AtlasID helper !" << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectorySelectorID.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectorySelectorID.cxx index 7202fcab054..3a1f68fe5c9 100644 --- a/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectorySelectorID.cxx +++ b/InnerDetector/InDetTruth/InDetTruthTools/src/PRD_TruthTrajectorySelectorID.cxx @@ -27,7 +27,7 @@ StatusCode InDet::PRD_TruthTrajectorySelectorID::initialize() { ATH_MSG_VERBOSE("Initializing ..."); StatusCode sc = detStore()->retrieve(m_atlasId, "AtlasID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get AtlasID helper !" << endreq; + msg(MSG::ERROR) << "Could not get AtlasID helper !" << endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx index 230c84a16f2..6b918f7e1ad 100644 --- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx +++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx @@ -62,14 +62,14 @@ StatusCode InDet::SegmentDriftCircleAssValidation::initialize() // Get output print level // - if(msgLvl(MSG::DEBUG)){m_nprint=0; msg(MSG::DEBUG) << (*this) << endreq;} + if(msgLvl(MSG::DEBUG)){m_nprint=0; msg(MSG::DEBUG) << (*this) << endmsg;} // get the Particle Properties Service // IPartPropSvc* partPropSvc = 0; sc = service("PartPropSvc", partPropSvc, true); if (sc.isFailure()) { - msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endreq; + msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endmsg; return StatusCode::FAILURE; } @@ -77,7 +77,7 @@ StatusCode InDet::SegmentDriftCircleAssValidation::initialize() // m_particleDataTable = partPropSvc->PDT(); if(!m_particleDataTable) { - msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endreq; + msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endmsg; return StatusCode::FAILURE; } @@ -96,15 +96,15 @@ StatusCode InDet::SegmentDriftCircleAssValidation::initialize() StatusCode InDet::SegmentDriftCircleAssValidation::execute() { - msg(MSG::DEBUG) << " InDetSegmentDriftCircleAssValidation execute()" << endreq; + msg(MSG::DEBUG) << " InDetSegmentDriftCircleAssValidation execute()" << endmsg; StatusCode sc = evtStore()->retrieve(m_origColTracks,m_origtracklocation); if(sc.isFailure()){ - msg(MSG::FATAL) << "No TRT tracks with name " << m_origtracklocation << " found in StoreGate!" << endreq; + msg(MSG::FATAL) << "No TRT tracks with name " << m_origtracklocation << " found in StoreGate!" << endmsg; return sc; }else{ - msg(MSG::DEBUG) << "Found TRT trak collection " << m_origtracklocation << " in StoreGate!" << endreq; + msg(MSG::DEBUG) << "Found TRT trak collection " << m_origtracklocation << " in StoreGate!" << endmsg; } //*************************************************************************************************** @@ -115,14 +115,14 @@ StatusCode InDet::SegmentDriftCircleAssValidation::execute() if(!m_PRDTruthNameTRT.empty()) { sc = evtStore()->retrieve(prdCollectionVector, m_PRDTruthNameTRT); if (sc.isFailure()){ - msg(MSG::WARNING) << "TRT PRD_MultiTruthCollection "<<m_PRDTruthNameTRT<<" NOT found"<< endreq; + msg(MSG::WARNING) << "TRT PRD_MultiTruthCollection "<<m_PRDTruthNameTRT<<" NOT found"<< endmsg; } else { - msg(MSG::DEBUG) << "Got TRT PRD_MultiTruthCollection "<<m_PRDTruthNameTRT <<endreq; + msg(MSG::DEBUG) << "Got TRT PRD_MultiTruthCollection "<<m_PRDTruthNameTRT <<endmsg; } } m_prdCollectionVector.push_back(prdCollectionVector); //**************************************************************************************************** - msg(MSG::DEBUG) << " prdCollectionVector size " << m_prdCollectionVector.size() << endreq; + msg(MSG::DEBUG) << " prdCollectionVector size " << m_prdCollectionVector.size() << endmsg; newCirclesEvent(); m_nqsegments = QualityTracksSelection(); @@ -135,7 +135,7 @@ StatusCode InDet::SegmentDriftCircleAssValidation::execute() } - if(msgLvl(MSG::DEBUG)){m_nprint=1; msg(MSG::DEBUG) << (*this) << endreq;} + if(msgLvl(MSG::DEBUG)){m_nprint=1; msg(MSG::DEBUG) << (*this) << endmsg;} return StatusCode::SUCCESS; } diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx index aee9d45b97a..5ddb3a06780 100755 --- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx +++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx @@ -114,7 +114,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize() IPartPropSvc* partPropSvc = 0; sc = service("PartPropSvc", partPropSvc, true); if (sc.isFailure()) { - msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endreq; + msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endmsg; return StatusCode::FAILURE; } @@ -122,7 +122,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize() // m_particleDataTable = partPropSvc->PDT(); if(!m_particleDataTable) { - msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endreq; + msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endmsg; return StatusCode::FAILURE; } @@ -131,7 +131,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize() m_outputlevel = msg().level()-MSG::DEBUG; if(m_outputlevel <= 0) { - m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=0; msg(MSG::DEBUG)<<(*this)<<endmsg; } // Erase statistic information @@ -213,7 +213,7 @@ StatusCode InDet::TrackClusterAssValidation::execute() if(m_usePIX) { s = evtStore()->retrieve(m_truthPIX,m_truth_locationPixel); if (s.isFailure()) { - msg(MSG::FATAL)<<"Could not find TruthPixel"<<endreq; + msg(MSG::FATAL)<<"Could not find TruthPixel"<<endmsg; return s; } } @@ -221,7 +221,7 @@ StatusCode InDet::TrackClusterAssValidation::execute() if(m_useSCT) { s = evtStore()->retrieve(m_truthSCT,m_truth_locationSCT); if (s.isFailure()) { - msg(MSG::FATAL)<<"Could not find TruthSCT"<<endreq; + msg(MSG::FATAL)<<"Could not find TruthSCT"<<endmsg; return s; } } @@ -229,7 +229,7 @@ StatusCode InDet::TrackClusterAssValidation::execute() if( m_clcutTRT > 0) { s = evtStore()->retrieve(m_truthTRT,m_truth_locationTRT); if (s.isFailure()) { - msg(MSG::FATAL)<<"Could not find TruthTRT"<<endreq; + msg(MSG::FATAL)<<"Could not find TruthTRT"<<endmsg; return s; } } @@ -246,7 +246,7 @@ StatusCode InDet::TrackClusterAssValidation::execute() } if(m_outputlevel< 0) { - m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endreq; + m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg; } return StatusCode::SUCCESS; } @@ -1293,7 +1293,7 @@ void InDet::TrackClusterAssValidation::newClustersEvent() m_pixcontainer = 0; if(m_usePIX) { sc = evtStore()->retrieve(m_pixcontainer,m_clustersPixelname); - if (sc.isFailure()) msg(MSG::DEBUG)<<"Pixel clusters container"<<endreq; + if (sc.isFailure()) msg(MSG::DEBUG)<<"Pixel clusters container"<<endmsg; } // Get sct clusters container @@ -1301,7 +1301,7 @@ void InDet::TrackClusterAssValidation::newClustersEvent() m_sctcontainer = 0; if(m_useSCT) { sc = evtStore()->retrieve(m_sctcontainer,m_clustersSCTname ); - if (sc.isFailure()) msg(MSG::DEBUG)<<"SCT clusters container"<<endreq; + if (sc.isFailure()) msg(MSG::DEBUG)<<"SCT clusters container"<<endmsg; } // Get trt cluster container @@ -1309,7 +1309,7 @@ void InDet::TrackClusterAssValidation::newClustersEvent() m_trtcontainer = 0; if(m_clcutTRT > 0) { sc = evtStore()->retrieve(m_trtcontainer,m_clustersTRTname ); - if (sc.isFailure()) msg(MSG::DEBUG)<<"TRT drift circles container"<<endreq; + if (sc.isFailure()) msg(MSG::DEBUG)<<"TRT drift circles container"<<endmsg; } int Kine[1000]; @@ -1403,7 +1403,7 @@ void InDet::TrackClusterAssValidation::newSpacePointsEvent() if (evtStore()->contains<SpacePointContainer>(m_spacepointsPixelname)) { if (evtStore()->retrieve(m_spacepointsPixel,m_spacepointsPixelname).isFailure()) - msg(MSG::DEBUG)<<"Pixels space points container"<<endreq; + msg(MSG::DEBUG)<<"Pixels space points container"<<endmsg; if(m_spacepointsPixel) { @@ -1437,7 +1437,7 @@ void InDet::TrackClusterAssValidation::newSpacePointsEvent() if (evtStore()->contains<SpacePointContainer>(m_spacepointsSCTname)) { if (evtStore()->retrieve(m_spacepointsSCT,m_spacepointsSCTname).isFailure()) - msg(MSG::DEBUG)<<"SCT space points container"<<endreq; + msg(MSG::DEBUG)<<"SCT space points container"<<endmsg; if(m_spacepointsSCT) { @@ -1471,7 +1471,7 @@ void InDet::TrackClusterAssValidation::newSpacePointsEvent() if (evtStore()->contains<SpacePointContainer>(m_spacepointsOverlapname)) { if (evtStore()->retrieve(m_spacepointsOverlap,m_spacepointsOverlapname).isFailure()) - msg(MSG::DEBUG)<<"SCT overlap space points container"<<endreq; + msg(MSG::DEBUG)<<"SCT overlap space points container"<<endmsg; if(m_spacepointsOverlap) { diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/InDetTrackSplitterTool.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/InDetTrackSplitterTool.cxx index f385153729f..9f26a7f6b16 100644 --- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/InDetTrackSplitterTool.cxx +++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/InDetTrackSplitterTool.cxx @@ -99,30 +99,30 @@ InDet::InDetTrackSplitterTool::~InDetTrackSplitterTool() { } StatusCode InDet::InDetTrackSplitterTool::initialize() { - msg(MSG::DEBUG) << "In initialize()" << endreq; + msg(MSG::DEBUG) << "In initialize()" << endmsg; /** Get TRT helper */ if ((detStore()->retrieve(m_trtid)).isFailure()) { - msg(MSG::WARNING) << "Problem retrieving TRTID helper" << endreq; + msg(MSG::WARNING) << "Problem retrieving TRTID helper" << endmsg; return StatusCode::SUCCESS; } /** Get SCT helper */ if ((detStore()->retrieve(m_sctid)).isFailure()) { - msg(MSG::WARNING) << "Problem retrieving SCT ID helper" << endreq; + msg(MSG::WARNING) << "Problem retrieving SCT ID helper" << endmsg; return StatusCode::SUCCESS; } /** Fitter */ if(m_trkfitter.retrieve().isFailure()) { - msg(MSG::WARNING) << "Could not find refit tool " << m_trkfitter << endreq; + msg(MSG::WARNING) << "Could not find refit tool " << m_trkfitter << endmsg; return StatusCode::SUCCESS; } - msg(MSG::DEBUG) << "InDetTrackSplitterTool initialized" << endreq; + msg(MSG::DEBUG) << "InDetTrackSplitterTool initialized" << endmsg; return StatusCode::SUCCESS; } @@ -130,7 +130,7 @@ StatusCode InDet::InDetTrackSplitterTool::initialize() //========================================================= StatusCode InDet::InDetTrackSplitterTool::finalize() { - msg(MSG::DEBUG) << "In finalize() "<< endreq; + msg(MSG::DEBUG) << "In finalize() "<< endmsg; return StatusCode::SUCCESS; } @@ -140,7 +140,7 @@ StatusCode InDet::InDetTrackSplitterTool::finalize() std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInUpperLowerTrack(Trk::Track const& input, bool siliconHitsOnly){ //std::cout << "input: " << input << std::endl; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitInUpperLowerTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitInUpperLowerTrack" <<endmsg; //**The returned tracks */ Trk::Track* upperTrack(0); @@ -198,7 +198,7 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInUpperL if (measb) rio=dynamic_cast<const Trk::RIO_OnTrack*>(measb); if(rio){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "an rio..." <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "an rio..." <<endmsg; totalNumberHits++; @@ -240,18 +240,18 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInUpperL lowertraj->push_back((**tsosit).clone()); } }else{ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Not an rio" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Not an rio" <<endmsg; //Trk::PseudoMeasurementOnTrack const* ps = dynamic_cast<Trk::PseudoMeasurementOnTrack const*>(*measb); const Trk::PseudoMeasurementOnTrack *ps = dynamic_cast<const Trk::PseudoMeasurementOnTrack *>(measb); if(ps){ if (!perigeeseen || totalNumberHits==totalNumberTRTHits) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an upper pseudoMeasurement" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an upper pseudoMeasurement" <<endmsg; ++numberUpperPseudoMeas; uppertraj->push_back((**tsosit).clone()); } if (perigeeseen || totalNumberHits==totalNumberTRTHits) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding a lower pseudoMeasurement" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding a lower pseudoMeasurement" <<endmsg; ++numberLowerPseudoMeas; lowertraj->push_back((**tsosit).clone()); } @@ -277,72 +277,72 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInUpperL /** Upper track */ if(isConstrained(numberUpperPixelHits,numberUpperSCTHits,numberUpperTRTHits,numberUpperPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling upper fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling upper fit" << endmsg; //m_upperTrack = m_trkfitter->fit(m_upperHits, *originalPerigee, true, hypo); upperTrack = m_trkfitter->fit(upperorigtrack, false, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling upper fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling upper fit" << endmsg; if(!upperTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Upper Fit Failed!" << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Upper Fit Failed!" << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberUpperPixelHits << " upper Pixel hits, " << numberUpperSCTHits << " upper SCT hits, " << numberUpperTRTHits << "upper TRT hits" << numberUpperPseudoMeas << "upper Pseudomeasurements" - << endreq; + << endmsg; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << totalNumberPixelHits << " total Pixel hits, " << totalNumberSCTHits << " total SCT hits, " << totalNumberTRTHits << "total TRT hits" - << endreq; + << endmsg; } }else{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on upper track. Fit fails." << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on upper track. Fit fails." << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberUpperPixelHits << " upper Pixel hits, " << numberUpperSCTHits << " upper SCT hits, " << numberUpperTRTHits << "upper TRT hits" << numberUpperPseudoMeas << "upper Pseudomeasurements" - << endreq; + << endmsg; } /** lower track */ if(isConstrained(numberLowerPixelHits,numberLowerSCTHits,numberLowerTRTHits,numberLowerPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling lower fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling lower fit" << endmsg; lowerTrack = m_trkfitter->fit(lowerorigtrack, false, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling lower fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling lower fit" << endmsg; if(!lowerTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Lower Fit Failed!" << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Lower Fit Failed!" << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberLowerPixelHits << " upper Pixel hits, " << numberLowerSCTHits << " upper SCT hits, " << numberLowerTRTHits << "upper TRT hits" << numberLowerPseudoMeas << "upper Pseudomeasurements" - << endreq; + << endmsg; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << totalNumberPixelHits << " total Pixel hits, " << totalNumberSCTHits << " total SCT hits, " << totalNumberTRTHits << "total TRT hits" - << endreq; + << endmsg; } }else{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on lower track. Fit fails." << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on lower track. Fit fails." << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberLowerPixelHits << " upper Pixel hits, " << numberLowerSCTHits << " upper SCT hits, " << numberLowerTRTHits << "upper TRT hits" << numberLowerPseudoMeas << "upper Pseudomeasurements" - << endreq; + << endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitInUpperLowerTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitInUpperLowerTrack" <<endmsg; return std::make_pair(upperTrack, lowerTrack); } @@ -350,7 +350,7 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInUpperL */ Trk::Track* InDet::InDetTrackSplitterTool::stripTrack(Trk::Track const& input, bool removeSilicon, bool applyConstraint ){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In stripTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In stripTrack" <<endmsg; /** The returned track */ Trk::Track* outputTrack(0); @@ -364,14 +364,14 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripTrack(Trk::Track const& input, outputTrack = stripTRTFromTrack(input, applyConstraint); } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving stripTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving stripTrack" <<endmsg; return outputTrack; } /** Strip the Si hits, fit the remaining with a theta, z0 constraint. */ Trk::Track* InDet::InDetTrackSplitterTool::stripSiFromTrack(Trk::Track const& input){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In stripSiFromTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In stripSiFromTrack" <<endmsg; /** The returned track */ Trk::Track* outputTrack(0); @@ -399,14 +399,14 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripSiFromTrack(Trk::Track const& in Trk::RIO_OnTrack const* rio = dynamic_cast<Trk::RIO_OnTrack const*>(*meas); if(!rio){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No ROT skipping measurement." <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No ROT skipping measurement." <<endmsg; continue; } Identifier const& surfaceid = (rio->identify()); if(!m_trtid->is_trt(surfaceid)){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Removing Non-TRT hit." <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Removing Non-TRT hit." <<endmsg; continue; } @@ -419,18 +419,18 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripSiFromTrack(Trk::Track const& in // Should be Constrained !!! //if(isConstrained(numberUpperPixelHits,numberUpperSCTHits,numberUpperTRTHits,numberUpperPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling fit" << endmsg; outputTrack = m_trkfitter->fit(m_TRTHits, *originalPerigee, true, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling fit" << endmsg; if(!outputTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Fit Failed!" << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Fit Failed!" << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There were: " << totalNumberTRTHits << "TRT hits" - << endreq; + << endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving stripSiFromTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving stripSiFromTrack" <<endmsg; return outputTrack; } @@ -438,7 +438,7 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripSiFromTrack(Trk::Track const& in /** Strip the TRT hits, fit the remaining with a qOverP constraint */ Trk::Track* InDet::InDetTrackSplitterTool::stripTRTFromTrack(Trk::Track const& input, bool applyConstraint){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In stripTRTFromTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In stripTRTFromTrack" <<endmsg; /** The returned track */ Trk::Track* outputTrack(0); @@ -463,7 +463,7 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripTRTFromTrack(Trk::Track const& i Trk::RIO_OnTrack const* rio = dynamic_cast<Trk::RIO_OnTrack const*>(*meas); if(!rio){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No ROT skipping measurement." <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "No ROT skipping measurement." <<endmsg; continue; } @@ -487,7 +487,7 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripTRTFromTrack(Trk::Track const& i } if(!m_trtid->is_sct(surfaceid) && !m_trtid->is_pixel(surfaceid)){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Removing Non-Si hit." <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Removing Non-Si hit." <<endmsg; continue; } @@ -500,23 +500,23 @@ Trk::Track* InDet::InDetTrackSplitterTool::stripTRTFromTrack(Trk::Track const& i // Should be Constrained !!! //if(isConstrained(numberUpperPixelHits,numberUpperSCTHits,numberUpperTRTHits,numberUpperPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling fit" << endmsg; outputTrack = m_trkfitter->fit(m_SiHits, *originalPerigee, false, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling fit" << endmsg; if(!outputTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Fit Failed!" << endreq ; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There were: " << totalNumberSiHits << "TRT hits" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Fit Failed!" << endmsg ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There were: " << totalNumberSiHits << "TRT hits" << endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving stripTRTFromTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving stripTRTFromTrack" <<endmsg; return outputTrack; } /** Make the qOverP constraint */ Trk::PseudoMeasurementOnTrack const* InDet::InDetTrackSplitterTool::makePConstraint(Trk::Perigee const* perigee,Trk::StraightLineSurface const* trtSurf){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In makePConstraint" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In makePConstraint" <<endmsg; if( !perigee->covariance() ) return 0; @@ -535,16 +535,16 @@ Trk::PseudoMeasurementOnTrack const* InDet::InDetTrackSplitterTool::makePConstra /** Debugging */ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Momentum constraint: "<<perigee->parameters()[Trk::qOverP] <<" cov-value: "<<constraintErrMatrix(0,0) <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Momentum constraint: "<<perigee->parameters()[Trk::qOverP] <<" cov-value: "<<constraintErrMatrix(0,0) <<endmsg; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving makePConstraint" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving makePConstraint" <<endmsg; return psmom; } /** Make the theta and z0 constraint */ Trk::PseudoMeasurementOnTrack const* InDet::InDetTrackSplitterTool::makeThetaZ0Constraint(Trk::Perigee const* perigee){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In makeThetaZ0Constraint" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In makeThetaZ0Constraint" <<endmsg; if( !perigee->covariance() ) return 0; @@ -575,10 +575,10 @@ Trk::PseudoMeasurementOnTrack const* InDet::InDetTrackSplitterTool::makeThetaZ0C /** Debugging */ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"theta constraint: "<<perigee->parameters()[Trk::theta] <<" cov-value: "<<constraintErrMatrix(1,1) <<endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"z0 constraint: "<<perigee->parameters()[Trk::z0] <<" cov-value: "<<constraintErrMatrix(0,0) <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"theta constraint: "<<perigee->parameters()[Trk::theta] <<" cov-value: "<<constraintErrMatrix(1,1) <<endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"z0 constraint: "<<perigee->parameters()[Trk::z0] <<" cov-value: "<<constraintErrMatrix(0,0) <<endmsg; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving makeThetaZ0Constraint" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving makeThetaZ0Constraint" <<endmsg; return psmom; } @@ -587,7 +587,7 @@ Trk::PseudoMeasurementOnTrack const* InDet::InDetTrackSplitterTool::makeThetaZ0C returns a pair of track the first being the upper */ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEvenHitsTrack(Trk::Track const& input){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitInOddEvenHitsTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitInOddEvenHitsTrack" <<endmsg; /** The returned tracks */ Trk::Track* m_oddTrack(0); @@ -639,7 +639,7 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve if(m_trtid->is_trt(surfaceid)) ++numberOddTRTHits; if(!m_trtid->is_sct(surfaceid)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "adding odd hit" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "adding odd hit" <<endmsg; m_oddHits.push_back( *meas); ++totalNumberHits; }else{ @@ -651,20 +651,20 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve /** if the SCT hits hasn't been assigned to a tracks */ if(m_result != m_unusedSCTHits.end()){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "add the (odd) SCT hit" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "add the (odd) SCT hit" <<endmsg; m_oddHits.push_back( *meas); ++totalNumberHits; /** remove hit from unused list */ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endmsg; m_unusedSCTHits.erase(m_result); /** find any other hits with same r phi */ m_result = findSCTHitsFromSameSpacePoint( *meas, m_unusedSCTHits); if(m_result != m_unusedSCTHits.end()){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "adding the other (odd) SCT hit in the spacepoint" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "adding the other (odd) SCT hit in the spacepoint" <<endmsg; m_oddHits.push_back( *m_result); - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endmsg; m_unusedSCTHits.erase(m_result); } } @@ -678,7 +678,7 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve ++numberEvenTRTHits; if(!m_trtid->is_sct(surfaceid)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "add the (even) hit" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "add the (even) hit" <<endmsg; m_evenHits.push_back( *meas); ++totalNumberHits; }else{ @@ -689,20 +689,20 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve /** if the SCT hits hasn't been assigned to a tracks */ if(m_result != m_unusedSCTHits.end()){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "add the (even) SCT hit" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "add the (even) SCT hit" <<endmsg; m_evenHits.push_back( *meas); ++totalNumberHits; /** remove hit from umused list */ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endmsg; m_unusedSCTHits.erase(m_result); /** find any other hits with same r phi */ m_result = findSCTHitsFromSameSpacePoint( *meas, m_unusedSCTHits); if(m_result != m_unusedSCTHits.end()){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "adding the other (even) SCT hit in the spacepoint" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "adding the other (even) SCT hit in the spacepoint" <<endmsg; m_evenHits.push_back( *m_result); - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "removing the SCT hit from unused list" <<endmsg; m_unusedSCTHits.erase(m_result); } } @@ -712,11 +712,11 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve Trk::PseudoMeasurementOnTrack const* ps = dynamic_cast<Trk::PseudoMeasurementOnTrack const*>(*meas); if(ps){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an odd pseudoMeasurement" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an odd pseudoMeasurement" <<endmsg; ++numberOddPseudoMeas; m_oddHits.push_back( ps); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an even pseudoMeasurement" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Adding an even pseudoMeasurement" <<endmsg; ++numberEvenPseudoMeas; m_evenHits.push_back( ps); } @@ -731,49 +731,49 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve /** track must be overconstrained */ if(isConstrained(numberOddPixelHits,numberOddSCTHits,numberOddTRTHits,numberOddPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling odd fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling odd fit" << endmsg; m_oddTrack = m_trkfitter->fit(m_oddHits, *originalPerigee, false, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling odd fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling odd fit" << endmsg; if(!m_oddTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Odd Fit Failed!" << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Odd Fit Failed!" << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberOddPixelHits << " odd Pixel hits, " << numberOddSCTHits << " odd SCT hits, " << numberOddTRTHits << " odd TRT hits" << numberOddPseudoMeas << "odd Pseudomeasurements" - << endreq; + << endmsg; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << totalNumberPixelHits << " total Pixel hits, " << totalNumberSCTHits << " total SCT hits, " << totalNumberTRTHits << "total TRT hits" - << endreq; + << endmsg; } }else - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on odd track. Fit fails." << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on odd track. Fit fails." << endmsg ; /** lower track */ if(isConstrained(numberEvenPixelHits,numberEvenSCTHits,numberEvenTRTHits,numberEvenPseudoMeas)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling even fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "before calling even fit" << endmsg; m_evenTrack = m_trkfitter->fit(m_evenHits, *originalPerigee, false, hypo); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling even fit" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "after calling even fit" << endmsg; if(!m_evenTrack){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Even Fit Failed!" << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Even Fit Failed!" << endmsg ; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There was: " << numberEvenSCTHits << " even si hits and " - << numberEvenTRTHits << "even TRT hits"<< endreq; + << numberEvenTRTHits << "even TRT hits"<< endmsg; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There were: " << totalNumberSCTHits << " total Si hits and " - << totalNumberTRTHits << "total TRT hits"<< endreq; + << totalNumberTRTHits << "total TRT hits"<< endmsg; } }else - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on even track. Fit fails." << endreq ; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Not enough measurements on even track. Fit fails." << endmsg ; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitInOddEvenHitsTrack" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitInOddEvenHitsTrack" <<endmsg; return std::make_pair(m_oddTrack, m_evenTrack); } @@ -786,12 +786,12 @@ std::pair<Trk::Track*, Trk::Track*> InDet::InDetTrackSplitterTool::splitInOddEve (for the moment this is just a d0 cut requiring the track went through TRT cavity */ void InDet::InDetTrackSplitterTool::splitTracks(TrackCollection const* inputTracks){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitTracks" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " In splitTracks" <<endmsg; upperTracks = new TrackCollection(SG::OWN_ELEMENTS); lowerTracks = new TrackCollection(SG::OWN_ELEMENTS); - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "There are: " << inputTracks->size() << " input tracks."<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "There are: " << inputTracks->size() << " input tracks."<< endmsg; TrackCollection::const_iterator it = inputTracks->begin(); TrackCollection::const_iterator itE = inputTracks->end(); @@ -799,7 +799,7 @@ void InDet::InDetTrackSplitterTool::splitTracks(TrackCollection const* inputTrac /** if went though TRT cavity */ if(trackIsCandidate( **it) ){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Track is a candidate."<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Track is a candidate."<< endmsg; std::pair<Trk::Track*, Trk::Track*> splitTracks = this->splitInUpperLowerTrack(**it); //For debugging @@ -807,45 +807,45 @@ void InDet::InDetTrackSplitterTool::splitTracks(TrackCollection const* inputTrac Trk::Track* upperTrack = splitTracks.first; if(upperTrack){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Upper track fit suceeded"<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Upper track fit suceeded"<< endmsg; upperTracks->push_back( upperTrack); }else - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Upper track fit failed!"<< endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Upper track fit failed!"<< endmsg; Trk::Track* lowerTrack = splitTracks.second; if(lowerTrack){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Lower track fit suceeded"<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Lower track fit suceeded"<< endmsg; lowerTracks->push_back( lowerTrack); }else - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Lower track fit failed!"<< endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Lower track fit failed!"<< endmsg; } else - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Track is NOT a candidate."<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Track is NOT a candidate."<< endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There are " << upperTracks->size() << " upper tracks. "<< endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Recording Upper tracks..." << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There are " << upperTracks->size() << " upper tracks. "<< endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Recording Upper tracks..." << endmsg; StatusCode sc = evtStore()->record(upperTracks,m_outputUpperTracksName,false); if (sc.isFailure()){ msg(MSG::FATAL) << "Tracks " << m_outputUpperTracksName << " could not be recorded in StoreGate !" - << endreq; + << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Tracks " << m_outputUpperTracksName << " recorded in StoreGate" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Tracks " << m_outputUpperTracksName << " recorded in StoreGate" << endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There are " << lowerTracks->size() << " lower tracks. "<< endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Recording Upper tracks..." << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "There are " << lowerTracks->size() << " lower tracks. "<< endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Recording Upper tracks..." << endmsg; sc = evtStore()->record(lowerTracks,m_outputLowerTracksName,false); if (sc.isFailure()){ - msg(MSG::FATAL) << "Tracks " << m_outputLowerTracksName << " could not be recorded in StoreGate !"<< endreq; + msg(MSG::FATAL) << "Tracks " << m_outputLowerTracksName << " could not be recorded in StoreGate !"<< endmsg; }else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Tracks " << m_outputLowerTracksName << " recorded in StoreGate" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Tracks " << m_outputLowerTracksName << " recorded in StoreGate" << endmsg; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitTracks" <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Leaving splitTracks" <<endmsg; return; } @@ -854,29 +854,29 @@ void InDet::InDetTrackSplitterTool::splitTracks(TrackCollection const* inputTrac (for the moment this is just a d0 cut requiring the track went through TRT cavity */ bool InDet::InDetTrackSplitterTool::trackIsCandidate(Trk::Track const& inputTrack) const{ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In trackIsCandidate."<< endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "In trackIsCandidate."<< endmsg; Trk::Perigee const* trackPerigee = inputTrack.perigeeParameters(); if (!trackPerigee) { - msg(MSG::WARNING) << "Found track with invalid perigee parameters. Not splitting." << endreq; + msg(MSG::WARNING) << "Found track with invalid perigee parameters. Not splitting." << endmsg; return false; } //Trk::Perigee const* measuredperigee = dynamic_cast<Trk::Perigee const*>( trackPerigee ); double const m_d0 = trackPerigee->parameters()[Trk::d0]; - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "do is: "<< m_d0 << endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "do is: "<< m_d0 << endmsg; /** This can be fleshed out, to have better track selection */ //width of the cavity in the TRT if( fabs(m_d0) < 600){ - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "is a candidate" << endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "is a candidate" << endmsg; return true; } - if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "is NOT a candidate" << endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "is NOT a candidate" << endmsg; return false; } @@ -884,7 +884,7 @@ bool InDet::InDetTrackSplitterTool::trackIsCandidate(Trk::Track const& inputTrac (used for not breaking up SCT space points, when splitting Odd/Even) */ std::vector<Trk::MeasurementBase const*> InDet::InDetTrackSplitterTool::getSCTHits(Trk::Track const& input){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In getSCTHits " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In getSCTHits " << endmsg; std::vector<Trk::MeasurementBase const*> m_SCTHits; DataVector<Trk::MeasurementBase const>::const_iterator meas = input.measurementsOnTrack()->begin(); @@ -896,17 +896,17 @@ std::vector<Trk::MeasurementBase const*> InDet::InDetTrackSplitterTool::getSCTHi if(m_rio){ Identifier const& surfaceid = (m_rio->identify()); if(m_trtid->is_sct(surfaceid)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "we've found an SCT hit " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "we've found an SCT hit " << endmsg; m_SCTHits.push_back(*meas); } } } - //if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "sorting the hits " << endreq; + //if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "sorting the hits " << endmsg; /** order the hits in y */ //std::sort(m_SCTHits.begin(), m_SCTHits.end(), InDetTrackSplitterHelpers::CompareYPosition ); - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving getSCTHits " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving getSCTHits " << endmsg; return m_SCTHits; } @@ -915,7 +915,7 @@ std::vector<Trk::MeasurementBase const*> InDet::InDetTrackSplitterTool::getSCTHi (used for not breaking up SCT space points, when splitting Odd/Even) */ std::vector<Trk::MeasurementBase const*>::iterator InDet::InDetTrackSplitterTool::findSCTHitsFromSameSpacePoint(Trk::MeasurementBase const* m_sctHit, std::vector<Trk::MeasurementBase const*>& m_listOfSCTHits){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in findSCTHitsFromSameSpacePoint " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in findSCTHitsFromSameSpacePoint " << endmsg; std::vector<Trk::MeasurementBase const*>::iterator m_result = m_listOfSCTHits.end(); Trk::RIO_OnTrack const* rio = dynamic_cast<Trk::RIO_OnTrack const*>(m_sctHit); @@ -932,14 +932,14 @@ std::vector<Trk::MeasurementBase const*>::iterator InDet::InDetTrackSplitterTool if(m_candidateRio){ Identifier const& candidateSurfaceid = (m_candidateRio->identify()); if(m_sctid->eta_module(candidateSurfaceid) == targetEta && m_sctid->phi_module(candidateSurfaceid) == targetPhi){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found another hit in the SpacePoint " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Found another hit in the SpacePoint " << endmsg; m_result = find(m_listOfSCTHits.begin(), m_listOfSCTHits.end(), *meas); } } } } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving findSCTHitsFromSameSpacePoint " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving findSCTHitsFromSameSpacePoint " << endmsg; return m_result; } @@ -947,17 +947,17 @@ std::vector<Trk::MeasurementBase const*>::iterator InDet::InDetTrackSplitterTool Logic to check if the track is constrained given the number of various types of hits */ bool InDet::InDetTrackSplitterTool::isConstrained(unsigned int nPixelHits, unsigned int nSCTHits, unsigned int nTRTHits, unsigned int nPseudomeasurements) const{ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In isConstrained " << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In isConstrained " << endmsg; /** Two cases to consider, tracks with Si hits (first case in the ||), and TRT Only tracks (second case) */ if( (( nPixelHits + nSCTHits) > 1 && (2*nPixelHits + nSCTHits + nTRTHits) > 5) || (nPseudomeasurements >= 1 && nTRTHits > 10)){ - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving isConstrained (true)" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving isConstrained (true)" << endmsg; return true; } - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving isConstrained (false)" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Leaving isConstrained (false)" << endmsg; return false; } diff --git a/LArCalorimeter/LArAffectedRegion/src/LArAffectedRegionAlg.cxx b/LArCalorimeter/LArAffectedRegion/src/LArAffectedRegionAlg.cxx index 3557031057f..62d933d5db1 100644 --- a/LArCalorimeter/LArAffectedRegion/src/LArAffectedRegionAlg.cxx +++ b/LArCalorimeter/LArAffectedRegion/src/LArAffectedRegionAlg.cxx @@ -142,7 +142,7 @@ StatusCode LArAffectedRegionAlg::initialize() { if ((m_detStore->regFcn(&ILArHVTool::LoadCalibration,dynamic_cast<ILArHVTool*>(this), MyMethod2,folderName)).isFailure()) { log << MSG::ERROR << "cannot register callback to " << folderName << std::endl; } - log << MSG::INFO << " registered callback to /LAR/DCS/HV folders " << endreq; + log << MSG::INFO << " registered callback to /LAR/DCS/HV folders " << endmsg; */ // register incident handler for begin run diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArReadParamsFromFile.icc b/LArCalorimeter/LArCalibTools/LArCalibTools/LArReadParamsFromFile.icc index 137d299b2e1..6170ab12045 100755 --- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArReadParamsFromFile.icc +++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArReadParamsFromFile.icc @@ -231,7 +231,7 @@ StatusCode LArReadParamsFromFile<DATA>::readFile() { ATH_MSG_VERBOSE ( "LAr HEC Identifier=" << id ); } else if ( subdet == 3 ) { // LArFCAL // id = m_fcalId->channel_id(det,layer,region,eta,phi) ; - // log << MSG::VERBOSE << "LAr FCAL Identifier=" << id << endreq ; + // log << MSG::VERBOSE << "LAr FCAL Identifier=" << id << endmsg ; ATH_MSG_WARNING ( "Subdet=" << subdet << " is LArFCAL -- conversion to online channel not implemented yet!" ); good_chID = false ; @@ -295,7 +295,7 @@ StatusCode LArReadParamsFromFile<DATA>::readFile() { for ( unsigned i=0 ; i<npar ; i++ ) pRead[i] = defaultValue ; for ( unsigned i=0 ; i<npar ; i++ ) { //if ( buffer.eof() ) { - //log << MSG::DEBUG << "end-of-record reached when reading parameter " << i << " of channel " << chID.get_compact() << endreq ; + //log << MSG::DEBUG << "end-of-record reached when reading parameter " << i << " of channel " << chID.get_compact() << endmsg ; //break ; //} buffer >> pRead[i] ; @@ -307,7 +307,7 @@ StatusCode LArReadParamsFromFile<DATA>::readFile() { // store into parameters vector msg() << MSG::VERBOSE << "read ch=" << chID.get_compact() ; for ( unsigned i=0 ; i<npar ; i++ ) msg() << " par[" << i << "]=" << pRead[i] ; - msg() << endreq ; + msg() << endmsg ; for ( unsigned gain=0 ; gain<3 ; gain++ ) { try { StatusCode sc = set(m_dataclass,chID,gain,pRead) ; diff --git a/LArCalorimeter/LArCalibTools/src/CaloCellGroup2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/CaloCellGroup2Ntuple.cxx index 5f89ebccb95..5dcdbac02f2 100644 --- a/LArCalorimeter/LArCalibTools/src/CaloCellGroup2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/CaloCellGroup2Ntuple.cxx @@ -29,13 +29,13 @@ StatusCode CaloCellGroup2Ntuple::stop () { sc=m_nt->addItem("nvalues",nValues,0,1000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'nvalues' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'nvalues' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("values",nValues,values); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'values' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'values' failed" << endmsg; return StatusCode::FAILURE; } @@ -45,13 +45,13 @@ StatusCode CaloCellGroup2Ntuple::stop () { const CaloCell_ID* caloCellId; sc = m_detStore->retrieve(caloCellId,"CaloCell_ID"); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Could not get CaloCellID helper !" << endreq; + (*m_log) << MSG::ERROR << "Could not get CaloCellID helper !" << endmsg; return StatusCode::FAILURE; } bool stat=m_cellGroupList.setDefinition(caloCellId,m_groupInit,*m_log); if (!stat) { - (*m_log) << MSG::ERROR << "CaloCellGroupList::setDefinition failed!" << endreq; + (*m_log) << MSG::ERROR << "CaloCellGroupList::setDefinition failed!" << endmsg; return StatusCode::FAILURE; } m_cellGroupList.printDef(); @@ -73,12 +73,12 @@ StatusCode CaloCellGroup2Ntuple::stop () { //cellCounter++; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if isConnected }//end loop over online ID - (*m_log) << MSG::INFO << "CaloCellGroup2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "CaloCellGroup2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/CaloCondBlob2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/CaloCondBlob2Ntuple.cxx index bd0ea2ed79c..f18e89b974f 100644 --- a/LArCalorimeter/LArCalibTools/src/CaloCondBlob2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/CaloCondBlob2Ntuple.cxx @@ -31,13 +31,13 @@ StatusCode CaloCondBlob2Ntuple::stop () { // sc=m_nt->addItem("nvalues",nValues,0,1000); // if (sc!=StatusCode::SUCCESS) -// {(*m_log) << MSG::ERROR << "addItem 'nvalues' failed" << endreq; +// {(*m_log) << MSG::ERROR << "addItem 'nvalues' failed" << endmsg; // return StatusCode::FAILURE; // } // sc=m_nt->addItem("values",nValues,values); // if (sc!=StatusCode::SUCCESS) -// {(*m_log) << MSG::ERROR << "addItem 'values' failed" << endreq; +// {(*m_log) << MSG::ERROR << "addItem 'values' failed" << endmsg; // return StatusCode::FAILURE; // } @@ -45,14 +45,14 @@ StatusCode CaloCondBlob2Ntuple::stop () { NTuple::Item<float> value; sc=m_nt->addItem("value",value,0,100); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'values' failed" << endreq; + msg(MSG::ERROR) << "addItem 'values' failed" << endmsg; return StatusCode::FAILURE; } const AthenaAttributeList* attrList=0; sc=detStore()->retrieve(attrList,m_folder); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endreq; + msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endmsg; return sc; } @@ -69,7 +69,7 @@ StatusCode CaloCondBlob2Ntuple::stop () { const CaloCell_ID* caloCellId; sc = m_detStore->retrieve(caloCellId,"CaloCell_ID"); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Could not get CaloCellID helper !" << endreq; + (*m_log) << MSG::ERROR << "Could not get CaloCellID helper !" << endmsg; return StatusCode::FAILURE; } @@ -87,11 +87,11 @@ StatusCode CaloCondBlob2Ntuple::stop () { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end loop over hash ids - (*m_log) << MSG::INFO << "CaloCondBlob2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "CaloCondBlob2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArAccumulatedDigits2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArAccumulatedDigits2Ntuple.cxx index 55def6728b0..134cc95a685 100644 --- a/LArCalorimeter/LArCalibTools/src/LArAccumulatedDigits2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArAccumulatedDigits2Ntuple.cxx @@ -27,11 +27,11 @@ LArAccumulatedDigits2Ntuple::~LArAccumulatedDigits2Ntuple() StatusCode LArAccumulatedDigits2Ntuple::initialize() { - msg(MSG::INFO) << "in initialize" << endreq; + msg(MSG::INFO) << "in initialize" << endmsg; StatusCode sc=LArCond2NtupleBase::initialize(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Base init failed" << endreq; + msg(MSG::ERROR) << "Base init failed" << endmsg; return StatusCode::FAILURE; } @@ -39,49 +39,49 @@ StatusCode LArAccumulatedDigits2Ntuple::initialize() sc=m_nt->addItem("IEvent",m_IEvent,0,3000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'IEvent' failed" << endreq; + msg(MSG::ERROR) << "addItem 'IEvent' failed" << endmsg; return sc; } sc=m_nt->addItem("Ntrigger",m_Ntrigger,0,500); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Ntrigger' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Ntrigger' failed" << endmsg; return sc; } sc=m_nt->addItem("Nsamples",m_ntNsamples,0,32); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Nsamples' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Nsamples' failed" << endmsg; return sc; } sc=m_nt->addItem("sum",m_Nsamples,m_sum); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'sum' failed" << endreq; + msg(MSG::ERROR) << "addItem 'sum' failed" << endmsg; return sc; } sc=m_nt->addItem("sumsq",m_Nsamples,m_sumsq); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'sumsq' failed" << endreq; + msg(MSG::ERROR) << "addItem 'sumsq' failed" << endmsg; return sc; } sc=m_nt->addItem("mean",m_mean); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'mean' failed" << endreq; + msg(MSG::ERROR) << "addItem 'mean' failed" << endmsg; return sc; } sc=m_nt->addItem("rms",m_rms); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'rms' failed" << endreq; + msg(MSG::ERROR) << "addItem 'rms' failed" << endmsg; return sc; } sc=m_nt->addItem("covr",m_Nsamples-1,m_covr); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'covr' failed" << endreq; + msg(MSG::ERROR) << "addItem 'covr' failed" << endmsg; return sc; } @@ -99,17 +99,17 @@ StatusCode LArAccumulatedDigits2Ntuple::execute() StatusCode sc; - msg(MSG::DEBUG) << "in execute" << endreq; + msg(MSG::DEBUG) << "in execute" << endmsg; m_event++; const LArAccumulatedDigitContainer* accuDigitContainer = NULL; sc=detStore()->retrieve(accuDigitContainer,m_contKey); if (sc!=StatusCode::SUCCESS) { - msg(MSG::WARNING) << "Unable to retrieve LArAccumulatedDigitContainer with key " << m_contKey << " from DetectorStore. " << endreq; + msg(MSG::WARNING) << "Unable to retrieve LArAccumulatedDigitContainer with key " << m_contKey << " from DetectorStore. " << endmsg; } else - msg(MSG::DEBUG) << "Got LArAccumulatedDigitContainer with key " << m_contKey << endreq; + msg(MSG::DEBUG) << "Got LArAccumulatedDigitContainer with key " << m_contKey << endmsg; if (accuDigitContainer) { @@ -118,10 +118,10 @@ StatusCode LArAccumulatedDigits2Ntuple::execute() LArAccumulatedDigitContainer::const_iterator it_e=accuDigitContainer->end(); if(it == it_e) { - msg(MSG::DEBUG) << "LArAccumulatedDigitContainer with key=" << m_contKey << " is empty " << endreq; + msg(MSG::DEBUG) << "LArAccumulatedDigitContainer with key=" << m_contKey << " is empty " << endmsg; return StatusCode::SUCCESS; }else{ - msg(MSG::DEBUG) << "LArAccumulatedDigitContainer with key=" << m_contKey << " has " <<accuDigitContainer->size() << " entries" <<endreq; + msg(MSG::DEBUG) << "LArAccumulatedDigitContainer with key=" << m_contKey << " has " <<accuDigitContainer->size() << " entries" <<endmsg; } unsigned cellCounter=0; @@ -136,7 +136,7 @@ StatusCode LArAccumulatedDigits2Ntuple::execute() if(trueMaxSample>m_Nsamples){ if(!m_ipass){ - msg(MSG::WARNING) << "The number of samples in data is larger than the one specified by JO: " << trueMaxSample << " > " << m_Nsamples << " --> only " << m_Nsamples << " will be available in the ntuple " << endreq; + msg(MSG::WARNING) << "The number of samples in data is larger than the one specified by JO: " << trueMaxSample << " > " << m_Nsamples << " --> only " << m_Nsamples << " will be available in the ntuple " << endmsg; m_ipass=1; } trueMaxSample = m_Nsamples; @@ -159,12 +159,12 @@ StatusCode LArAccumulatedDigits2Ntuple::execute() fillFromIdentifier((*it)->hardwareID()); sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return sc; } cellCounter++; } } - msg(MSG::DEBUG) << "LArAccumulatedDigits2Ntuple has finished." << endreq; + msg(MSG::DEBUG) << "LArAccumulatedDigits2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx index 2fa9f6bdd31..06948fdab50 100755 --- a/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx @@ -30,19 +30,19 @@ StatusCode LArAutoCorr2Ntuple::stop() { NTuple::Item<long> gain, cellIndex; sc=m_nt->addItem("gain",gain,0,3); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("cellIndex",cellIndex,0,200000); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'cellIndex' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'cellIndex' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("covr",m_nsamples-1,cov); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'covr' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'covr' failed" << endmsg; return StatusCode::FAILURE; } @@ -50,7 +50,7 @@ StatusCode LArAutoCorr2Ntuple::stop() { sc=m_detStore->retrieve(larAutoCorr,m_objKey); if (sc!=StatusCode::SUCCESS){ (*m_log) << MSG::ERROR << "Unable to retrieve ILArAutoCorr with key " - << m_objKey << " from DetectorStore" << endreq; + << m_objKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -73,7 +73,7 @@ StatusCode LArAutoCorr2Ntuple::stop() { sc = ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } cellCounter++; @@ -81,7 +81,7 @@ StatusCode LArAutoCorr2Ntuple::stop() { }//end if loop over cells }//end if loop over gains - (*m_log) << MSG::INFO << "LArAutoCorr2Ntuple has finished, " << cellCounter << "records written, " << cellZeroCounter << " zero length vectors" << endreq; + (*m_log) << MSG::INFO << "LArAutoCorr2Ntuple has finished, " << cellCounter << "records written, " << cellZeroCounter << " zero length vectors" << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArCaliWaves2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArCaliWaves2Ntuple.cxx index 694dc3d53ae..2f7e4dadb54 100755 --- a/LArCalorimeter/LArCalibTools/src/LArCaliWaves2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArCaliWaves2Ntuple.cxx @@ -43,28 +43,28 @@ StatusCode LArCaliWaves2Ntuple::stop() // Check DACSatur jobOption consistency, in case setup default values if ( m_dacSaturSkip && m_dacSaturLayer0.size()<3 ) { - (*m_log) << MSG::WARNING << "DACSaturPS jobOption has wrong size. Will use default." << endreq ; + (*m_log) << MSG::WARNING << "DACSaturPS jobOption has wrong size. Will use default." << endmsg ; m_dacSaturLayer0.resize(3); m_dacSaturLayer0[0] = 15000 ; m_dacSaturLayer0[1] = 50000 ; m_dacSaturLayer0[2] = 65000 ; } if ( m_dacSaturSkip && m_dacSaturLayer1.size()<3 ) { - (*m_log) << MSG::WARNING << "DACSaturStrips jobOption has wrong size. Will use default." << endreq ; + (*m_log) << MSG::WARNING << "DACSaturStrips jobOption has wrong size. Will use default." << endmsg ; m_dacSaturLayer1.resize(3); m_dacSaturLayer1[0] = 800 ; m_dacSaturLayer1[1] = 8000 ; m_dacSaturLayer1[2] = 65000 ; } if ( m_dacSaturSkip && m_dacSaturLayer2.size()<3 ) { - (*m_log) << MSG::WARNING << "DACSaturMiddle jobOption has wrong size. Will use default." << endreq ; + (*m_log) << MSG::WARNING << "DACSaturMiddle jobOption has wrong size. Will use default." << endmsg ; m_dacSaturLayer2.resize(3); m_dacSaturLayer2[0] = 1000 ; m_dacSaturLayer2[1] = 10000 ; m_dacSaturLayer2[2] = 65000 ; } if ( m_dacSaturSkip && m_dacSaturLayer3.size()<3 ) { - (*m_log) << MSG::WARNING << "DACSaturBack jobOption has wrong size. Will use default." << endreq ; + (*m_log) << MSG::WARNING << "DACSaturBack jobOption has wrong size. Will use default." << endmsg ; m_dacSaturLayer3.resize(3); m_dacSaturLayer3[0] = 800 ; m_dacSaturLayer3[1] = 8000 ; @@ -74,32 +74,32 @@ StatusCode LArCaliWaves2Ntuple::stop() StatusCode sc; sc=m_nt->addItem("DAC",m_dac,0,64000); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'DAC' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'DAC' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",m_gain,0,3); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("nPulsedCalibLines",m_nPulsedCalibLines,0,4); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'nPulsedCalibLines' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'nPulsedCalibLines' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("pulsedCalibLines",4,m_pulsedCalibLines); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'pulsedCalibLines' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'pulsedCalibLines' failed" << endmsg; return StatusCode::FAILURE; } if (m_saveJitter) { sc=m_nt->addItem("Jitter",m_jitter,0.,1.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Jitter' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Jitter' failed" << endmsg; return StatusCode::FAILURE; } } @@ -107,7 +107,7 @@ StatusCode LArCaliWaves2Ntuple::stop() if (m_addCorrUndo) { sc=m_nt->addItem("corrUndo",m_corrUndo,0,1); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endmsg; return StatusCode::FAILURE; } } @@ -116,27 +116,27 @@ StatusCode LArCaliWaves2Ntuple::stop() const std::string& key = m_keylist[k] ; - (*m_log) << MSG::INFO << "Processing WaveContainer from StoreGate! key=" << m_keylist[k] << endreq; + (*m_log) << MSG::INFO << "Processing WaveContainer from StoreGate! key=" << m_keylist[k] << endmsg; const LArCaliWaveContainer* caliWaveContainer; StatusCode sc = m_detStore->retrieve(caliWaveContainer,key); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Cannot read LArCaliWaveContainer from StoreGate! key=" << key << endreq; + (*m_log) << MSG::ERROR << "Cannot read LArCaliWaveContainer from StoreGate! key=" << key << endmsg; return StatusCode::FAILURE; } else - (*m_log) << MSG::INFO << "Read LArCaliWaveContainer from StoreGate! key= " << key << endreq; + (*m_log) << MSG::INFO << "Read LArCaliWaveContainer from StoreGate! key= " << key << endmsg; if (m_applyCorr) { if (!caliWaveContainer->correctionsApplied()) { LArCaliWaveContainer* caliWaveContainer_nc=const_cast<LArCaliWaveContainer*>(caliWaveContainer); sc=caliWaveContainer_nc->applyCorrections(); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Failed to apply corrections to LArCaliWaveContainer!" << endreq; + (*m_log) << MSG::ERROR << "Failed to apply corrections to LArCaliWaveContainer!" << endmsg; } else - (*m_log) << MSG::INFO << "Applied corrections to LArCaliWaveContainer" << endreq; + (*m_log) << MSG::INFO << "Applied corrections to LArCaliWaveContainer" << endmsg; } else { - (*m_log) << MSG::WARNING << "Corrections already applied. Can't apply twice!" << endreq; + (*m_log) << MSG::WARNING << "Corrections already applied. Can't apply twice!" << endmsg; } }// end if applyCorr @@ -160,7 +160,7 @@ StatusCode LArCaliWaves2Ntuple::stop() if (skip) continue; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return sc; } }//End loop over DAC @@ -185,7 +185,7 @@ StatusCode LArCaliWaves2Ntuple::stop() if (skip) continue; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return sc; } }//end loop over DAC @@ -193,7 +193,7 @@ StatusCode LArCaliWaves2Ntuple::stop() }//end loop over gain }//end if addUndoCorr }//end loop over container keys - (*m_log) << MSG::INFO << "LArWave2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArWave2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; } // end finalize-method. @@ -227,7 +227,7 @@ bool LArCaliWaves2Ntuple::writeEntry(const HWIdentifier chid, const unsigned gai if ( !m_isSC ) { const std::vector<HWIdentifier>& calibLineV = ((LArCablingService*)m_larCablingSvc)->calibSlotLine(chid); if ( calibLineV.size()>0 ) { - (*m_log) << MSG::DEBUG << "wave.getIsPulsedInt() " << wave.getIsPulsedInt()<<" : "<< calibLineV.size()<< endreq; + (*m_log) << MSG::DEBUG << "wave.getIsPulsedInt() " << wave.getIsPulsedInt()<<" : "<< calibLineV.size()<< endmsg; for(int i=0;i<4;i++) m_pulsedCalibLines[i] = NOT_VALID; std::vector<HWIdentifier>::const_iterator calibLineIt = calibLineV.begin(); @@ -241,7 +241,7 @@ bool LArCaliWaves2Ntuple::writeEntry(const HWIdentifier chid, const unsigned gai } iCalibLine++; } - (*m_log) << MSG::DEBUG << "m_pulsedCalibLines: "<<m_pulsedCalibLines[0]<<"/"<<m_pulsedCalibLines[1]<<"/"<<m_pulsedCalibLines[2]<<"/"<<m_pulsedCalibLines[3]<<endreq; + (*m_log) << MSG::DEBUG << "m_pulsedCalibLines: "<<m_pulsedCalibLines[0]<<"/"<<m_pulsedCalibLines[1]<<"/"<<m_pulsedCalibLines[2]<<"/"<<m_pulsedCalibLines[3]<<endmsg; }else { m_nPulsedCalibLines = 0 ; m_pulsedCalibLines[0] = NOT_VALID; diff --git a/LArCalorimeter/LArCalibTools/src/LArCompleteToFlat.cxx b/LArCalorimeter/LArCalibTools/src/LArCompleteToFlat.cxx index e0f6cf476d6..0ffa06c9f64 100644 --- a/LArCalorimeter/LArCalibTools/src/LArCompleteToFlat.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArCompleteToFlat.cxx @@ -124,13 +124,13 @@ CondAttrListCollection* LArCompleteToFlat::singleFloatFlat(const char* blobName, //delete attrList;//??? } - msg(MSG::INFO) << "Converted " << blobName << " to inline storage. Total number of channels=" << nChannels << endreq; - msg(MSG::INFO) << "Number of channels filled with default value (1.0) " << nDefault << " (including disconnected)" << endreq; + msg(MSG::INFO) << "Converted " << blobName << " to inline storage. Total number of channels=" << nChannels << endmsg; + msg(MSG::INFO) << "Number of channels filled with default value (1.0) " << nDefault << " (including disconnected)" << endmsg; if (nCopiedEMPS) - msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endreq; + msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endmsg; StatusCode sc=detStore()->record(coll,outputName); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endmsg; return NULL; } return coll; @@ -139,7 +139,7 @@ CondAttrListCollection* LArCompleteToFlat::singleFloatFlat(const char* blobName, CondAttrListCollection* LArCompleteToFlat::pedestalFlat(const ILArPedestal* input, const std::string& outputName) { - msg(MSG::INFO)<<"LArCompleteToFlat::pedestalFlat, starting"<<endreq; + msg(MSG::INFO)<<"LArCompleteToFlat::pedestalFlat, starting"<<endmsg; unsigned nChannels=0; unsigned nCopiedEMPS=0; @@ -180,12 +180,12 @@ CondAttrListCollection* LArCompleteToFlat::pedestalFlat(const ILArPedestal* inpu StatusCode sc=detStore()->record(collPed,outputName);//"/LAR/ElecCalibFlat/Pedestal"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection for pedestal with key " << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection for pedestal with key " << outputName << endmsg; return NULL; } - msg(MSG::INFO) << "Converted Pedestal to inline storage. Total number of channels=" << nChannels << endreq; + msg(MSG::INFO) << "Converted Pedestal to inline storage. Total number of channels=" << nChannels << endmsg; if (nCopiedEMPS) - msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endreq; + msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endmsg; return collPed; } @@ -193,7 +193,7 @@ CondAttrListCollection* LArCompleteToFlat::pedestalFlat(const ILArPedestal* inpu CondAttrListCollection* LArCompleteToFlat::ofcFlat(const ILArOFC* input, const std::string& outputName) { - msg(MSG::INFO)<<"LArCompleteToFlat::ofcFlat, starting"<<endreq; + msg(MSG::INFO)<<"LArCompleteToFlat::ofcFlat, starting"<<endmsg; unsigned nChannels=0; unsigned nCopiedEMPS=0; unsigned nDefault=0; @@ -216,11 +216,11 @@ CondAttrListCollection* LArCompleteToFlat::ofcFlat(const ILArOFC* input, const s nSamples=ofca.size(); } if (nSamples==0) { - msg(MSG::ERROR) << "All input OFCs for gain " << gain << " have 0 samples!" << endreq; + msg(MSG::ERROR) << "All input OFCs for gain " << gain << " have 0 samples!" << endmsg; continue;//jump to the next gain } - msg(MSG::INFO) << "Gain " << gain <<": Found " << nSamples << " OFC samples in input data" << endreq; + msg(MSG::INFO) << "Gain " << gain <<": Found " << nSamples << " OFC samples in input data" << endmsg; coral::AttributeList* attrList = new coral::AttributeList(*spec); (*attrList)["version"].setValue(0U); @@ -285,21 +285,21 @@ CondAttrListCollection* LArCompleteToFlat::ofcFlat(const ILArOFC* input, const s StatusCode sc=detStore()->record(collOFC,outputName);//"/LAR/ElecCalibFlat/OFC"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection OFC with key " << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection OFC with key " << outputName << endmsg; return NULL; } - msg(MSG::INFO) << "Converted OFCs to inline storage. Total number of channels=" << nChannels << endreq; - msg(MSG::INFO) << "Number of channels filled with default OFCs {1,1,1,1} " << nDefault << " (including disconnected)" << endreq; + msg(MSG::INFO) << "Converted OFCs to inline storage. Total number of channels=" << nChannels << endmsg; + msg(MSG::INFO) << "Number of channels filled with default OFCs {1,1,1,1} " << nDefault << " (including disconnected)" << endmsg; if (nCopiedEMPS) - msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endreq; + msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endmsg; return collOFC; } CondAttrListCollection* LArCompleteToFlat::shapeFlat(const LArShapeComplete* input, const std::string& outputName) { - msg(MSG::INFO)<<"LArCompleteToFlat::shapeFlat, starting"<<endreq; + msg(MSG::INFO)<<"LArCompleteToFlat::shapeFlat, starting"<<endmsg; unsigned nChannels=0; unsigned nCopiedEMPS=0; @@ -322,11 +322,11 @@ CondAttrListCollection* LArCompleteToFlat::shapeFlat(const LArShapeComplete* inp nSamples=shape.size(); } if (nSamples==0) { - msg(MSG::ERROR) << "All input Shapes for gain " << gain << " have 0 samples!" << endreq; + msg(MSG::ERROR) << "All input Shapes for gain " << gain << " have 0 samples!" << endmsg; continue;//jump to the next gain } - msg(MSG::INFO) << "Gain " << gain <<": Found " << nSamples << " shape samples in input data" << endreq; + msg(MSG::INFO) << "Gain " << gain <<": Found " << nSamples << " shape samples in input data" << endmsg; coral::AttributeList* attrList = new coral::AttributeList(*spec); (*attrList)["version"].setValue(0U); @@ -393,14 +393,14 @@ CondAttrListCollection* LArCompleteToFlat::shapeFlat(const LArShapeComplete* inp StatusCode sc=detStore()->record(coll,outputName);//"/LAR/ElecCalibFlat/SHAPE"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection Shape with key " << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection Shape with key " << outputName << endmsg; return NULL; } - msg(MSG::INFO) << "Converted Shapes to inline storage. Total number of channels=" << nChannels << endreq; - msg(MSG::INFO) << "Number of channels filled with default shape {0,0,0,0} " << nDefault << " (including disconnected)" << endreq; + msg(MSG::INFO) << "Converted Shapes to inline storage. Total number of channels=" << nChannels << endmsg; + msg(MSG::INFO) << "Number of channels filled with default shape {0,0,0,0} " << nDefault << " (including disconnected)" << endmsg; if (nCopiedEMPS) - msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endreq; + msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain" << nCopiedEMPS << endmsg; return coll; } @@ -409,7 +409,7 @@ CondAttrListCollection* LArCompleteToFlat::shapeFlat(const LArShapeComplete* inp CondAttrListCollection* LArCompleteToFlat::rampFlat(const ILArRamp* input, const std::string& outputName) { - msg(MSG::INFO)<<"LArCompleteToFlat::rampFlat, starting"<<endreq; + msg(MSG::INFO)<<"LArCompleteToFlat::rampFlat, starting"<<endmsg; unsigned nChannels=0; unsigned nCopiedEMPS=0; @@ -433,12 +433,12 @@ CondAttrListCollection* LArCompleteToFlat::rampFlat(const ILArRamp* input, const nPoints=ramp.size(); } if (nPoints==0) { - msg(MSG::ERROR) << "All input Ramps for gain " << gain << " have 0 points!" << endreq; + msg(MSG::ERROR) << "All input Ramps for gain " << gain << " have 0 points!" << endmsg; continue;//jump to the next gain } defaultRamp.resize(nPoints,0.0); //fill remaining points if needed - msg(MSG::INFO) << "Gain " << gain << ": Found a ramp polynom of degree " << nPoints << " in input data" << endreq; + msg(MSG::INFO) << "Gain " << gain << ": Found a ramp polynom of degree " << nPoints << " in input data" << endmsg; coral::AttributeList* attrList = new coral::AttributeList(*spec); (*attrList)["version"].setValue(0U); coral::Blob& blobRamp=(*attrList)["RampVec"].data<coral::Blob>(); @@ -476,14 +476,14 @@ CondAttrListCollection* LArCompleteToFlat::rampFlat(const ILArRamp* input, const StatusCode sc=detStore()->record(coll,outputName);//"/LAR/ElecCalibFlat/Ramp"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection for ramp with key " << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection for ramp with key " << outputName << endmsg; return NULL; } - msg(MSG::INFO) << "Converted Ramps to inline storage. Total number of channels " << nChannels << endreq; - msg(MSG::INFO) << "Number of channels filled with default ramp {0,1} " << nDefault << " (including disconnected)" << endreq; + msg(MSG::INFO) << "Converted Ramps to inline storage. Total number of channels " << nChannels << endmsg; + msg(MSG::INFO) << "Number of channels filled with default ramp {0,1} " << nDefault << " (including disconnected)" << endmsg; if (nCopiedEMPS) - msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain (applied factor 10)" << nCopiedEMPS << endreq; + msg(MSG::INFO) << "\t Number of low gain EMBPS channels copied from medium gain (applied factor 10)" << nCopiedEMPS << endmsg; return coll; @@ -508,7 +508,7 @@ CondAttrListCollection* LArCompleteToFlat::DAC2uAFlat(const ILArDAC2uA* input, c //delete attrList;//??? StatusCode sc=detStore()->record(coll,outputName); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endmsg; return NULL; } return coll; @@ -533,7 +533,7 @@ CondAttrListCollection* LArCompleteToFlat::uA2MeVFlat(const ILAruA2MeV* input, c //delete attrList;//??? StatusCode sc=detStore()->record(coll,outputName); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endreq; + msg(MSG::ERROR) << "Failed to record CondAttrListCollection with key" << outputName << endmsg; return NULL; } return coll; @@ -569,14 +569,14 @@ AthenaAttributeList* LArCompleteToFlat::DSPThresholdsFlat(const LArDSPThresholds pSamplesThr[hs] = input->samplesThr(chid); pTrigThr[hs] = input->trigSumThr(chid); - msg(MSG::INFO) << "hwid: "<<chid.getString()<<" "<<hs<<" | "<<ptQThr[hs]<<" : "<<pSamplesThr[hs]<<" | "<<pTrigThr[hs] << endreq; + msg(MSG::INFO) << "hwid: "<<chid.getString()<<" "<<hs<<" | "<<ptQThr[hs]<<" : "<<pSamplesThr[hs]<<" | "<<pTrigThr[hs] << endmsg; }//end loop over hash ids AthenaAttributeList* coll=new AthenaAttributeList(*attrList); StatusCode sc=detStore()->record(coll,outputName); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record AthenaAttributeList DSPThresholds with key " << outputName << endreq; + msg(MSG::ERROR) << "Failed to record AthenaAttributeList DSPThresholds with key " << outputName << endmsg; return NULL; } @@ -590,7 +590,7 @@ StatusCode LArCompleteToFlat::stop() { StatusCode sc=detStore()->retrieve(m_onlineID); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to get LArOnlineID" << endreq; + msg(MSG::ERROR) << "Failed to get LArOnlineID" << endmsg; return sc; } @@ -604,10 +604,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(uA2MeVComplete,m_uA2MeVInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LAruA2MeV with key " << m_uA2MeVInput << endreq; + msg(MSG::ERROR) << "Failed to get LAruA2MeV with key " << m_uA2MeVInput << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LAruA2MeV" << endreq; + msg(MSG::WARNING) << "Will not process LAruA2MeV" << endmsg; } } else { uA2MeVFlat(uA2MeVComplete, "/LAR/ElecCalibFlat/uA2MeV"); @@ -620,10 +620,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(DAC2uAComplete,m_DAC2uAInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArDAC2uA with key " << m_DAC2uAInput << endreq; + msg(MSG::ERROR) << "Failed to get LArDAC2uA with key " << m_DAC2uAInput << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArDAC2uA" << endreq; + msg(MSG::WARNING) << "Will not process LArDAC2uA" << endmsg; } } else { DAC2uAFlat(DAC2uAComplete, "/LAR/ElecCalibFlat/DAC2uA"); @@ -636,10 +636,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(MphysOverMcalComplete,m_MphysOverMcalInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArMphysOverMcal with key " << m_MphysOverMcalInput << endreq; + msg(MSG::ERROR) << "Failed to get LArMphysOverMcal with key " << m_MphysOverMcalInput << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArMphysOverMcal" << endreq; + msg(MSG::WARNING) << "Will not process LArMphysOverMcal" << endmsg; } } else { singleFloatFlat("MphysOverMcal", MphysOverMcalComplete, "/LAR/ElecCalibFlat/MphysOverMcal",3,false); //No MphysOverMCal for FCAL @@ -652,10 +652,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(HVScaleCorrComplete,m_HVScaleCorrInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArHVScaleCorr with key " << m_HVScaleCorrInput << endreq; + msg(MSG::ERROR) << "Failed to get LArHVScaleCorr with key " << m_HVScaleCorrInput << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArHVScaleCorr" << endreq; + msg(MSG::WARNING) << "Will not process LArHVScaleCorr" << endmsg; } } else { singleFloatFlat("HVScaleCorr", HVScaleCorrComplete, "/LAR/ElecCalibFlat/HVScaleCorr",1); @@ -667,10 +667,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(pedComplete,m_PedestalInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArPedestal" << endreq; + msg(MSG::ERROR) << "Failed to get LArPedestal" << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArPedestal" << endreq; + msg(MSG::WARNING) << "Will not process LArPedestal" << endmsg; } } else { pedestalFlat(pedComplete,"/LAR/ElecCalibFlat/Pedestal"); @@ -681,13 +681,13 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->record(pf,"PedestalFlat"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record LArPedestalFlat" << endreq; + msg(MSG::ERROR) << "Failed to record LArPedestalFlat" << endmsg; } ILArPedestal* iped=pf; sc=detStore()->symLink(pf,iped); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to symlink LArPedestalFlat" << endreq; + msg(MSG::ERROR) << "Failed to symlink LArPedestalFlat" << endmsg; } } */ @@ -700,10 +700,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(ofcComplete,m_OFCInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArOFCComplete object" << endreq; + msg(MSG::ERROR) << "Failed to get LArOFCComplete object" << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArOFCComplete" << endreq; + msg(MSG::WARNING) << "Will not process LArOFCComplete" << endmsg; } } else { ofcFlat(ofcComplete,"/LAR/ElecCalibFlat/OFC"); @@ -714,13 +714,13 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->record(of,"OFCFlat"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record LArOFCFlat" << endreq; + msg(MSG::ERROR) << "Failed to record LArOFCFlat" << endmsg; } ILArOFC* iofc=of; sc=detStore()->symLink(of,iofc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to symlink LArOFCFlat" << endreq; + msg(MSG::ERROR) << "Failed to symlink LArOFCFlat" << endmsg; } */ } @@ -732,10 +732,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(shapeComplete,m_ShapeInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArShapeComplete object" << endreq; + msg(MSG::ERROR) << "Failed to get LArShapeComplete object" << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArShapeComplete" << endreq; + msg(MSG::WARNING) << "Will not process LArShapeComplete" << endmsg; } } else { shapeFlat(shapeComplete,"/LAR/ElecCalibFlat/Shape"); @@ -746,13 +746,13 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->record(sf,"ShapeFlat"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record LArShapeFlat" << endreq; + msg(MSG::ERROR) << "Failed to record LArShapeFlat" << endmsg; } ILArShape* ishape=sf; sc=detStore()->symLink(sf,ishape); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to symlink LArShapeFlat" << endreq; + msg(MSG::ERROR) << "Failed to symlink LArShapeFlat" << endmsg; } */ } @@ -764,10 +764,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(rampComplete,m_RampInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArRampComplete object" << endreq; + msg(MSG::ERROR) << "Failed to get LArRampComplete object" << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArRampComplete" << endreq; + msg(MSG::WARNING) << "Will not process LArRampComplete" << endmsg; } } else { rampFlat(rampComplete,"/LAR/ElecCalibFlat/Ramp"); @@ -780,10 +780,10 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->retrieve(DSPTComplete,m_DSPThresholdsInput); if (sc.isFailure()) { if(m_forceStop) { - msg(MSG::ERROR) << "Failed to get LArDSPThresholdsComplete object" << endreq; + msg(MSG::ERROR) << "Failed to get LArDSPThresholdsComplete object" << endmsg; return sc; } else { - msg(MSG::WARNING) << "Will not process LArDSPThresholdsComplete" << endreq; + msg(MSG::WARNING) << "Will not process LArDSPThresholdsComplete" << endmsg; } } DSPThresholdsFlat(DSPTComplete,"/LAR/Configuration/DSPThresholdFlat/Templates"); @@ -796,7 +796,7 @@ StatusCode LArCompleteToFlat::stop() { sc=detStore()->record(df,"DSPThresholdsFlat"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to record LArDSPThresholdsFlat" << endreq; + msg(MSG::ERROR) << "Failed to record LArDSPThresholdsFlat" << endmsg; } } */ @@ -816,7 +816,7 @@ void LArCompleteToFlat::errIfConnected(const HWIdentifier chid, const int gain, if (! (gain==2 && m_onlineID->isEMBPS(chid))) { //No LG Presampler calibration msg(MSG::ERROR) << "No valid " << objName << " found for channel " << m_onlineID->channel_name(chid) << ", gain " << gain << ". "; if (message) msg(MSG::ERROR) << message; - msg(MSG::ERROR) << " Filling with default value." << endreq; + msg(MSG::ERROR) << " Filling with default value." << endmsg; } } return; diff --git a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx index 90125d93fd1..4bdf5b691bc 100644 --- a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx @@ -34,13 +34,13 @@ StatusCode LArCond2NtupleBase::initialize() { ATH_MSG_DEBUG("Initializing LArCond2Ntuple base class"); if (m_ntpath.size()==0 || m_ntTitle.size()==0) { - msg(MSG::ERROR) << "Need to set variable 'm_ntpath' and 'm_ntTitle' in constructor of deriving class!" << endreq; + msg(MSG::ERROR) << "Need to set variable 'm_ntpath' and 'm_ntTitle' in constructor of deriving class!" << endmsg; return StatusCode::FAILURE; } size_t i=m_ntpath.rfind('/'); if (i==std::string::npos) { - msg(MSG::ERROR) << "Expected at least on '/' in path " << m_ntpath << endreq; + msg(MSG::ERROR) << "Expected at least on '/' in path " << m_ntpath << endmsg; return StatusCode::FAILURE; } std::string basepath(m_ntpath.begin(),m_ntpath.begin()+i); @@ -49,7 +49,7 @@ StatusCode LArCond2NtupleBase::initialize() { NTupleFilePtr file1(ntupleSvc(),basepath); if (!file1){ - msg(MSG::ERROR) << "Could not get NTupleFilePtr with path " << basepath << " failed" << endreq; + msg(MSG::ERROR) << "Could not get NTupleFilePtr with path " << basepath << " failed" << endmsg; return StatusCode::FAILURE; } NTuplePtr nt(ntupleSvc(),m_ntpath); @@ -57,7 +57,7 @@ StatusCode LArCond2NtupleBase::initialize() { nt=ntupleSvc()->book(m_ntpath,CLID_ColumnWiseTuple,m_ntTitle); } if (!nt){ - msg(MSG::ERROR) << "Booking of NTuple at "<< m_ntpath << " and name " << m_ntTitle << " failed" << endreq; + msg(MSG::ERROR) << "Booking of NTuple at "<< m_ntpath << " and name " << m_ntTitle << " failed" << endmsg; return StatusCode::FAILURE; } @@ -68,7 +68,7 @@ StatusCode LArCond2NtupleBase::initialize() { //StatusCode sc=service("DetectorStore",m_detStore); //if (sc!=StatusCode::SUCCESS) { - // (*m_log) << MSG::ERROR << "Cannot get DetectorStore!" << endreq; + // (*m_log) << MSG::ERROR << "Cannot get DetectorStore!" << endmsg; // return sc; //} @@ -86,15 +86,15 @@ StatusCode LArCond2NtupleBase::initialize() { } if (!m_emId) { - msg(MSG::ERROR) << "Could not access lar EM ID helper" << endreq; + msg(MSG::ERROR) << "Could not access lar EM ID helper" << endmsg; return StatusCode::FAILURE; } if (!m_fcalId) { - msg(MSG::ERROR) << "Could not access lar FCAL ID helper" << endreq; + msg(MSG::ERROR) << "Could not access lar FCAL ID helper" << endmsg; return StatusCode::FAILURE; } if (!m_hecId) { - msg(MSG::ERROR) << "Could not access lar HEC ID helper" << endreq; + msg(MSG::ERROR) << "Could not access lar HEC ID helper" << endmsg; return StatusCode::FAILURE; } @@ -104,7 +104,7 @@ StatusCode LArCond2NtupleBase::initialize() { const LArOnline_SuperCellID* ll; sc = detStore()->retrieve(ll, "LArOnline_SuperCellID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endreq; + msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endmsg; return StatusCode::FAILURE; } else { @@ -115,7 +115,7 @@ StatusCode LArCond2NtupleBase::initialize() { ToolHandle<LArSuperCellCablingTool> tool("LArSuperCellCablingTool"); sc = tool.retrieve(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Can't get LArCablingSvc." << endreq; + msg(MSG::ERROR) << " Can't get LArCablingSvc." << endmsg; return sc; } else m_larCablingSvc = (LArCablingBase*)&(*tool); @@ -123,7 +123,7 @@ StatusCode LArCond2NtupleBase::initialize() { const LArOnlineID* ll; sc = detStore()->retrieve(ll, "LArOnlineID"); if (sc.isFailure()) { - msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endreq; + msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endmsg; return StatusCode::FAILURE; } else { @@ -134,7 +134,7 @@ StatusCode LArCond2NtupleBase::initialize() { ToolHandle<LArCablingService> tool("LArCablingService"); sc = tool.retrieve(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Can't get LArCablingSvc." << endreq; + msg(MSG::ERROR) << " Can't get LArCablingSvc." << endmsg; return sc; } else m_larCablingSvc = (LArCablingBase*)&(*tool); } // end of m_isSC if @@ -142,7 +142,7 @@ StatusCode LArCond2NtupleBase::initialize() { if (m_addBC) { sc = m_badChanTool.retrieve(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Can't get BadChanTool." << endreq; + msg(MSG::ERROR) << " Can't get BadChanTool." << endmsg; return sc; } } @@ -150,7 +150,7 @@ StatusCode LArCond2NtupleBase::initialize() { if (m_addFEBTemp) { sc = m_FEBTempTool.retrieve(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Can't get FEBTempTool." << endreq; + msg(MSG::ERROR) << " Can't get FEBTempTool." << endmsg; return sc; } } @@ -158,7 +158,7 @@ StatusCode LArCond2NtupleBase::initialize() { //Online-identifier variables sc=nt->addItem("channelId",m_onlChanId,0x38000000,0x3A000000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'channelId' failed" << endreq; + msg(MSG::ERROR) << "addItem 'channelId' failed" << endmsg; return StatusCode::FAILURE; } @@ -166,52 +166,52 @@ StatusCode LArCond2NtupleBase::initialize() { if ( m_OffId ) { sc=nt->addItem("offlineId",m_oflChanId,0x20000000,0x40000000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'channelId' failed" << endreq; + msg(MSG::ERROR) << "addItem 'channelId' failed" << endmsg; return StatusCode::FAILURE; } } sc=nt->addItem("barrel_ec",m_barrel_ec,0,1); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'barrel_ec' failed" << endreq; + msg(MSG::ERROR) << "addItem 'barrel_ec' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("pos_neg",m_pos_neg,0,1); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'pos_neg' failed" << endreq; + msg(MSG::ERROR) << "addItem 'pos_neg' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("FT",m_FT,0,32); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'FT' failed" << endreq; + msg(MSG::ERROR) << "addItem 'FT' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("slot",m_slot,1,15); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'slot' failed" << endreq; + msg(MSG::ERROR) << "addItem 'slot' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("channel",m_channel,0,127); if (sc!=StatusCode::SUCCESS){ - msg(MSG::ERROR) << "addItem 'channel' failed" << endreq; + msg(MSG::ERROR) << "addItem 'channel' failed" << endmsg; return StatusCode::FAILURE; } if ( !m_isSC) { sc=nt->addItem("calibLine",m_calibLine,0,127); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'calibLine' failed" << endreq; + msg(MSG::ERROR) << "addItem 'calibLine' failed" << endmsg; return StatusCode::FAILURE; } } sc=nt->addItem("isConnected",m_isConnected,0,1); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'isConnected' failed" << endreq; + msg(MSG::ERROR) << "addItem 'isConnected' failed" << endmsg; return StatusCode::FAILURE; } @@ -219,20 +219,20 @@ StatusCode LArCond2NtupleBase::initialize() { if (m_addHash) { sc=nt->addItem("channelHash",m_chanHash,0,200000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'channelHash' failed" << endreq; + msg(MSG::ERROR) << "addItem 'channelHash' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("febHash",m_febHash,0,2000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'febHash' failed" << endreq; + msg(MSG::ERROR) << "addItem 'febHash' failed" << endmsg; return StatusCode::FAILURE; } if (m_OffId) { sc=m_nt->addItem("oflHash",m_oflHash,0,200000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'oflHash' failed" << endreq; + msg(MSG::ERROR) << "addItem 'oflHash' failed" << endmsg; return StatusCode::FAILURE; } } @@ -242,34 +242,34 @@ StatusCode LArCond2NtupleBase::initialize() { //Offline-ID related variables sc=nt->addItem("layer",m_layer,0,4); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'layer' failed" << endreq; + msg(MSG::ERROR) << "addItem 'layer' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("ieta",m_eta,0,510); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'ieta' failed" << endreq; + msg(MSG::ERROR) << "addItem 'ieta' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("iphi",m_phi,0,1023); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'iphi' failed" << endreq; + msg(MSG::ERROR) << "addItem 'iphi' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("region",m_region,0,5); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'region' failed" << endreq; + msg(MSG::ERROR) << "addItem 'region' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("detector",m_detector,0,2); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'detector' failed" << endreq; + msg(MSG::ERROR) << "addItem 'detector' failed" << endmsg; return StatusCode::FAILURE; } if (m_addBC) { sc=nt->addItem("badChan",m_badChanWord); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'badChan' failed" << endreq; + msg(MSG::ERROR) << "addItem 'badChan' failed" << endmsg; return StatusCode::FAILURE; } } @@ -277,12 +277,12 @@ StatusCode LArCond2NtupleBase::initialize() { if (m_addFEBTemp) { sc=nt->addItem("FEBTemp1",m_FEBTemp1); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'FEBTemp1' failed" << endreq; + msg(MSG::ERROR) << "addItem 'FEBTemp1' failed" << endmsg; return StatusCode::FAILURE; } sc=nt->addItem("FEBTemp2",m_FEBTemp2); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'FEBTemp2' failed" << endreq; + msg(MSG::ERROR) << "addItem 'FEBTemp2' failed" << endmsg; return StatusCode::FAILURE; } } diff --git a/LArCalorimeter/LArCalibTools/src/LArDSPConfig2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArDSPConfig2Ntuple.cxx index 9ddfe5f75b6..1d35b6d42ab 100644 --- a/LArCalorimeter/LArCalibTools/src/LArDSPConfig2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArDSPConfig2Ntuple.cxx @@ -25,19 +25,19 @@ StatusCode LArDSPConfig2Ntuple::initialize() { StatusCode sc=LArCond2NtupleBase::initialize(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Base init failed" << endreq; + msg(MSG::ERROR) << "Base init failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("peakSample",m_peakSample); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem peakSample failed" << endreq; + msg(MSG::ERROR) << "addItem peakSample failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("useMGIntercept",m_useMgIntercept); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem useMGIntercept failed" << endreq; + msg(MSG::ERROR) << "addItem useMGIntercept failed" << endmsg; return StatusCode::FAILURE; } @@ -55,7 +55,7 @@ StatusCode LArDSPConfig2Ntuple::stop() { const AthenaAttributeList* attrList=0; sc=detStore()->retrieve(attrList,m_folder); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endreq; + msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endmsg; return sc; } @@ -70,16 +70,16 @@ StatusCode LArDSPConfig2Ntuple::stop() { m_peakSample=larDSPConfig.peakSample(hwid); m_useMgIntercept=larDSPConfig.useMGRampIntercept(hwid); fillFromIdentifier(hwid); - //msg(MSG::INFO)<<"hwid: "<<hwid.getString()<<" "<<tQThr<<" : "<<samplesThr<<" : "<<trigThr<<endreq; + //msg(MSG::INFO)<<"hwid: "<<hwid.getString()<<" "<<tQThr<<" : "<<samplesThr<<" : "<<trigThr<<endmsg; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } } - msg(MSG::INFO) << "LArDSPConfig2Ntuple has finished." << endreq; + msg(MSG::INFO) << "LArDSPConfig2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArDSPThresholds2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArDSPThresholds2Ntuple.cxx index 5225b895897..d07b9d12e30 100644 --- a/LArCalorimeter/LArCalibTools/src/LArDSPThresholds2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArDSPThresholds2Ntuple.cxx @@ -27,25 +27,25 @@ StatusCode LArDSPThresholds2Ntuple::initialize() { StatusCode sc=LArCond2NtupleBase::initialize(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Base init failed" << endreq; + msg(MSG::ERROR) << "Base init failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("tQThr",m_tQThr); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem tQThr failed" << endreq; + msg(MSG::ERROR) << "addItem tQThr failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("samplesThr",m_samplesThr); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem samplesThr failed" << endreq; + msg(MSG::ERROR) << "addItem samplesThr failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("trigThr",m_trigThr); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem trigThr failed" << endreq; + msg(MSG::ERROR) << "addItem trigThr failed" << endmsg; return StatusCode::FAILURE; } @@ -64,13 +64,13 @@ StatusCode LArDSPThresholds2Ntuple::stop() { if(m_doFlat) { sc=detStore()->retrieve(attrList,m_folder); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endreq; + msg(MSG::ERROR) << "Failed to retrieve AthenaAttributeList with key " << m_folder << endmsg; return sc; } const coral::Blob& blob = (attrList->coralList())["tQThr"].data<coral::Blob>(); if (blob.size()<3) { - msg(MSG::INFO) << "Found empty blob, nothing to do"<<endreq; + msg(MSG::INFO) << "Found empty blob, nothing to do"<<endmsg; return StatusCode::SUCCESS; } @@ -79,7 +79,7 @@ StatusCode LArDSPThresholds2Ntuple::stop() { } else { sc=m_detStore->retrieve(dc); if(sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) <<"Could not retrieve LArDSPThresholdsComplete...."<<endreq; + msg(MSG::ERROR) <<"Could not retrieve LArDSPThresholdsComplete...."<<endmsg; return StatusCode::FAILURE; } } @@ -100,17 +100,17 @@ StatusCode LArDSPThresholds2Ntuple::stop() { } fillFromIdentifier(hwid); - //msg(MSG::INFO)<<"hwid: "<<hwid.getString()<<" "<<tQThr<<" : "<<samplesThr<<" : "<<trigThr<<endreq; + //msg(MSG::INFO)<<"hwid: "<<hwid.getString()<<" "<<tQThr<<" : "<<samplesThr<<" : "<<trigThr<<endmsg; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } } - msg(MSG::INFO) << "LArDSPThresholds2Ntuple has finished." << endreq; + msg(MSG::INFO) << "LArDSPThresholds2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArDigits2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArDigits2Ntuple.cxx index 68c76500f75..dadf5eb848f 100644 --- a/LArCalorimeter/LArCalibTools/src/LArDigits2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArDigits2Ntuple.cxx @@ -28,35 +28,35 @@ LArDigits2Ntuple::~LArDigits2Ntuple() StatusCode LArDigits2Ntuple::initialize() { - msg(MSG::INFO) << "in initialize" << endreq; + msg(MSG::INFO) << "in initialize" << endmsg; StatusCode sc=LArCond2NtupleBase::initialize(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Base init failed" << endreq; + msg(MSG::ERROR) << "Base init failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("IEvent",m_IEvent); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'IEvent' failed" << endreq; + msg(MSG::ERROR) << "addItem 'IEvent' failed" << endmsg; return sc; } sc=m_nt->addItem("Gain",m_gain,-1,3); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Gain' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Gain' failed" << endmsg; return sc; } sc=m_nt->addItem("Nsamples",m_ntNsamples,0,32); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Nsamples' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Nsamples' failed" << endmsg; return sc; } sc=m_nt->addItem("samples",m_Nsamples,m_samples); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'samples' failed" << endreq; + msg(MSG::ERROR) << "addItem 'samples' failed" << endmsg; return sc; } @@ -74,13 +74,13 @@ StatusCode LArDigits2Ntuple::execute() StatusCode sc; - msg(MSG::DEBUG) << "in execute" << endreq; + msg(MSG::DEBUG) << "in execute" << endmsg; m_event++; unsigned long thisevent; const EventInfo* eventInfo; if (evtStore()->retrieve(eventInfo,"ByteStreamEventInfo").isFailure()) { - msg(MSG::WARNING) << " Cannot access to event info " << endreq; + msg(MSG::WARNING) << " Cannot access to event info " << endmsg; thisevent=m_event; } else { thisevent = eventInfo->event_ID()->event_number(); @@ -89,10 +89,10 @@ StatusCode LArDigits2Ntuple::execute() const LArDigitContainer* DigitContainer = NULL; sc=evtStore()->retrieve(DigitContainer,m_contKey); if (sc!=StatusCode::SUCCESS) { - msg(MSG::WARNING) << "Unable to retrieve LArDigitContainer with key " << m_contKey << " from DetectorStore. " << endreq; + msg(MSG::WARNING) << "Unable to retrieve LArDigitContainer with key " << m_contKey << " from DetectorStore. " << endmsg; } else - msg(MSG::DEBUG) << "Got LArDigitContainer with key " << m_contKey << endreq; + msg(MSG::DEBUG) << "Got LArDigitContainer with key " << m_contKey << endmsg; if (DigitContainer) { @@ -101,10 +101,10 @@ StatusCode LArDigits2Ntuple::execute() LArDigitContainer::const_iterator it_e=DigitContainer->end(); if(it == it_e) { - msg(MSG::DEBUG) << "LArDigitContainer with key=" << m_contKey << " is empty " << endreq; + msg(MSG::DEBUG) << "LArDigitContainer with key=" << m_contKey << " is empty " << endmsg; return StatusCode::SUCCESS; }else{ - msg(MSG::DEBUG) << "LArDigitContainer with key=" << m_contKey << " has " <<DigitContainer->size() << " entries" <<endreq; + msg(MSG::DEBUG) << "LArDigitContainer with key=" << m_contKey << " has " <<DigitContainer->size() << " entries" <<endmsg; } unsigned cellCounter=0; @@ -120,7 +120,7 @@ StatusCode LArDigits2Ntuple::execute() if(trueMaxSample>m_Nsamples){ if(!m_ipass){ - msg(MSG::WARNING) << "The number of samples in data is larger than the one specified by JO: " << trueMaxSample << " > " << m_Nsamples << " --> only " << m_Nsamples << " will be available in the ntuple " << endreq; + msg(MSG::WARNING) << "The number of samples in data is larger than the one specified by JO: " << trueMaxSample << " > " << m_Nsamples << " --> only " << m_Nsamples << " will be available in the ntuple " << endmsg; m_ipass=1; } trueMaxSample = m_Nsamples; @@ -139,12 +139,12 @@ StatusCode LArDigits2Ntuple::execute() sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return sc; } cellCounter++; }// over cells } - msg(MSG::DEBUG) << "LArDigits2Ntuple has finished." << endreq; + msg(MSG::DEBUG) << "LArDigits2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx index 378b3578c02..1680021bcf4 100755 --- a/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx @@ -27,13 +27,13 @@ StatusCode LArFEBTemp2Ntuple::stop() { sc=m_nt->addItem("temp1",temp1,-1000.,5000.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'temp1' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'temp1' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("temp2",temp2,-1000.,5000.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'temp2' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'temp2' failed" << endmsg; return StatusCode::FAILURE; } @@ -42,13 +42,13 @@ StatusCode LArFEBTemp2Ntuple::stop() { if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve IToolSvc" - << endreq; + << endmsg; } ILArFEBTempTool *larFEBTempTool; sc = toolSvc->retrieveTool("LArFEBTempTool", larFEBTempTool); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "Unable to retrieve LArFEBTempTool from ToolSvc" << endreq; + (*m_log) << MSG::ERROR << "Unable to retrieve LArFEBTempTool from ToolSvc" << endmsg; return StatusCode::FAILURE; } @@ -59,7 +59,7 @@ StatusCode LArFEBTemp2Ntuple::stop() { { const HWIdentifier hwid = *itOnId; FEBTemp tv = larFEBTempTool->getFebTemp(hwid); - (*m_log) << MSG::DEBUG << hwid << " " << tv.size()<<endreq; + (*m_log) << MSG::DEBUG << hwid << " " << tv.size()<<endmsg; if( !tv.empty() ) { @@ -77,14 +77,14 @@ StatusCode LArFEBTemp2Ntuple::stop() { if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } } } } - (*m_log) << MSG::INFO << "LArFEBTemp2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArFEBTemp2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; diff --git a/LArCalorimeter/LArCalibTools/src/LArFebTimeOffset2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArFebTimeOffset2Ntuple.cxx index 21a418670ee..014bd88e112 100644 --- a/LArCalorimeter/LArCalibTools/src/LArFebTimeOffset2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArFebTimeOffset2Ntuple.cxx @@ -41,7 +41,7 @@ StatusCode LArFebTimeOffset2Ntuple::stop() { const LArFEBTimeOffset* feboffsets; //if (detStore()->retrieve(feboffsets,m_inputContainer).isFailure()) { if (detStore()->retrieve(feboffsets).isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve LArFEBTimeOffset with key " << m_inputContainer << endreq; + msg(MSG::ERROR) << "Failed to retrieve LArFEBTimeOffset with key " << m_inputContainer << endmsg; return StatusCode::FAILURE; } @@ -62,7 +62,7 @@ StatusCode LArFebTimeOffset2Ntuple::stop() { StatusCode sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if have value diff --git a/LArCalorimeter/LArCalibTools/src/LArFillDSPConfig.cxx b/LArCalorimeter/LArCalibTools/src/LArFillDSPConfig.cxx index b01bd2cd606..6073b9c02fe 100644 --- a/LArCalorimeter/LArCalibTools/src/LArFillDSPConfig.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArFillDSPConfig.cxx @@ -41,7 +41,7 @@ StatusCode LArFillDSPConfig::stop() { StatusCode sc=detStore()->retrieve(m_onlineID); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to get LArOnlineID" << endreq; + msg(MSG::ERROR) << "Failed to get LArOnlineID" << endmsg; return sc; } @@ -61,7 +61,7 @@ StatusCode LArFillDSPConfig::stop() { std::unique_ptr<AthenaAttributeList> pAttrList(larDSPConfig.attributeList()); ATH_CHECK(detStore()->record(std::move(pAttrList),m_folderName)); - msg(MSG::INFO) << "Successfully recorded AthenaAttributeList containing DSP configuration for " << nFebs << " Febs" << endreq; + msg(MSG::INFO) << "Successfully recorded AthenaAttributeList containing DSP configuration for " << nFebs << " Febs" << endmsg; if (m_dump) { //Crosscheck: diff --git a/LArCalorimeter/LArCalibTools/src/LArGainThresholds2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArGainThresholds2Ntuple.cxx index b65123d6b18..168e8399b07 100644 --- a/LArCalorimeter/LArCalibTools/src/LArGainThresholds2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArGainThresholds2Ntuple.cxx @@ -17,7 +17,7 @@ LArGainThresholds2Ntuple::LArGainThresholds2Ntuple(const std::string& name, ISvc StatusCode LArGainThresholds2Ntuple::initialize() { if (m_febConfigReader.retrieve().isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_febConfigReader << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_febConfigReader << endmsg; return StatusCode::FAILURE; } @@ -34,13 +34,13 @@ StatusCode LArGainThresholds2Ntuple::stop() { sc=m_nt->addItem("lower",lower,-1000,5000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'lower' failed" << endreq; + msg(MSG::ERROR) << "addItem 'lower' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("upper",upper,-1000.,5000.); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'upper' failed" << endreq; + msg(MSG::ERROR) << "addItem 'upper' failed" << endmsg; return StatusCode::FAILURE; } @@ -55,12 +55,12 @@ StatusCode LArGainThresholds2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } } - msg(MSG::INFO) << "LArGainThresholds2Ntuple has finished." << endreq; + msg(MSG::INFO) << "LArGainThresholds2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArHVScaleCorr2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArHVScaleCorr2Ntuple.cxx index db2c1c2da44..cf4b3176074 100644 --- a/LArCalorimeter/LArCalibTools/src/LArHVScaleCorr2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArHVScaleCorr2Ntuple.cxx @@ -26,7 +26,7 @@ StatusCode LArHVScaleCorr2Ntuple::stop() { StatusCode sc=m_detStore->retrieve(larHVScaleCorr,m_contKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve ILArHVScaleCorr with key " - << m_contKey << " from DetectorStore" << endreq; + << m_contKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -34,7 +34,7 @@ StatusCode LArHVScaleCorr2Ntuple::stop() { sc=m_nt->addItem("hvcorr",corr,-1000.,2.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'corr' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'corr' failed" << endmsg; return StatusCode::FAILURE; } @@ -51,7 +51,7 @@ StatusCode LArHVScaleCorr2Ntuple::stop() { corr=value; sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }// end if object exists @@ -59,6 +59,6 @@ StatusCode LArHVScaleCorr2Ntuple::stop() { cellCounter++; }//end loop over online ID - (*m_log) << MSG::INFO << "LArHVScaleCorr2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArHVScaleCorr2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArMphysOverMcal2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArMphysOverMcal2Ntuple.cxx index 7e500f78377..7fa4fbaa5b6 100644 --- a/LArCalorimeter/LArCalibTools/src/LArMphysOverMcal2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArMphysOverMcal2Ntuple.cxx @@ -33,7 +33,7 @@ StatusCode LArMphysOverMcal2Ntuple::stop() { sc=m_detStore->retrieve(larMphysOverMcal,m_contKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve ILArMphysOverMcal with key " - << m_contKey << " from DetectorStore" << endreq; + << m_contKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -42,20 +42,20 @@ StatusCode LArMphysOverMcal2Ntuple::stop() { sc=m_nt->addItem("icell",cellIndex,0,2000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",gain,0,3); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("mphysovermcal",mpmc,-1000.,2.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'mphysovermcal' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'mphysovermcal' failed" << endmsg; return StatusCode::FAILURE; } @@ -73,7 +73,7 @@ StatusCode LArMphysOverMcal2Ntuple::stop() { mpmc = larMphysOverMcal->MphysOverMcal(hwid,igain); sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if isConnected @@ -81,7 +81,7 @@ StatusCode LArMphysOverMcal2Ntuple::stop() { }//end loop over online ID } // ovr gains - (*m_log) << MSG::INFO << "LArMphysOverMcal2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArMphysOverMcal2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArNoise2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArNoise2Ntuple.cxx index f13916566e3..de49381407d 100644 --- a/LArCalorimeter/LArCalibTools/src/LArNoise2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArNoise2Ntuple.cxx @@ -35,7 +35,7 @@ StatusCode LArNoise2Ntuple::stop() { sc=m_detStore->retrieve(larNoise,m_contKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve ILArNoise with key " - << m_contKey << " from DetectorStore" << endreq; + << m_contKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -44,20 +44,20 @@ StatusCode LArNoise2Ntuple::stop() { sc=m_nt->addItem("icell",cellIndex,0,2000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",gain,0,3); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("noise",noise); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'noise' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'noise' failed" << endmsg; return StatusCode::FAILURE; } @@ -75,7 +75,7 @@ StatusCode LArNoise2Ntuple::stop() { noise = larNoise->noise(hwid,igain); sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if isConnected @@ -83,7 +83,7 @@ StatusCode LArNoise2Ntuple::stop() { }//end loop over online ID } // ovr gains - (*m_log) << MSG::INFO << "LArNoise2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArNoise2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArOFC2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArOFC2Ntuple.cxx index b493e08a790..a848ae50e6d 100755 --- a/LArCalorimeter/LArCalibTools/src/LArOFC2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArOFC2Ntuple.cxx @@ -32,7 +32,7 @@ StatusCode LArOFC2Ntuple::initialize() { return StatusCode::FAILURE; } if ( m_isMC && m_OFCTool.retrieve().isFailure() ) { - (*m_log) << MSG::ERROR << "OFC tool required for MC conditions but not available" << endreq; + (*m_log) << MSG::ERROR << "OFC tool required for MC conditions but not available" << endmsg; return StatusCode::FAILURE; } @@ -48,39 +48,39 @@ StatusCode LArOFC2Ntuple::stop() { sc=m_nt->addItem("Gain",gain,-1,2); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } //Specific: sc=m_nt->addItem("TimeOffset",timeOffset,0,100); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'TimeOffset' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'TimeOffset' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Phase",phase,0,49); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'phase' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'phase' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("PhaseTime",phasetime,0,800); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'PhaseTime' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'PhaseTime' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("nSamples",nSamples,0,100); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'nSamples' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'nSamples' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("OFCa",nSamples,OFCa); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'OFCa' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'OFCa' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("OFCb",nSamples,OFCb); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'OFCb' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'OFCb' failed" << endmsg; return StatusCode::FAILURE; } @@ -88,10 +88,10 @@ StatusCode LArOFC2Ntuple::stop() { const ILArOFC* larOFC = NULL ; //const LArOFCComplete* larOFC = NULL ; if ( !m_isMC ) { - (*m_log) << MSG::DEBUG << "Retrieving ILArOFC object with key " << m_contKey << endreq; + (*m_log) << MSG::DEBUG << "Retrieving ILArOFC object with key " << m_contKey << endmsg; sc = m_detStore->retrieve(larOFC,m_contKey); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Can't retrieve ILArOFC with key " << m_contKey << " from Conditions Store" << endreq; + (*m_log) << MSG::ERROR << "Can't retrieve ILArOFC with key " << m_contKey << " from Conditions Store" << endmsg; return StatusCode::FAILURE; } } @@ -106,7 +106,7 @@ StatusCode LArOFC2Ntuple::stop() { const HWIdentifier chid = *it; if (!m_larCablingSvc->isOnlineConnected(chid)) continue; (*m_log) << MSG::VERBOSE << "Dumping OFC for channel 0x" << MSG::hex - << chid.get_compact() << MSG::dec << endreq; + << chid.get_compact() << MSG::dec << endmsg; ILArOFC::OFCRef_t ofc_a=m_OFCTool->OFC_a(chid,igain); ILArOFC::OFCRef_t ofc_b=m_OFCTool->OFC_b(chid,igain); fillFromIdentifier(chid); @@ -124,7 +124,7 @@ StatusCode LArOFC2Ntuple::stop() { sc = ntupleSvc()->writeRecord(m_nt); cellCounter++; if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//loop over channels @@ -133,7 +133,7 @@ StatusCode LArOFC2Ntuple::stop() { const HWIdentifier chid = *it; if ( !m_larCablingSvc->isOnlineConnected(chid)) continue; (*m_log) << MSG::VERBOSE << "Dumping OFC for channel 0x" << MSG::hex - << chid.get_compact() << MSG::dec << endreq; + << chid.get_compact() << MSG::dec << endmsg; for (unsigned iphase=0;iphase<larOFC->nTimeBins(chid,igain);iphase++) { ILArOFC::OFCRef_t ofc_a=larOFC->OFC_a(chid,igain,iphase); //Check if we have OFC for this channel and gain @@ -155,14 +155,14 @@ StatusCode LArOFC2Ntuple::stop() { sc = ntupleSvc()->writeRecord(m_nt); cellCounter++; if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//loop over phases }//loop over channels } }//loop over gains - (*m_log) << MSG::INFO << "Total number of cells = " << cellCounter << endreq; - (*m_log) << MSG::INFO << "LArOFC2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "Total number of cells = " << cellCounter << endmsg; + (*m_log) << MSG::INFO << "LArOFC2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; } // end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx index ed97e8f4286..0ab0a55d2b4 100644 --- a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx @@ -26,7 +26,7 @@ LArOFCBinAlg::~LArOFCBinAlg() {} StatusCode LArOFCBinAlg::initialize() { //if(!m_perFebMG) { - // msg(MSG::ERROR) << "Not implemented yet....." <<endreq; + // msg(MSG::ERROR) << "Not implemented yet....." <<endmsg; // return StatusCode::FAILURE; //} m_ntTitle="Bin"; @@ -55,7 +55,7 @@ StatusCode LArOFCBinAlg::execute() { if(m_perFebMG || m_perFeb) { rein.open(m_fileName.c_str(),std::ifstream::in); if (!rein.good()) { - msg(MSG::ERROR) << "Failed to open file " << m_fileName << endreq; + msg(MSG::ERROR) << "Failed to open file " << m_fileName << endmsg; return StatusCode::FAILURE; } } @@ -94,14 +94,14 @@ StatusCode LArOFCBinAlg::execute() { CHECK(newCont->initialize()); StatusCode sc=detStore()->record(newCont,m_outputContainer); if(sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Failed to register container with key " << m_outputContainer << " to StoreGate" << endreq; + msg(MSG::ERROR) << "Failed to register container with key " << m_outputContainer << " to StoreGate" << endmsg; } LArCablingBase* larCablingSvc; ToolHandle<LArCablingService> tool("LArCablingService"); sc = tool.retrieve(); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << " Can't get LArCablingSvc." << endreq; + msg(MSG::ERROR) << " Can't get LArCablingSvc." << endmsg; return sc; } else larCablingSvc = (LArCablingBase*)&(*tool); const LArEM_Base_ID* emId; @@ -113,7 +113,7 @@ StatusCode LArOFCBinAlg::execute() { hecId=caloIdMgr->getHEC_ID(); for (int gain=0;gain<3;++gain) { - msg(MSG::INFO) << "Working on gain " << gain << endreq; + msg(MSG::INFO) << "Working on gain " << gain << endmsg; LArOFCBinComplete::ConstConditionsMapIterator it=oldCont->begin(gain); LArOFCBinComplete::ConstConditionsMapIterator it_e=oldCont->end(gain); for (;it!=it_e;++it) { @@ -173,7 +173,7 @@ StatusCode LArOFCBinAlg::execute() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } diff --git a/LArCalorimeter/LArCalibTools/src/LArParams2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArParams2Ntuple.cxx index 77eee5763a9..7f12d1663fe 100755 --- a/LArCalorimeter/LArCalibTools/src/LArParams2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArParams2Ntuple.cxx @@ -47,7 +47,7 @@ StatusCode LArParams2Ntuple::initialize() { if ( m_classNames.size() != m_nClasses ) { // should never happen! but just to be sure... - msg(MSG::FATAL) << "List of class names does not match foreseen number of classes, cannot go on!" << endreq ; + msg(MSG::FATAL) << "List of class names does not match foreseen number of classes, cannot go on!" << endmsg ; return StatusCode::FAILURE ; } @@ -59,24 +59,24 @@ StatusCode LArParams2Ntuple::initialize() { ATH_MSG_DEBUG("key " << m_keylist[i] << " does not correspond to any foreseen class"); return StatusCode::FAILURE ; } else { - msg(MSG::INFO) << "will dump " << m_keylist[i] << " to Ntuple" << endreq ; + msg(MSG::INFO) << "will dump " << m_keylist[i] << " to Ntuple" << endmsg ; m_dumpFlags.set(idx) ; } } if ( m_useAbstractInterface ) { - msg(MSG::INFO) << "All parameters will be accessed through abstract interface" << endreq ; + msg(MSG::INFO) << "All parameters will be accessed through abstract interface" << endmsg ; if ( ! m_allChannels2Ntuple ) { - msg(MSG::WARNING) << "This will force dumping to Ntuple all foreseen online channels!" << endreq ; + msg(MSG::WARNING) << "This will force dumping to Ntuple all foreseen online channels!" << endmsg ; m_allChannels2Ntuple = true ; } } else { - msg(MSG::INFO) << "All parameters will be accessed through their Complete/VsCalib class" << endreq ; + msg(MSG::INFO) << "All parameters will be accessed through their Complete/VsCalib class" << endmsg ; } if ( m_allChannels2Ntuple ) { - msg(MSG::INFO) << "All foreseen online channels will be written to Ntuple" << endreq ; + msg(MSG::INFO) << "All foreseen online channels will be written to Ntuple" << endmsg ; } else { - msg(MSG::INFO) << "Only channels with sensible parameters will be written to Ntuple (default)" << endreq ; + msg(MSG::INFO) << "Only channels with sensible parameters will be written to Ntuple (default)" << endmsg ; } return LArCond2NtupleBase::initialize(); @@ -111,39 +111,39 @@ StatusCode LArParams2Ntuple::stop() { StatusCode sc=m_nt->addItem("cellIndex",ntcellIndex,0,2000); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Cell Index' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",ntgain,-1,2); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Gain' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Gain' failed" << endmsg; return StatusCode::FAILURE; } if ( m_dumpFlags[CaliPulseParamsComplete] || m_dumpFlags[CaliPulseParamsVsCalib] ) { sc=m_nt->addItem("Tcal",ntTcal); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tcal' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tcal' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Fstep",ntFstep); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Fstep' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Fstep' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Offset",ntOffset); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Offset' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Offset' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("dTimeCal",ntdTimeCal); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'dTimeCal' failed" << endreq; + msg(MSG::ERROR) << "addItem 'dTimeCal' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("nCB",ntnCB); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'nCB' failed" << endreq; + msg(MSG::ERROR) << "addItem 'nCB' failed" << endmsg; return StatusCode::FAILURE; } } @@ -151,12 +151,12 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[DetCellParamsComplete] ) { sc=m_nt->addItem("Omega0",ntOmega0); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Omega0' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Omega0' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Taur",ntTaur); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Taur' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Taur' failed" << endmsg; return StatusCode::FAILURE; } } @@ -164,7 +164,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[PhysCaliTdiffComplete] ) { sc=m_nt->addItem("Tdiff",ntTdiff); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tdiff' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tdiff' failed" << endmsg; return StatusCode::FAILURE; } } @@ -172,7 +172,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[TdriftComplete] ) { sc=m_nt->addItem("Tdrift",ntTdrift); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tdrift' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tdrift' failed" << endmsg; return StatusCode::FAILURE; } } @@ -180,7 +180,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[MphysOverMcalComplete] ) { sc=m_nt->addItem("MphysOverMcal",ntMphysOverMcal); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'MphysOverMcal' failed" << endreq; + msg(MSG::ERROR) << "addItem 'MphysOverMcal' failed" << endmsg; return StatusCode::FAILURE; } } @@ -188,7 +188,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[RinjComplete] ) { sc=m_nt->addItem("Rinj",ntRinj); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Rinj' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Rinj' failed" << endmsg; return StatusCode::FAILURE; } } @@ -196,7 +196,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[TshaperComplete] ) { sc=m_nt->addItem("Tshaper",ntTshaper); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tshaper' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tshaper' failed" << endmsg; return StatusCode::FAILURE; } } @@ -204,7 +204,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[EMEC_CphiComplete] ) { sc=m_nt->addItem("EMEC_Cphi",ntEMEC_Cphi); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'EMEC_Cphi' failed" << endreq; + msg(MSG::ERROR) << "addItem 'EMEC_Cphi' failed" << endmsg; return StatusCode::FAILURE; } } @@ -212,7 +212,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[EMEC_HValphaComplete] ) { sc=m_nt->addItem("EMEC_HValpha",ntEMEC_HValpha); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'EMEC_HValpha' failed" << endreq; + msg(MSG::ERROR) << "addItem 'EMEC_HValpha' failed" << endmsg; return StatusCode::FAILURE; } } @@ -220,7 +220,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[EMEC_HVbetaComplete] ) { sc=m_nt->addItem("EMEC_HVbeta",ntEMEC_HVbeta); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'EMEC_HVbeta' failed" << endreq; + msg(MSG::ERROR) << "addItem 'EMEC_HVbeta' failed" << endmsg; return StatusCode::FAILURE; } } @@ -228,7 +228,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[CableLengthComplete] ) { sc=m_nt->addItem("CableLength",ntCableLength); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'CableLength' failed" << endreq; + msg(MSG::ERROR) << "addItem 'CableLength' failed" << endmsg; return StatusCode::FAILURE; } } @@ -236,7 +236,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[CableAttenuationComplete] ) { sc=m_nt->addItem("CableAttenuation",ntCableAttenuation); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'CableAttenuation' failed" << endreq; + msg(MSG::ERROR) << "addItem 'CableAttenuation' failed" << endmsg; return StatusCode::FAILURE; } } @@ -244,7 +244,7 @@ StatusCode LArParams2Ntuple::stop() { if ( m_dumpFlags[OFCBinComplete] ) { sc=m_nt->addItem("OFCBin",ntbin); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'OFCBin' failed" << endreq; + msg(MSG::ERROR) << "addItem 'OFCBin' failed" << endmsg; return StatusCode::FAILURE; } } @@ -430,7 +430,7 @@ StatusCode LArParams2Ntuple::stop() { const std::vector<bool> & flags = (map_it->second).flags() ; if ( flags.size() <= 0 ) continue ; if ( flags.size() < m_nClasses ) { // should never happen... - msg(MSG::WARNING) << "... flags vector shorter than " << m_nClasses << ": " << flags.size() << endreq ; + msg(MSG::WARNING) << "... flags vector shorter than " << m_nClasses << ": " << flags.size() << endmsg ; continue ; } @@ -492,7 +492,7 @@ StatusCode LArParams2Ntuple::stop() { } sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } ATH_MSG_DEBUG("... record written to ntuple"); @@ -511,7 +511,7 @@ StatusCode LArParams2Ntuple::scanReadoutChannels( const DATA*& data_object ) { bool useGain = LArParamsProperties::isGainDependent(data_object) ; if ( classIndex >= m_nClasses ) { - msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endreq ; + msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endmsg ; return StatusCode::FAILURE ; } @@ -526,7 +526,7 @@ StatusCode LArParams2Ntuple::scanReadoutChannels( const DATA*& data_object ) { std::string dataName = m_classNames[classIndex] ; if ( dataName.substr(dataName.length()-8,8) != std::string("Complete") ) { - msg(MSG::ERROR) << "Function scanReadoutChannels cannot be called for data class " << dataName << endreq ; + msg(MSG::ERROR) << "Function scanReadoutChannels cannot be called for data class " << dataName << endmsg ; return StatusCode::FAILURE ; } @@ -539,7 +539,7 @@ StatusCode LArParams2Ntuple::scanReadoutChannels( const DATA*& data_object ) { } if ( sc == StatusCode::FAILURE ) { - msg(MSG::ERROR) << "Could not retrieve " << dataName << " from detector store!" << endreq ; + msg(MSG::ERROR) << "Could not retrieve " << dataName << " from detector store!" << endmsg ; return sc ; } @@ -582,7 +582,7 @@ StatusCode LArParams2Ntuple::scanCalibChannels( const DATA*& data_object ) { unsigned classIndex = LArParamsProperties::getClassIndex(data_object) ; //bool useGain = LArParamsProperties::isGainDependent(data_object) ; if ( classIndex >= m_nClasses ) { - msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endreq ; + msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endmsg ; return StatusCode::FAILURE ; } @@ -590,7 +590,7 @@ StatusCode LArParams2Ntuple::scanCalibChannels( const DATA*& data_object ) { std::string dataName = m_classNames[classIndex] ; if ( dataName.substr(dataName.length()-7,7) != std::string("VsCalib") ) { - msg(MSG::ERROR) << "Function scanCalibChannels cannot be called for data class " << dataName << endreq ; + msg(MSG::ERROR) << "Function scanCalibChannels cannot be called for data class " << dataName << endmsg ; return StatusCode::FAILURE ; } @@ -603,7 +603,7 @@ StatusCode LArParams2Ntuple::scanCalibChannels( const DATA*& data_object ) { } if ( sc == StatusCode::FAILURE ) { - msg(MSG::ERROR) << "Could not retrieve " << dataName << " from detector store!" << endreq ; + msg(MSG::ERROR) << "Could not retrieve " << dataName << " from detector store!" << endmsg ; return sc ; } @@ -627,7 +627,7 @@ StatusCode LArParams2Ntuple::scanCalibChannels( const DATA*& data_object ) { unsigned ft = m_onlineId->feedthrough(cb_HWid) ; unsigned slot = m_onlineId->slot(cb_HWid) ; msg(MSG::VERBOSE) << " ... B/EC=" << b_ec << " P/N=" << p_n << " FT=" << ft << " slot=" << slot - << " nchan=" << nchan << endreq ; + << " nchan=" << nchan << endmsg ; }//end if verbose for ( unsigned ichan=0 ; ichan<nchan ; ichan++ ) { // loop through channels in a CB @@ -656,7 +656,7 @@ StatusCode LArParams2Ntuple::retrieveFromDetStore( const DATA*& data_object ) { unsigned classIndex = LArParamsProperties::getClassIndex(data_object) ; //bool useGain = LArParamsProperties::isGainDependent(data_object) ; if ( classIndex >= m_nClasses ) { - msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endreq ; + msg(MSG::ERROR) << "Class index " << classIndex << " beyond number of known classes: " << m_nClasses << endmsg ; return StatusCode::FAILURE ; } std::string detStoreKey = m_detStoreKeys[classIndex] + m_suffix ; @@ -666,7 +666,7 @@ StatusCode LArParams2Ntuple::retrieveFromDetStore( const DATA*& data_object ) { ATH_MSG_VERBOSE("Trying to retrieve " << dataName << " from detector store through abstract interface I" << detStoreKey << " ..."); StatusCode sc = retrieveAbstractInterface(data_object) ; if ( sc == StatusCode::FAILURE ) { - msg(MSG::WARNING) << "Could not retrieve " << dataName << " from detector store!" << endreq ; + msg(MSG::WARNING) << "Could not retrieve " << dataName << " from detector store!" << endmsg ; return sc ; } @@ -679,7 +679,7 @@ StatusCode LArParams2Ntuple::retrieveFromDetStore( const DATA*& data_object ) { StatusCode sc = m_detStore->retrieve(data_object) ; } if ( sc == StatusCode::FAILURE ) { - msg(MSG::WARNING) << "Could not retrieve " << dataName << " from detector store!" << endreq ; + msg(MSG::WARNING) << "Could not retrieve " << dataName << " from detector store!" << endmsg ; return sc ; } @@ -777,8 +777,8 @@ void LArParams2Ntuple::dumpChannels() // FILE* f = fopen( m_dumpAllOnlineChannels.c_str() , "w" ) ; if ( f == NULL ) { - msg(MSG::WARNING) << "Could not open file " << m_dumpAllOnlineChannels << endreq ; - msg(MSG::WARNING) << "... channels dump cannot be done!" << endreq ; + msg(MSG::WARNING) << "Could not open file " << m_dumpAllOnlineChannels << endmsg ; + msg(MSG::WARNING) << "... channels dump cannot be done!" << endmsg ; return ; } std::string subdet , comment , descr ; @@ -786,13 +786,13 @@ void LArParams2Ntuple::dumpChannels() std::vector<HWIdentifier>::const_iterator chIt = m_onlineId->channel_begin() ; std::vector<HWIdentifier>::const_iterator chItEnd = m_onlineId->channel_end() ; - msg(MSG::INFO) << "Dumping online read-out channels to file " << m_dumpAllOnlineChannels << endreq; + msg(MSG::INFO) << "Dumping online read-out channels to file " << m_dumpAllOnlineChannels << endmsg; for ( ; chIt != chItEnd ; chIt++ ) { writeToFile(*chIt,f) ; } std::vector<HWIdentifier>::const_iterator chCalibIt = m_onlineId->calib_channel_begin() ; std::vector<HWIdentifier>::const_iterator chCalibItEnd = m_onlineId->calib_channel_end() ; - msg(MSG::INFO) << "Dumping online calib channels to file " << m_dumpAllOnlineChannels << endreq; + msg(MSG::INFO) << "Dumping online calib channels to file " << m_dumpAllOnlineChannels << endmsg; for ( ; chCalibIt != chCalibItEnd ; chCalibIt++ ) { writeToFile(*chCalibIt,f) ; } diff --git a/LArCalorimeter/LArCalibTools/src/LArPedestals2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArPedestals2Ntuple.cxx index f2021203bc3..ed6e0e9ca9b 100755 --- a/LArCalorimeter/LArCalibTools/src/LArPedestals2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArPedestals2Ntuple.cxx @@ -24,7 +24,7 @@ StatusCode LArPedestals2Ntuple::stop() { sc=m_detStore->retrieve(larPedestal,m_contKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve ILArPedestal with key " - << m_contKey << " from DetectorStore" << endreq; + << m_contKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -35,26 +35,26 @@ StatusCode LArPedestals2Ntuple::stop() { sc=m_nt->addItem("icell",cellIndex,0,200000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",gain,0,3); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("ped",ped,-1000.,5000.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'ped' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'ped' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("rms",rms,0.,1e12); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'rms' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'rms' failed" << endmsg; return StatusCode::FAILURE; } @@ -75,7 +75,7 @@ StatusCode LArPedestals2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }// end if Pedestal exists for this channel @@ -83,7 +83,7 @@ StatusCode LArPedestals2Ntuple::stop() { }//end loop over gains }//end loop over online ID - (*m_log) << MSG::INFO << "LArPedestals2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArPedestals2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArPhysCaliTDiffAlg.cxx b/LArCalorimeter/LArCalibTools/src/LArPhysCaliTDiffAlg.cxx index daafed8c572..c0778e3465d 100644 --- a/LArCalorimeter/LArCalibTools/src/LArPhysCaliTDiffAlg.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArPhysCaliTDiffAlg.cxx @@ -48,7 +48,7 @@ StatusCode LArPhysCaliTDiffAlg::execute() { if(m_perFebMG) offsetMap.resize(2); else offsetMap.resize(3); std::ifstream rein(m_fileName.c_str(),std::ifstream::in); if (!rein.good()) { - msg(MSG::ERROR) << "Failed to open file " << m_fileName << endreq; + msg(MSG::ERROR) << "Failed to open file " << m_fileName << endmsg; return StatusCode::SUCCESS; } @@ -78,11 +78,11 @@ StatusCode LArPhysCaliTDiffAlg::execute() { CHECK(newCont->initialize()); StatusCode sc=detStore()->record(newCont,m_outputContainer); if(sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Failed to register container with key " << m_outputContainer << " to StoreGate" << endreq; + msg(MSG::ERROR) << "Failed to register container with key " << m_outputContainer << " to StoreGate" << endmsg; } for (int gain=0;gain<3;++gain) { - msg(MSG::INFO) << "Working on gain " << gain << endreq; + msg(MSG::INFO) << "Working on gain " << gain << endmsg; LArPhysCaliTdiffComplete::ConstConditionsMapIterator it=oldCont->begin(gain); LArPhysCaliTdiffComplete::ConstConditionsMapIterator it_e=oldCont->end(gain); for (;it!=it_e;++it) { @@ -124,7 +124,7 @@ StatusCode LArPhysCaliTDiffAlg::execute() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } diff --git a/LArCalorimeter/LArCalibTools/src/LArPhysWaves2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArPhysWaves2Ntuple.cxx index 93ec1403497..5bebf0a0645 100644 --- a/LArCalorimeter/LArCalibTools/src/LArPhysWaves2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArPhysWaves2Ntuple.cxx @@ -33,13 +33,13 @@ StatusCode LArPhysWaves2Ntuple::stop() sc=m_nt->addItem("gain",m_gain,0,3); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("timeOffset",m_timeOffset,0.,100.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'timeOffset' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'timeOffset' failed" << endmsg; return StatusCode::FAILURE; } @@ -47,7 +47,7 @@ StatusCode LArPhysWaves2Ntuple::stop() if (m_addCorrUndo) { sc=m_nt->addItem("corrUndo",m_corrUndo,0,1); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endmsg; return StatusCode::FAILURE; } } @@ -56,24 +56,24 @@ StatusCode LArPhysWaves2Ntuple::stop() const std::string& key = m_keylist[k] ; - (*m_log) << MSG::INFO << "Processing WaveContainer from StoreGate! key=" << m_keylist[k] << endreq; + (*m_log) << MSG::INFO << "Processing WaveContainer from StoreGate! key=" << m_keylist[k] << endmsg; const LArPhysWaveContainer* physWaveContainer; LArPhysWaveContainer* physWaveContainer_nc; StatusCode sc; if (m_applyCorr) { sc = m_detStore->retrieve(physWaveContainer_nc,key); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Cannot read non-const LArPhysWaveContainer from StoreGate! key=" << key << endreq; - (*m_log) << MSG::ERROR << "The ApplyCorrection option works only for non-const containers!" << endreq; + (*m_log) << MSG::ERROR << "Cannot read non-const LArPhysWaveContainer from StoreGate! key=" << key << endmsg; + (*m_log) << MSG::ERROR << "The ApplyCorrection option works only for non-const containers!" << endmsg; return sc; } else - (*m_log) << MSG::INFO << "Read non-const LArPhysWaveContainer from StoreGate! key= " << key << endreq; + (*m_log) << MSG::INFO << "Read non-const LArPhysWaveContainer from StoreGate! key= " << key << endmsg; if (!physWaveContainer_nc->correctionsApplied()) { sc=physWaveContainer_nc->applyCorrections(); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Failed to apply corrections to LArPhysWaveContainer!" << endreq; + (*m_log) << MSG::ERROR << "Failed to apply corrections to LArPhysWaveContainer!" << endmsg; } } physWaveContainer=physWaveContainer_nc; @@ -81,10 +81,10 @@ StatusCode LArPhysWaves2Ntuple::stop() else { sc = m_detStore->retrieve(physWaveContainer,key); if (sc.isFailure()) { - (*m_log) << MSG::ERROR << "Cannot read LArPhysWaveContainer from StoreGate! key=" << key << endreq; + (*m_log) << MSG::ERROR << "Cannot read LArPhysWaveContainer from StoreGate! key=" << key << endmsg; return StatusCode::FAILURE; } else - (*m_log) << MSG::INFO << "Read const LArPhysWaveContainer from StoreGate! key= " << key << endreq; + (*m_log) << MSG::INFO << "Read const LArPhysWaveContainer from StoreGate! key= " << key << endmsg; } for (unsigned igain=CaloGain::LARHIGHGAIN;igain<CaloGain::LARNGAIN ;++igain){ @@ -100,7 +100,7 @@ StatusCode LArPhysWaves2Ntuple::stop() m_timeOffset = wave.getTimeOffset(); sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return sc; } }//end loop over identifiers @@ -118,14 +118,14 @@ StatusCode LArPhysWaves2Ntuple::stop() fillWave(chid,wave); //Fill method from base-class sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return sc; } }//end loop over corrections }//end loop over gain }//end if addCorrUndo }//end loop over container keys - (*m_log) << MSG::INFO << "LArWave2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArWave2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; } // end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArRamps2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArRamps2Ntuple.cxx index 0fdfbee53a0..c7ff0456eee 100755 --- a/LArCalorimeter/LArCalibTools/src/LArRamps2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArRamps2Ntuple.cxx @@ -79,14 +79,14 @@ StatusCode LArRamps2Ntuple::stop() { LArRawRampContainer* rawRampContainer=NULL; sc=m_detStore->retrieve(rawRampContainer,*key_it); if (sc!=StatusCode::SUCCESS || !rawRampContainer) { - (*m_log) << MSG::WARNING << "Unable to retrieve LArRawRampContainer with key " << *key_it << endreq; + (*m_log) << MSG::WARNING << "Unable to retrieve LArRawRampContainer with key " << *key_it << endmsg; } else { - (*m_log) << MSG::DEBUG << "Got LArRawRampContainer with key " << *key_it << endreq; + (*m_log) << MSG::DEBUG << "Got LArRawRampContainer with key " << *key_it << endmsg; hasRawRampContainer = true; } } - if (!hasRawRampContainer) (*m_log) << MSG::WARNING << " No LArRawRampContainer found. Only fitted ramp in ntuple " << endreq; + if (!hasRawRampContainer) (*m_log) << MSG::WARNING << " No LArRawRampContainer found. Only fitted ramp in ntuple " << endmsg; } //end-if m_rawRamp @@ -94,11 +94,11 @@ StatusCode LArRamps2Ntuple::stop() { const ILArRamp* ramp=NULL; sc=m_detStore->retrieve(ramp,m_rampKey); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::WARNING << "Unable to retrieve ILArRamp with key: "<<m_rampKey << " from DetectorStore" << endreq; + (*m_log) << MSG::WARNING << "Unable to retrieve ILArRamp with key: "<<m_rampKey << " from DetectorStore" << endmsg; } if (!ramp && !hasRawRampContainer) { - (*m_log) << MSG::ERROR << "Have neither Raw Ramp nor Fitted Ramp. No Ntuple produced." << endreq; + (*m_log) << MSG::ERROR << "Have neither Raw Ramp nor Fitted Ramp. No Ntuple produced." << endmsg; return StatusCode::FAILURE; } @@ -108,7 +108,7 @@ StatusCode LArRamps2Ntuple::stop() { if(dynamic_cast<const LArRampComplete*>(ramp)) { sc=m_detStore->retrieve(rampComplete,m_rampKey); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::WARNING << "Unable to retrieve LArRampComplete with key: "<<m_rampKey << " from DetectorStore" << endreq; + (*m_log) << MSG::WARNING << "Unable to retrieve LArRampComplete with key: "<<m_rampKey << " from DetectorStore" << endmsg; } myramp=(LArConditionsContainer<LArRampP1>*) rampComplete; @@ -117,10 +117,10 @@ StatusCode LArRamps2Ntuple::stop() { if(!myramp->correctionsApplied()) { sc = myramp->applyCorrections(); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "Applying corrections failed" << endreq; + (*m_log) << MSG::ERROR << "Applying corrections failed" << endmsg; } } else { - (*m_log) << MSG::WARNING << "Corrections already applied. Can't apply twice!" << endreq; + (*m_log) << MSG::WARNING << "Corrections already applied. Can't apply twice!" << endmsg; } } } @@ -128,20 +128,20 @@ StatusCode LArRamps2Ntuple::stop() { sc=m_nt->addItem("cellIndex",cellIndex,0,2000); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("gain",gain,0,3); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } if (m_addCorrUndo) { sc=m_nt->addItem("corrUndo",corrUndo,0,1); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'corrUndo' failed" << endmsg; return StatusCode::FAILURE; } } @@ -150,109 +150,109 @@ StatusCode LArRamps2Ntuple::stop() { { sc=m_nt->addItem("DACIndex",DACIndex,0,800); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'DACIndex' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'DACIndex' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("SampleMax",DACIndex,SampleMax); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'SampleMax' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'SampleMax' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("TimeMax",DACIndex,TimeMax); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'TimeMax' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'TimeMax' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("ADC",DACIndex,ADC); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'ADC' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'ADC' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("DAC",DACIndex,DAC); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'DAC' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'DAC' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("NTriggers",DACIndex,NTriggers); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'NTriggers' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'NTriggers' failed" << endmsg; return StatusCode::FAILURE; } if(m_saveAllSamples){ sc=m_nt->addItem("Sample0",DACIndex,Sample0); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample0' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample0' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample1",DACIndex,Sample1); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample1' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample1' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample2",DACIndex,Sample2); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample2' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample2' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample3",DACIndex,Sample3); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample3' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample3' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample4",DACIndex,Sample4); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample4' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample4' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample5",DACIndex,Sample5); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample5' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample5' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Sample6",DACIndex,Sample6); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Sample6' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Sample6' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS0",DACIndex,RMS0); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS0' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS0' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS1",DACIndex,RMS1); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS1' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS1' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS2",DACIndex,RMS2); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS2' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS2' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS3",DACIndex,RMS3); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS3' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS3' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS4",DACIndex,RMS4); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS4' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS4' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS5",DACIndex,RMS5); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS5' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS5' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("RMS6",DACIndex,RMS6); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RMS6' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RMS6' failed" << endmsg; return StatusCode::FAILURE; } }// end-if Save all samples @@ -262,20 +262,20 @@ StatusCode LArRamps2Ntuple::stop() { if (ramp) { sc=m_nt->addItem("Xi",coeffIndex,0,7); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'coeffIndex' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'coeffIndex' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("X",coeffIndex,coeffs); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'coeff' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'coeff' failed" << endmsg; return StatusCode::FAILURE; } if (hasRawRampContainer) { //== RampComplete && RawRamp sc=m_nt->addItem("RampRMS",RampRMS,-1000,1000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'RampRMS' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'RampRMS' failed" << endmsg; return StatusCode::FAILURE; } } @@ -293,7 +293,7 @@ StatusCode LArRamps2Ntuple::stop() { LArRawRampContainer* rawRampContainer=NULL; sc=m_detStore->retrieve(rawRampContainer,*key_it); if (sc!=StatusCode::SUCCESS || !rawRampContainer) { - (*m_log) << MSG::WARNING << "Unable to retrieve LArRawRampContainer with key " << *key_it << endreq; + (*m_log) << MSG::WARNING << "Unable to retrieve LArRawRampContainer with key " << *key_it << endmsg; continue; } LArRawRampContainer::const_iterator cont_it=rawRampContainer->begin(); @@ -312,7 +312,7 @@ StatusCode LArRamps2Ntuple::stop() { if(m_saveAllSamples){ if ( !singleRamp[DACIndex].Samples.size() || !singleRamp[DACIndex].RMS.size() ) { - (*m_log) << MSG::WARNING << "Cannot save all samples, vector empty" << endreq; + (*m_log) << MSG::WARNING << "Cannot save all samples, vector empty" << endmsg; } else { Sample0[DACIndex]=singleRamp[DACIndex].Samples[0]; @@ -349,7 +349,7 @@ StatusCode LArRamps2Ntuple::stop() { const ILArRamp::RampRef_t rampcoeff = ramp->ADC2DAC(chid,igain); if (rampcoeff.size()==0) { (*m_log) << MSG::WARNING << "Can't get fitted Ramp slot=" << static_cast<long>(m_slot) << - " channel=" << static_cast<long>(m_channel) << " gain=" << igain << endreq; + " channel=" << static_cast<long>(m_channel) << " gain=" << igain << endmsg; } for (coeffIndex=0;coeffIndex<rampcoeff.size();coeffIndex++) coeffs[coeffIndex]=rampcoeff[coeffIndex]; nDAC = singleRamp.size(); @@ -371,7 +371,7 @@ StatusCode LArRamps2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } @@ -402,7 +402,7 @@ StatusCode LArRamps2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }// end if isConnected @@ -441,7 +441,7 @@ StatusCode LArRamps2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end loop over cells @@ -452,12 +452,12 @@ StatusCode LArRamps2Ntuple::stop() { if(m_applyCorr && myramp) { sc = myramp->undoCorrections(); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "Undo corrections failed" << endreq; + (*m_log) << MSG::ERROR << "Undo corrections failed" << endmsg; } } - (*m_log) << MSG::INFO << "LArRamps2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArRamps2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; } // end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArShape2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArShape2Ntuple.cxx index 9d621db7c6c..1df88891dd5 100644 --- a/LArCalorimeter/LArCalibTools/src/LArShape2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArShape2Ntuple.cxx @@ -43,7 +43,7 @@ StatusCode LArShape2Ntuple::stop() { sc=m_nt->addItem("Gain",gain,-1,2); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'gain' failed" << endreq; + msg(MSG::ERROR) << "addItem 'gain' failed" << endmsg; return StatusCode::FAILURE; } @@ -51,33 +51,33 @@ StatusCode LArShape2Ntuple::stop() { if (m_isComplete) { sc=m_nt->addItem("TimeOffset",timeOffset,0,100); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'TimeOffset' failed" << endreq; + msg(MSG::ERROR) << "addItem 'TimeOffset' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Phase",phase,0,49); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'phase' failed" << endreq; + msg(MSG::ERROR) << "addItem 'phase' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("PhaseTime",phasetime,0,800); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'PhaseTime' failed" << endreq; + msg(MSG::ERROR) << "addItem 'PhaseTime' failed" << endmsg; return StatusCode::FAILURE; } } sc=m_nt->addItem("nSamples",nSamples,0,100); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'nSamples' failed" << endreq; + msg(MSG::ERROR) << "addItem 'nSamples' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Shape",nSamples,Shape); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Shape' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Shape' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("ShapeDer",nSamples,ShapeDer); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'ShapeDer' failed" << endreq; + msg(MSG::ERROR) << "addItem 'ShapeDer' failed" << endmsg; return StatusCode::FAILURE; } @@ -87,7 +87,7 @@ StatusCode LArShape2Ntuple::stop() { if (m_isComplete) { sc = detStore()->retrieve(larShapeComplete,m_contKey); if (sc.isFailure()) { - msg(MSG::ERROR) << "Can't retrieve LArShapeComplete object with key " << m_contKey << endreq; + msg(MSG::ERROR) << "Can't retrieve LArShapeComplete object with key " << m_contKey << endmsg; return StatusCode::FAILURE; } larShape=larShapeComplete; //Cast to base-class @@ -95,7 +95,7 @@ StatusCode LArShape2Ntuple::stop() { else { //Use just the abstract interface (works also for LArShapeFlat and LArShapeMC) sc = detStore()->retrieve(larShape,m_contKey); if (sc.isFailure()) { - msg(MSG::ERROR) << "Can't retrieve ILArShape object with key " << m_contKey << endreq; + msg(MSG::ERROR) << "Can't retrieve ILArShape object with key " << m_contKey << endmsg; return StatusCode::FAILURE; } } @@ -130,14 +130,14 @@ StatusCode LArShape2Ntuple::stop() { sc = ntupleSvc()->writeRecord(m_nt); cellCounter++; if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//loop over phases }//loop over channels }//loop over gains - (*m_log) << MSG::INFO << "Total number of cells = " << cellCounter << endreq; - (*m_log) << MSG::INFO << "LArShape2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "Total number of cells = " << cellCounter << endmsg; + (*m_log) << MSG::INFO << "LArShape2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; } // end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LArWFParams2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArWFParams2Ntuple.cxx index e627c474751..a4198645606 100755 --- a/LArCalorimeter/LArCalibTools/src/LArWFParams2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArWFParams2Ntuple.cxx @@ -57,7 +57,7 @@ StatusCode LArWFParams2Ntuple::stop() { ATH_MSG_DEBUG("Retrieving LArCaliPulseParamsComplete from detector store..."); StatusCode sc = detStore()->retrieve(completeCaliPulseParams,m_caliPulseParamsKey) ; if ( sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve LArCaliPulseParamsComplete from detector store!" << endreq ; + msg(MSG::ERROR) << "Could not retrieve LArCaliPulseParamsComplete from detector store!" << endmsg ; m_dumpCaliPulseParams = false ; } } @@ -66,7 +66,7 @@ StatusCode LArWFParams2Ntuple::stop() { ATH_MSG_DEBUG("Retrieving LArDetCellParamsComplete from detector store..."); StatusCode sc = detStore()->retrieve(completeDetCellParams,m_detCellParamsKey); if ( sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve LArDetCellParamsComplete from detector store!" << endreq ; + msg(MSG::ERROR) << "Could not retrieve LArDetCellParamsComplete from detector store!" << endmsg ; m_dumpDetCellParams = false; } } @@ -76,7 +76,7 @@ StatusCode LArWFParams2Ntuple::stop() { ATH_MSG_DEBUG("Retrieving LArPhysCaliTdiffComplete from detector store..."); StatusCode sc = detStore()->retrieve(completePhysCaliTdiff,m_physCaliTDiffKey); if ( sc.isFailure()) { - msg(MSG::ERROR) << "Could not retrieve LArPhysCaliTdiffComplete from detector store!" << endreq ; + msg(MSG::ERROR) << "Could not retrieve LArPhysCaliTdiffComplete from detector store!" << endmsg ; m_dumpPhysCaliTdiff = false ; } } @@ -86,7 +86,7 @@ StatusCode LArWFParams2Ntuple::stop() { ATH_MSG_DEBUG("Retrieving LArTdriftComplete from detector store..."); StatusCode sc = detStore()->retrieve(completeTdrift,m_tdriftKey) ; if ( sc.isFailure()) { - msg(MSG::ERROR) << "Could not retrieve LArTdriftComplete from detector store!" << endreq; + msg(MSG::ERROR) << "Could not retrieve LArTdriftComplete from detector store!" << endmsg; m_dumpTdrift = false ; } } @@ -95,7 +95,7 @@ StatusCode LArWFParams2Ntuple::stop() { ATH_MSG_DEBUG("Retrieving LArOFCBinComplete from detector store..."); StatusCode sc = detStore()->retrieve(completeOFCBin,m_ofcBinKey) ; if ( sc.isFailure()) { - msg(MSG::ERROR) << "Could not retrieve LArOFCBinComplete from detector store!" << endreq; + msg(MSG::ERROR) << "Could not retrieve LArOFCBinComplete from detector store!" << endmsg; m_dumpOFCBin= false ; } } @@ -107,7 +107,7 @@ StatusCode LArWFParams2Ntuple::stop() { StatusCode sc=m_nt->addItem("gain",gain,-1,2); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Gain' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Gain' failed" << endmsg; return StatusCode::FAILURE; } @@ -115,56 +115,56 @@ StatusCode LArWFParams2Ntuple::stop() { if ( m_dumpCaliPulseParams ) { sc=m_nt->addItem("Tcal",Tcal); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tcal' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tcal' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Fstep",Fstep); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Fstep' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Fstep' failed" << endmsg; return StatusCode::FAILURE; } } if ( m_dumpTdrift ) { sc=m_nt->addItem("Tdrift",Tdrift); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tdrift' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tdrift' failed" << endmsg; return StatusCode::FAILURE; } } if ( m_dumpPhysCaliTdiff ) { sc=m_nt->addItem("Tdiff",Tdiff); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Tdiff' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Tdiff' failed" << endmsg; return StatusCode::FAILURE; } } if ( m_dumpDetCellParams ) { sc=m_nt->addItem("Omega0",Omega0); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Omega0' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Omega0' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Taur",Taur); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addItem 'Taur' failed" << endreq; + msg(MSG::ERROR) << "addItem 'Taur' failed" << endmsg; return StatusCode::FAILURE; } } if (m_dumpOFCBin) { sc=m_nt->addItem("Bin",ofcbin); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "addIdetm 'Bin' failed!" << endreq; + msg(MSG::ERROR) << "addIdetm 'Bin' failed!" << endmsg; } } // sc=m_nt->addItem("Tshaper",m_Tshaper); // if (sc!=StatusCode::SUCCESS) { -// msg(MSG::ERROR) << "addItem 'Tshaper' failed" << endreq; +// msg(MSG::ERROR) << "addItem 'Tshaper' failed" << endmsg; // return StatusCode::FAILURE; // } // sc=m_nt->addItem("Amplitude",m_Amplitude); // if (sc!=StatusCode::SUCCESS) { -// msg(MSG::ERROR) << "addItem 'Amplitude' failed" << endreq; +// msg(MSG::ERROR) << "addItem 'Amplitude' failed" << endmsg; // return StatusCode::FAILURE; // } @@ -259,7 +259,7 @@ StatusCode LArWFParams2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - msg(MSG::ERROR) << "writeRecord failed" << endreq; + msg(MSG::ERROR) << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if have data diff --git a/LArCalorimeter/LArCalibTools/src/LArWaves2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArWaves2Ntuple.cxx index 7f97dd31813..4ee83b02a5a 100755 --- a/LArCalorimeter/LArCalibTools/src/LArWaves2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArWaves2Ntuple.cxx @@ -23,80 +23,80 @@ StatusCode LArWaves2Ntuple::initialize() { sc=m_nt->addItem("flag",m_flag,0,1000); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Flag' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Flag' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("timeIndex",m_timeIndex,0,100000); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'timeIndex' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'timeIndex' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Dt",m_dt,0.,25.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Dt' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Dt' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Time",m_timeIndex,m_time); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Time' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Time' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Amplitude",m_timeIndex,m_ampliPulse); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem failed" << endreq; + (*m_log) << MSG::ERROR << "addItem failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Error",m_timeIndex,m_errorPulse); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Error' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Error' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Triggers",m_timeIndex,m_triggers); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Triggers' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Triggers' failed" << endmsg; return StatusCode::FAILURE; } if ( m_saveDerivedInfo ) { sc=m_nt->addItem("Baseline",m_baseline,0.,1200.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Baseline' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Baseline' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("TmaxAmp",m_tmaxAmp,0.,4095.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'TmaxAmp' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'TmaxAmp' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("MaxAmp",m_maxAmp,0.,4095.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'MaxAmp' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'MaxAmp' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("PosLobe",m_posLobe,0.,100.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'PosLobe' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'PosLobe' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("T0",m_rT0,20.,100.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'RT0' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'RT0' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("Width",m_width,0.,125.); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "addItem 'Width' failed" << endreq; + (*m_log) << MSG::ERROR << "addItem 'Width' failed" << endmsg; return StatusCode::FAILURE; } } diff --git a/LArCalorimeter/LArCalibTools/src/LArfSampl2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArfSampl2Ntuple.cxx index da14dbe1e08..308125d6ba7 100644 --- a/LArCalorimeter/LArCalibTools/src/LArfSampl2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArfSampl2Ntuple.cxx @@ -32,7 +32,7 @@ StatusCode LArfSampl2Ntuple::stop() { sc=m_detStore->retrieve(larfSampl,m_contKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve ILArNoise with key " - << m_contKey << " from DetectorStore" << endreq; + << m_contKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -41,13 +41,13 @@ StatusCode LArfSampl2Ntuple::stop() { sc=m_nt->addItem("icell",cellIndex,0,2000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("fsampl",fsampl); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'fsampl' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'fsampl' failed" << endmsg; return StatusCode::FAILURE; } @@ -63,14 +63,14 @@ StatusCode LArfSampl2Ntuple::stop() { fsampl = larfSampl->FSAMPL(hwid); sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } }//end if isConnected cellCounter++; }//end loop over online ID - (*m_log) << MSG::INFO << "LArfSampl2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LArfSampl2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArCalibTools/src/LAruA2MeV2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LAruA2MeV2Ntuple.cxx index ce73c2f9114..928fafc4fcb 100755 --- a/LArCalorimeter/LArCalibTools/src/LAruA2MeV2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LAruA2MeV2Ntuple.cxx @@ -30,18 +30,18 @@ StatusCode LAruA2MeV2Ntuple::stop() { sc=m_nt->addItem("icell",cellIndex,0,2000); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'Cell Index' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("uAMeV",uA2MeV,-1000.,5000.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'uAMeV' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'uAMeV' failed" << endmsg; return StatusCode::FAILURE; } sc=m_nt->addItem("DAC2uA",DAC2uA,-1000.,5000.); if (sc!=StatusCode::SUCCESS) - {(*m_log) << MSG::ERROR << "addItem 'DAC2uA' failed" << endreq; + {(*m_log) << MSG::ERROR << "addItem 'DAC2uA' failed" << endmsg; return StatusCode::FAILURE; } @@ -50,7 +50,7 @@ StatusCode LAruA2MeV2Ntuple::stop() { sc=m_detStore->retrieve(laruA2MeVComplete,m_uA2MeVKey); if (sc!=StatusCode::SUCCESS) {(*m_log) << MSG::ERROR << "Unable to retrieve LAruA2MeVComplete with key " - << m_uA2MeVKey << " from DetectorStore" << endreq; + << m_uA2MeVKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -58,7 +58,7 @@ StatusCode LAruA2MeV2Ntuple::stop() { sc=m_detStore->retrieve(larDAC2uAComplete,m_DAC2uAKey); if (sc!=StatusCode::SUCCESS) { (*m_log) << MSG::ERROR << "Unable to retrieve LArDAC2uAComplete with key " - << m_DAC2uAKey << " from DetectorStore" << endreq; + << m_DAC2uAKey << " from DetectorStore" << endmsg; return StatusCode::FAILURE; } @@ -75,14 +75,14 @@ StatusCode LAruA2MeV2Ntuple::stop() { sc=ntupleSvc()->writeRecord(m_nt); if (sc!=StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "writeRecord failed" << endreq; + (*m_log) << MSG::ERROR << "writeRecord failed" << endmsg; return StatusCode::FAILURE; } cellCounter++; }//end if connected }//end loop over online ID - (*m_log) << MSG::INFO << "LAruA2MeV2Ntuple has finished." << endreq; + (*m_log) << MSG::INFO << "LAruA2MeV2Ntuple has finished." << endmsg; return StatusCode::SUCCESS; }// end finalize-method. diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx index e59400d007f..f22eb80e50a 100755 --- a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx +++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx @@ -539,7 +539,7 @@ StatusCode TestLArHWID_Algo::execute(){ n_hvline++; if(n_hvline==n_hvlineold+400){ log << MSG::INFO << "[HVLINE] processing HV line ..# " - << n_hvline << endreq; + << n_hvline << endmsg; n_hvlineold=n_hvline; } if( m_Detector == "EMB" || m_Detector == "ALL" ){ @@ -721,61 +721,61 @@ StatusCode TestLArHWID_Algo::execute(){ << " HvId2 incorrect: " << m_hvHelper->show_to_string(hvId2) << " should be: " << m_hvHelper->show_to_string(hvId) << " hashId: " << hashId - << endreq; + << endmsg; error = true; } } int nDET = nFCAL+nHEC+nEMB+nEMEC+nEMBPS+nEMECPS; - log << MSG::INFO << "============================================================================ " << endreq; + log << MSG::INFO << "============================================================================ " << endmsg; if( m_Detector == "ALL" ){ - log << MSG::INFO << " [HVLINE] | SUMMARY " << endreq; - log << MSG::INFO << "============================================================================ " << endreq; + log << MSG::INFO << " [HVLINE] | SUMMARY " << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; } if( m_Detector == "EMB" || m_Detector == "ALL" ){ - log << MSG::INFO << " [HVLINE] | EMBARREL SUMMARY (list in ATLAS_HIGHVOLTAGE_EMB.out) " << endreq; - log << MSG::INFO << "============================================================================ " << endreq; - log << MSG::INFO << " -- EMB : " << nEMB << " (ref: 1008)" << endreq; - log << MSG::INFO << " - A-side : " << nEMBA << " (ref: 488)" << endreq; - log << MSG::INFO << " - C-side : " << nEMBC << " (ref: 520)" << endreq; - log << MSG::INFO << " -- EMB electrode: " << nEL_EMB << " (ref: 28,672)" << endreq; + log << MSG::INFO << " [HVLINE] | EMBARREL SUMMARY (list in ATLAS_HIGHVOLTAGE_EMB.out) " << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; + log << MSG::INFO << " -- EMB : " << nEMB << " (ref: 1008)" << endmsg; + log << MSG::INFO << " - A-side : " << nEMBA << " (ref: 488)" << endmsg; + log << MSG::INFO << " - C-side : " << nEMBC << " (ref: 520)" << endmsg; + log << MSG::INFO << " -- EMB electrode: " << nEL_EMB << " (ref: 28,672)" << endmsg; } if( (m_Detector == "EMB" && m_SubDetector == "S0" ) || m_Detector == "ALL"){ - log << MSG::INFO << " -- EMBPS : " << nEMBPS << " (ref: 512)" << endreq; + log << MSG::INFO << " -- EMBPS : " << nEMBPS << " (ref: 512)" << endmsg; } if( (m_Detector == "EMEC" && m_SubDetector == "S0" ) || m_Detector == "ALL"){ - log << MSG::INFO << " -- EMECPS : " << nEMECPS << " (ref: 128)" << endreq; + log << MSG::INFO << " -- EMECPS : " << nEMECPS << " (ref: 128)" << endmsg; } if( m_Detector == "EMEC" || m_Detector == "ALL" ){ - log << MSG::INFO << " [HVLINE] | EMEC SUMMARY (list in ATLAS_HIGHVOLTAGE_EMEC.out) " << endreq; - log << MSG::INFO << "============================================================================ " << endreq; - log << MSG::INFO << " -- EMEC : " << nEMEC << " (ref: 1493)" << endreq; - log << MSG::INFO << " - A-side : " << nEMECA << " (ref: 754)" << endreq; - log << MSG::INFO << " - C-side : " << nEMECC << " (ref: 739)" << endreq; - log << MSG::INFO << " --EMEC electrode: " << nEL_EMEC << " (ref: 23,552)" << endreq; + log << MSG::INFO << " [HVLINE] | EMEC SUMMARY (list in ATLAS_HIGHVOLTAGE_EMEC.out) " << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; + log << MSG::INFO << " -- EMEC : " << nEMEC << " (ref: 1493)" << endmsg; + log << MSG::INFO << " - A-side : " << nEMECA << " (ref: 754)" << endmsg; + log << MSG::INFO << " - C-side : " << nEMECC << " (ref: 739)" << endmsg; + log << MSG::INFO << " --EMEC electrode: " << nEL_EMEC << " (ref: 23,552)" << endmsg; } if( m_Detector == "FCAL" || m_Detector == "ALL" ){ - log << MSG::INFO << " [HVLINE] | FCAL SUMMARY (list in ATLAS_HIGHVOLTAGE_FCAL.out) " << endreq; - log << MSG::INFO << "============================================================================ " << endreq; - log << MSG::INFO << " -- FCAL : " << nFCAL << " (ref: 224)" << endreq; - log << MSG::INFO << " - A-side : " << nFCALA << " (ref: 112)" << endreq; - log << MSG::INFO << " - C-side : " << nFCALC << " (ref: 112)" << endreq; - log << MSG::INFO << " --FCAL electrode: " << nEL_FCAL << " (ref: 224)" << endreq; + log << MSG::INFO << " [HVLINE] | FCAL SUMMARY (list in ATLAS_HIGHVOLTAGE_FCAL.out) " << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; + log << MSG::INFO << " -- FCAL : " << nFCAL << " (ref: 224)" << endmsg; + log << MSG::INFO << " - A-side : " << nFCALA << " (ref: 112)" << endmsg; + log << MSG::INFO << " - C-side : " << nFCALC << " (ref: 112)" << endmsg; + log << MSG::INFO << " --FCAL electrode: " << nEL_FCAL << " (ref: 224)" << endmsg; } if( m_Detector == "HEC" || m_Detector == "ALL" ){ - log << MSG::INFO << " [HVLINE] | HEC SUMMARY (list in ATLAS_HIGHVOLTAGE_HEC.out) " << endreq; - log << MSG::INFO << "============================================================================ " << endreq; - log << MSG::INFO << " -- HEC : " << nHEC << " (ref: 1024)" << endreq; - log << MSG::INFO << " - A-side : " << nHECA << " (ref: 512)" << endreq; - log << MSG::INFO << " - C-side : " << nHECC << " (ref: 512)" << endreq; - log << MSG::INFO << " -- HEC electrode: " << nEL_HEC << " (ref: 10,240)" << endreq; + log << MSG::INFO << " [HVLINE] | HEC SUMMARY (list in ATLAS_HIGHVOLTAGE_HEC.out) " << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; + log << MSG::INFO << " -- HEC : " << nHEC << " (ref: 1024)" << endmsg; + log << MSG::INFO << " - A-side : " << nHECA << " (ref: 512)" << endmsg; + log << MSG::INFO << " - C-side : " << nHECC << " (ref: 512)" << endmsg; + log << MSG::INFO << " -- HEC electrode: " << nEL_HEC << " (ref: 10,240)" << endmsg; } - log << MSG::INFO << "============================================================================ " << endreq; + log << MSG::INFO << "============================================================================ " << endmsg; if( m_Detector == "ALL"){ - log << MSG::INFO << " -- TOTAL : " << nDET << endreq; + log << MSG::INFO << " -- TOTAL : " << nDET << endmsg; log << MSG::INFO << " -- TOTAL hash:" << n_hvline << ", hvline_hash_max= " - << m_hvHelper->hvlineHashMax() << endreq; - log << MSG::INFO << "============================================================================ " << endreq; + << m_hvHelper->hvlineHashMax() << endmsg; + log << MSG::INFO << "============================================================================ " << endmsg; } }// if m_HVlineToOffline */ @@ -1177,7 +1177,7 @@ StatusCode TestLArHWID_Algo::execute(){ // Loop over vector of electrodes std::vector<HWIdentifier>::const_iterator hv = electrodeIdVec.begin(); std::vector<HWIdentifier>::const_iterator hvEnd = electrodeIdVec.end(); - //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endreq; + //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endmsg; nelEMB0+=electrodeIdVec.size(); for(; hv!=hvEnd;++hv){ HWIdentifier electrodeId = *hv; @@ -1219,7 +1219,7 @@ StatusCode TestLArHWID_Algo::execute(){ // Loop over vector of electrodes std::vector<HWIdentifier>::const_iterator hv = electrodeIdVec.begin(); std::vector<HWIdentifier>::const_iterator hvEnd = electrodeIdVec.end(); - //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endreq; + //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endmsg; nelEMB1+=electrodeIdVec.size(); if( region == 0 ){nelEMB1r0+=electrodeIdVec.size();} if( region == 1 ){nelEMB1r1+=electrodeIdVec.size();} @@ -1264,7 +1264,7 @@ StatusCode TestLArHWID_Algo::execute(){ // Loop over vector of electrodes std::vector<HWIdentifier>::const_iterator hv = electrodeIdVec.begin(); std::vector<HWIdentifier>::const_iterator hvEnd = electrodeIdVec.end(); - //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endreq; + //log << MSG::INFO << "[TestLArHW] electrodeIdSize=" << electrodeIdVec.size() << endmsg; nelEMB2+=electrodeIdVec.size(); if( region == 0 ){nelEMB2r0+=electrodeIdVec.size();} if( region == 1 ){nelEMB2r1+=electrodeIdVec.size();} @@ -1972,7 +1972,7 @@ StatusCode TestLArHWID_Algo::execute(){ } if( m_Detector == "ALL"){ ATH_MSG_INFO ( "============================================================================ " ); - //log << MSG::INFO << " -- TOTAL : " << nelDET << endreq; + //log << MSG::INFO << " -- TOTAL : " << nelDET << endmsg; ATH_MSG_INFO ( "============================================================================ " ); } } // m_HVelectrodeToOffline == ON @@ -2981,7 +2981,7 @@ StatusCode TestLArHWID_Algo::execute(){ } if( m_Detector == "ALL"){ ATH_MSG_INFO ( "============================================================================ " ); - //log << MSG::INFO << " -- TOTAL : " << nelDET << endreq; + //log << MSG::INFO << " -- TOTAL : " << nelDET << endmsg; ATH_MSG_INFO ( "============================================================================ " ); } } diff --git a/LArCalorimeter/LArOnlDbPrep/src/LArDSPThresholdFillInline.cxx b/LArCalorimeter/LArOnlDbPrep/src/LArDSPThresholdFillInline.cxx index 95932c2c76c..8b6cfe13a0e 100644 --- a/LArCalorimeter/LArOnlDbPrep/src/LArDSPThresholdFillInline.cxx +++ b/LArCalorimeter/LArOnlDbPrep/src/LArDSPThresholdFillInline.cxx @@ -203,16 +203,16 @@ StatusCode LArDSPThresholdFillInline::stop() { } /* if(caloDDE->is_lar_em_barrel()) - log << MSG::DEBUG << "EM barrel" << endreq; + log << MSG::DEBUG << "EM barrel" << endmsg; if(caloDDE->is_lar_em_endcap()) - log << MSG::DEBUG << "EM endcap" << endreq; + log << MSG::DEBUG << "EM endcap" << endmsg; if(caloDDE->is_lar_hec()) - log << MSG::DEBUG << "HEC" << endreq; + log << MSG::DEBUG << "HEC" << endmsg; if(caloDDE->is_lar_fcal()) - log << MSG::DEBUG << "FCAL" << endreq; + log << MSG::DEBUG << "FCAL" << endmsg; */ CaloGain::CaloGain igain = CaloGain::INVALIDGAIN; diff --git a/LArCalorimeter/LArTest/LArEventTest/src/DumpLArRawChannels.cxx b/LArCalorimeter/LArTest/LArEventTest/src/DumpLArRawChannels.cxx index 4ede42f0ba9..d9aa3a70131 100755 --- a/LArCalorimeter/LArTest/LArEventTest/src/DumpLArRawChannels.cxx +++ b/LArCalorimeter/LArTest/LArEventTest/src/DumpLArRawChannels.cxx @@ -81,7 +81,7 @@ StatusCode DumpLArRawChannels::execute() LArRawChannelVector channelVector; LArRawChannelContainer::const_iterator it_chan_coll = channel_cont->begin(); LArRawChannelContainer::const_iterator it_chan_coll_end = channel_cont->end(); - //log <<MSG::DEBUG<<" number of LArRawChannel collections "<< channel_cont->size() <<endreq; + //log <<MSG::DEBUG<<" number of LArRawChannel collections "<< channel_cont->size() <<endmsg; for( ; it_chan_coll!=it_chan_coll_end;++it_chan_coll) { m_chan++; channelVector.push_back(&(*it_chan_coll)); diff --git a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.cxx b/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.cxx index 25c21c34321..f85e12bf6e5 100755 --- a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.cxx +++ b/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/src/LumiBlockCollectionCnv.cxx @@ -16,7 +16,7 @@ LumiBlockCollection_PERS* LumiBlockCollectionCnv::createPersistent(LumiBlockColl MsgStream log(messageService(), "LumiBlockCollectionConverter" ); LumiBlockCollection_PERS * persObj = m_TPConverter.createPersistent( transCont, log ); - log << MSG::DEBUG << "Success" << endreq; + log << MSG::DEBUG << "Success" << endmsg; return persObj; } diff --git a/MagneticField/MagFieldUtils/src/MagFieldTestbedAlg.cxx b/MagneticField/MagFieldUtils/src/MagFieldTestbedAlg.cxx index f627bca45c4..3a806503bfc 100644 --- a/MagneticField/MagFieldUtils/src/MagFieldTestbedAlg.cxx +++ b/MagneticField/MagFieldUtils/src/MagFieldTestbedAlg.cxx @@ -607,7 +607,7 @@ bool MagField::MagFieldTestbedAlg::checkWithReference() { std::setprecision(20) << "1) biggest absolute difference in the mag field comparison: " << biggestAbsDiff << " (tolerance: " << m_absTolerance - << ")." << endreq << "2) biggest relative difference: " + << ")." << endmsg << "2) biggest relative difference: " << biggestRelDiff << " (tolerance: " << m_relTolerance << ")" << std::setprecision(-1)); diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/MuonSegmentToCalibSegment.cxx b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/MuonSegmentToCalibSegment.cxx index ce79860a538..f92634e1dbb 100644 --- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/MuonSegmentToCalibSegment.cxx +++ b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/MuonSegmentToCalibSegment.cxx @@ -101,21 +101,21 @@ namespace MuonCalib { { m_segment_authors.resize(m_segmentLocationVector.value().size(), -1); } -/* m_log << MSG::INFO << "Initialisation started " << endreq; +/* m_log << MSG::INFO << "Initialisation started " << endmsg; // // - m_log << MSG::INFO << "================================" << endreq; - m_log << MSG::INFO << "= Proprieties are " << endreq; + m_log << MSG::INFO << "================================" << endmsg; + m_log << MSG::INFO << "= Proprieties are " << endmsg; std::vector<std::string>::const_iterator segLocit = m_segmentLocationVector.value().begin(); std::vector<std::string>::const_iterator segLocit_end = m_segmentLocationVector.value().end(); for ( ; segLocit != segLocit_end ; ++segLocit) { - m_log << MSG::INFO << "= SegmentLocation " << *segLocit << endreq; + m_log << MSG::INFO << "= SegmentLocation " << *segLocit << endmsg; } - m_log << MSG::INFO << "= SegmentCscLocation " << m_segmentCscLocation << endreq; - m_log << MSG::INFO << "= SegmentCombiLocation " << m_segmentCombiLocation << endreq; + m_log << MSG::INFO << "= SegmentCscLocation " << m_segmentCscLocation << endmsg; + m_log << MSG::INFO << "= SegmentCombiLocation " << m_segmentCombiLocation << endmsg; - m_log << MSG::INFO << "= PatternLocation " << m_patternLocation << endreq; - m_log << MSG::INFO << "================================" << endreq;*/ + m_log << MSG::INFO << "= PatternLocation " << m_patternLocation << endmsg; + m_log << MSG::INFO << "================================" << endmsg;*/ std::string managerName="Muon"; ATH_CHECK( detStore()->retrieve(m_detMgr) ); @@ -216,7 +216,7 @@ namespace MuonCalib { ATH_MSG_VERBOSE( "New station with " << stationSegs->size() << " segments " ); // if( stationSegs->size() != 1 ) { - // m_log << MSG::DEBUG << " -> skipping station, to many segments " << endreq; + // m_log << MSG::DEBUG << " -> skipping station, to many segments " << endmsg; // continue; // } @@ -351,7 +351,7 @@ namespace MuonCalib { ATH_MSG_VERBOSE( "New Csc station with " << stationSegs->size() << " segments " ); // if( stationSegs->size() != 1 ) { - // m_log << MSG::DEBUG << " -> skipping station, too many segments " << endreq; + // m_log << MSG::DEBUG << " -> skipping station, too many segments " << endmsg; // continue; // } diff --git a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/MuonEventCnvTool.cxx b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/MuonEventCnvTool.cxx index a5c9803d23c..cd91a752e7d 100755 --- a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/MuonEventCnvTool.cxx +++ b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/MuonEventCnvTool.cxx @@ -156,7 +156,7 @@ std::pair<const Trk::TrkDetElementBase*, const Trk::PrepRawData*> // <<m_muonMgr->mdtIdHelper()->stationName(id)<<", st. eta=" // <<m_muonMgr->mdtIdHelper()->stationEta(id)<<", st. phi=" // <<m_muonMgr->mdtIdHelper()->stationPhi(id)<<", multilayer=" -// <<m_muonMgr->mdtIdHelper()->multilayer(id)<<endreq; +// <<m_muonMgr->mdtIdHelper()->multilayer(id)<<endmsg; if (detEl==0) ATH_MSG_ERROR( "Apparently could not find detector element for "<< id); ATH_MSG_VERBOSE("Found PRD at : "<<prd); ////std::cout<<"Debug: pair = ("<<detEl<<","<<prd<<")"<<std::endl; diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx index 24d2a16d538..acf3d224ddd 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx @@ -203,7 +203,7 @@ bool MuonAGDDToolHelper::BuildReadoutGeometry(MuonGM::MuonDetectorManager* mgr/* //std::map<std::string, GeoFullPhysVol*>* myMap = NULL; //myMap = GetMSdetectors(); - //log<<MSG::INFO<<"In AGDD2GeoSvc::BuildReadoutGeometry - size of the detector map = "<<myMap->size()<<endreq; + //log<<MSG::INFO<<"In AGDD2GeoSvc::BuildReadoutGeometry - size of the detector map = "<<myMap->size()<<endmsg; //std::map<std::string, GeoFullPhysVol*>::const_iterator it; diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx index fe2ef4ae1a7..80ccd1b7d34 100644 --- a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx +++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx @@ -3547,7 +3547,7 @@ void MuonGMCheck::testRpcCache_here() std::string gVersion = p_MuonMgr->geometryVersion(); std::string fileName = "testRpcCache_"+gVersion; //std::ofstream fout(fileName.c_str()); - //exe_log << MSG::INFO << " ***** Writing file "<< fileName << endreq; + //exe_log << MSG::INFO << " ***** Writing file "<< fileName << endmsg; //fout << setiosflags(std::ios::fixed) << std::setprecision(3)<<std::endl; int nre = 0; @@ -3784,7 +3784,7 @@ void MuonGMCheck::testMdtCache_here() ATH_MSG_DEBUG(" Filling cache for mdtRE n. "<<nre<<" "<<p_MdtIdHelper->show_to_string(idr) ); mdt->fillCache(); - //std::cout<<" Filling cache done for mdtRE "<<p_MdtIdHelper->show_to_string(idr)<<endreq; + //std::cout<<" Filling cache done for mdtRE "<<p_MdtIdHelper->show_to_string(idr)<<endmsg; } // end of multilayer } // end of stPhi } // end of stEta diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx index e8d2d0424ac..800e175368f 100644 --- a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx +++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMTestOnPrd.cxx @@ -95,9 +95,9 @@ MuonGMTestOnPrd::execute() // const DataHandle<MdtPrepDataCollection> mdtColl; // const DataHandle<MdtPrepDataCollection> lastMdtColl; // if (StatusCode::SUCCESS != p_EventStore->retrieve(mdtColl,lastMdtColl)) { - // log << MSG::DEBUG << "No MdtPrepDataCollections found" << endreq; + // log << MSG::DEBUG << "No MdtPrepDataCollections found" << endmsg; // } - // if (mdtColl==lastMdtColl) log<<MSG::DEBUG<<"NO MdtPrepDataCollections in the event"<<endreq; + // if (mdtColl==lastMdtColl) log<<MSG::DEBUG<<"NO MdtPrepDataCollections in the event"<<endmsg; for (const Muon::MdtPrepDataCollection* mdtColl : *mdtContainer) { @@ -268,11 +268,11 @@ MuonGMTestOnPrd::execute() // TgcPrepDataContainer * tgcContainer; // if ( StatusCode::SUCCESS != p_EventStore->retrieve(tgcContainer, key) ) // { -// log<<MSG::ERROR<<"Cannot retrieve TGC PRD Container "<<endreq; +// log<<MSG::ERROR<<"Cannot retrieve TGC PRD Container "<<endmsg; // return StatusCode::FAILURE; // } // else -// log<<MSG::INFO<<"Retrieved TGC PRD Container with size = " << tgcContainer->size()<< endreq; +// log<<MSG::INFO<<"Retrieved TGC PRD Container with size = " << tgcContainer->size()<< endmsg; // // Csc // CscPrepDataContainer * cscContainer; @@ -331,7 +331,7 @@ void MuonGMTestOnPrd::processMdtCollectionOld(const Muon::MdtPrepDataCollection* //Amg::Vector3D xvt = (mdtRE->transform(idchannel))*Amg::Vector3D(10.,10.,10.); Trk::SaggedLineSurface surf = mdtRE->surface(idchannel); - //log<<MSG::INFO<<"Tube center is ("<<xc.x()<<", "<<xc.y()<<", "<<xc.z()<<")"<<endreq; + //log<<MSG::INFO<<"Tube center is ("<<xc.x()<<", "<<xc.y()<<", "<<xc.z()<<")"<<endmsg; if (msgLvl(MSG::DEBUG)) { diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h index d9c527088b4..6fb52d6051b 100755 --- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h +++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h @@ -47,9 +47,9 @@ namespace Muon { // storing the map for further usage if( m_storeGate->record(assMap,"MyMuonSegPatAssociations").isSuccess() ){ - log << MSG::DEBUG << "stored MuonSegPatAssociations " << endreq; + log << MSG::DEBUG << "stored MuonSegPatAssociations " << endmsg; }else{ - log << MSG::DEBUG << "Failed to store MuonSegPatAssociations " << endreq; + log << MSG::DEBUG << "Failed to store MuonSegPatAssociations " << endmsg; } @endcode @@ -60,10 +60,10 @@ namespace Muon { const Muon::MuonSegPatAssMap* assMap = 0; StatusCode sc = m_storeGate->retrieve(assMap,"MyMuonSegPatAssociations"); if (sc.isFailure() ) { - log << MSG::ERROR << " Could not find MuonSegPatAssociations at " << "MyMuonSegPatAssociations" <<endreq; + log << MSG::ERROR << " Could not find MuonSegPatAssociations at " << "MyMuonSegPatAssociations" <<endmsg; return StatusCode::SUCCESS; }else{ - log << MSG::INFO << " Retrieved MuonSegPatAssociations " << endreq; + log << MSG::INFO << " Retrieved MuonSegPatAssociations " << endmsg; } diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/src/MuonHoughMathUtils.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/src/MuonHoughMathUtils.cxx index 72881f6a994..785679620df 100755 --- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/src/MuonHoughMathUtils.cxx +++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonHoughPatternEvent/src/MuonHoughMathUtils.cxx @@ -377,7 +377,7 @@ void MuonHoughMathUtils::extrapolateCurvedRoad(const Amg::Vector3D& roadpos, con using the curved track model */ - // m_log<< MSG::VERBOSE << "Extrapolate the road to the segment (hit)" <<endreq; + // m_log<< MSG::VERBOSE << "Extrapolate the road to the segment (hit)" <<endmsg; const double theta = roadmom.theta(); const double phi = roadmom.phi(); @@ -419,7 +419,7 @@ void MuonHoughMathUtils::extrapolateCurvedRoad(const Amg::Vector3D& roadpos, con ze = roadpos.z() + len/tantheta + diffr*rotationangle; thetan = std::atan2(1.,1/tantheta + 2*rotationangle); // std::cout << " Extrapolated Position xe " << xe << " y " << ye << " z " << ze << std::endl; - // m_log << MSG::VERBOSE << " Barrel extrapolation " <<endreq; + // m_log << MSG::VERBOSE << " Barrel extrapolation " <<endmsg; } } else { double lext=0., rotationangle=0.; @@ -428,14 +428,14 @@ void MuonHoughMathUtils::extrapolateCurvedRoad(const Amg::Vector3D& roadpos, con double diffz = pos.z()-sign*MuonHough::z_cylinder; rotationangle = diffz*invcurvature/sctheta.cs; lext = (pos.z()-roadpos.z())*tantheta - diffz*rotationangle; - // m_log << MSG::VERBOSE << " Forward extrapolation " <<endreq; + // m_log << MSG::VERBOSE << " Forward extrapolation " <<endmsg; } else { // Forward OutSide EC Toroid double effcurv = invcurvature/sctheta.cs; rotationangle = sign*(MuonHough::z_end-MuonHough::z_cylinder)*effcurv; lext = (pos.z()-roadpos.z())*tantheta + (MuonHough::z_magnetic_range_squared - 2*sign*pos.z()*MuonHough::z_magnetic_range)*effcurv; - // m_log << MSG::VERBOSE << " Forward Outside EC Toroid extrapolation " <<endreq; + // m_log << MSG::VERBOSE << " Forward Outside EC Toroid extrapolation " <<endmsg; } xe = roadpos.x() + lext * scphi.cs; ye = roadpos.y() + lext * scphi.sn; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx index 6fc2e51d5bc..c83a7210def 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/MuonAlignValidation.cxx @@ -478,7 +478,7 @@ // sc = getSegments(h_index); // if (sc.isFailure()) { -// msg(MSG::FATAL) << "Could not fill histograms in MuonAlignValidation::getSegments for collection" << m_segmCollectionName[j] << endreq; +// msg(MSG::FATAL) << "Could not fill histograms in MuonAlignValidation::getSegments for collection" << m_segmCollectionName[j] << endmsg; // return StatusCode::FAILURE; // } // } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolBase.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolBase.cxx index ec0665b40e9..947b431e482 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolBase.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolBase.cxx @@ -78,7 +78,7 @@ using namespace std; CscCalibMonToolBase::~CscCalibMonToolBase() { - m_log << MSG::INFO << " deleting CscCalibMonToolBase " << endreq; + m_log << MSG::INFO << " deleting CscCalibMonToolBase " << endmsg; } /*-----------------------------------------------------*/ StatusCode CscCalibMonToolBase::initialize() @@ -88,36 +88,36 @@ StatusCode CscCalibMonToolBase::initialize() m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached m_verboselevel = (m_log.level() <= MSG::VERBOSE); // save if threshold for verbose printout reached - m_log << MSG::INFO << "CscCalibMonToolBase : in initialize()" << endreq; + m_log << MSG::INFO << "CscCalibMonToolBase : in initialize()" << endmsg; StatusCode sc; // get cscIdHelper through this convoluted process sc = service("DetectorStore", m_detStore); if ( !sc.isSuccess() ) { - m_log << MSG::FATAL << "DetectorStore Service not found !" << endreq; + m_log << MSG::FATAL << "DetectorStore Service not found !" << endmsg; return StatusCode::FAILURE; } sc = service("StoreGateSvc", m_storeGate); if ( !sc.isSuccess() ) { - m_log << MSG::FATAL << "StoreGate Service not found !" << endreq; + m_log << MSG::FATAL << "StoreGate Service not found !" << endmsg; return StatusCode::FAILURE; } sc = m_detStore->retrieve(m_muon_mgr); if (!sc.isSuccess()) { - m_log << MSG::FATAL << "Could not find the MuonGeoModel Manager" << endreq; + m_log << MSG::FATAL << "Could not find the MuonGeoModel Manager" << endmsg; return StatusCode::FAILURE; } - else {if (m_debuglevel) m_log << MSG::DEBUG << "Found the MuonGeoModel Manager " << endreq;} + else {if (m_debuglevel) m_log << MSG::DEBUG << "Found the MuonGeoModel Manager " << endmsg;} sc = m_detStore->retrieve(m_cscIdHelper,"CSCIDHELPER"); - if (!sc.isSuccess()) { m_log << MSG::FATAL << "Cannot get CscIdHelper" << endreq; return StatusCode::FAILURE; } - else { if (m_debuglevel) m_log << MSG::DEBUG << " Found the CscIdHelper. " << endreq; } + if (!sc.isSuccess()) { m_log << MSG::FATAL << "Cannot get CscIdHelper" << endmsg; return StatusCode::FAILURE; } + else { if (m_debuglevel) m_log << MSG::DEBUG << " Found the CscIdHelper. " << endmsg; } if (StatusCode::SUCCESS!=service("MuonCalib::CscCoolStrSvc",m_cscCoolSvc)) { - m_log << MSG::FATAL<< "Cannot get CscCoolStrSvc" << endreq; + m_log << MSG::FATAL<< "Cannot get CscCoolStrSvc" << endmsg; return StatusCode::FAILURE; } @@ -127,8 +127,8 @@ StatusCode CscCalibMonToolBase::initialize() //Find valid hashes m_log << MSG::DEBUG << "Expected chamber layer " - << m_expectedChamberLayer << endreq; - m_log << MSG::DEBUG << "Constructing list of expected chamber layers" << endreq; + << m_expectedChamberLayer << endmsg; + m_log << MSG::DEBUG << "Constructing list of expected chamber layers" << endmsg; //Loop through ids to find out what hash range we're working on, and to //initialize histograms. @@ -163,15 +163,15 @@ StatusCode CscCalibMonToolBase::initialize() == (unsigned int)m_cscIdHelper->chamberLayer(*stripItr) ) { - m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is expected"<< endreq; + m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is expected"<< endmsg; m_expectedHashIdsAll.insert(stripHash); if(!measuresPhi){ - m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is prec and expected"<< endreq; + m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is prec and expected"<< endmsg; m_expectedHashIdsPrec.insert(stripHash); } } else - m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is NOT expected (Not a bug, just populating list)."<< endreq; + m_log << MSG::VERBOSE << "hash " << (int)stripHash << " is NOT expected (Not a bug, just populating list)."<< endmsg; }//End strip loop }//End chamber loop @@ -182,7 +182,7 @@ StatusCode CscCalibMonToolBase::initialize() m_detailedHashIds[chanItr] = false; //This needs to be initialized before we book any hist Collecitons - m_log <<MSG::INFO << "Initializing ManagedMonitorToolBase" << endreq; + m_log <<MSG::INFO << "Initializing ManagedMonitorToolBase" << endmsg; ManagedMonitorToolBase::initialize().ignore(); // Ignore the checking code; @@ -245,7 +245,7 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti string yaxis= "", xaxis = ""; if(m_debuglevel) m_log << MSG::DEBUG << "In bookHistCollection for " << nameStart - << " series." << endreq; + << " series." << endmsg; if(!((toSkip>>6) &0x1)){ histCollection->cscSpec.resize(2,NULL); @@ -263,7 +263,7 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -286,11 +286,11 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti string hashPath = getFullPath( getGeoPath(), "FullViewHash", parDir); MonGroup monGroup( this, hashPath, run, ATTRIB_MANAGED); - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endmsg; sc = monGroup.regHist(hashHist); if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -316,11 +316,11 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti string allChan1dPath = getFullPath( getGeoPath(), "FullView1d", parDir); MonGroup monGroup( this, allChan1dPath, run, ATTRIB_MANAGED ); - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endmsg; sc = monGroup.regHist(allChan1dHistX); if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -333,11 +333,11 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti allChan1dHistY->GetXaxis()->SetTitle(xaxis.c_str()); allChan1dHistY->GetYaxis()->SetTitle(yaxis.c_str()); - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endmsg; sc = monGroup.regHist(allChan1dHistY); if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -386,11 +386,11 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti string allChan2dPath = getFullPath( getGeoPath(), "FullView2d", parDir); MonGroup monGroup( this, allChan2dPath, run, ATTRIB_MANAGED); - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endmsg; sc = monGroup.regHist(allChan2dHist); if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -410,13 +410,13 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti chamProf->GetXaxis()->SetTitle(xaxis.c_str()); chamProf->GetYaxis()->SetTitle(yaxis.c_str()); - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << name << endmsg; string path = getFullPath( getGeoPath(), "Profiles", parDir); MonGroup monGroup( this, path, run, ATTRIB_MANAGED); sc = monGroup.regHist(chamProf); if(!sc.isSuccess()) { - m_log << MSG::ERROR << "failed to register " << name << endreq; + m_log << MSG::ERROR << "failed to register " << name << endmsg; allGood = false; } else @@ -430,14 +430,14 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti xaxis = "Channel"; if(m_debuglevel) m_log << MSG::DEBUG << "Registering set with prefix" - << namePrefix << endreq; + << namePrefix << endmsg; histCollection->layHistVect = new std::vector<TH1F*>(); sc = bookLayHists("LayerView", parDir, *histCollection->layHistVect,namePrefix, titlePrefix, "Channel", xaxis ,true, histCollection->ignoreY); if(!sc.isSuccess()) { m_log << MSG::ERROR << "failed to register " << namePrefix << " (layer histograms) " - << endreq; + << endmsg; allGood = false; } } @@ -450,14 +450,14 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti xaxis = axisLabel; if(m_debuglevel) m_log << MSG::DEBUG << "Registering set with prefix" - << namePrefix << endreq; + << namePrefix << endmsg; histCollection->chamSummVect = new std::vector<TH1F*>(); sc = bookChamHists("SecSpectrum", parDir,*histCollection->chamSummVect,namePrefix, titlePrefix, xaxis,yaxis, false,histCollection->ignoreY,numBins,lowBound,highBound); if(!sc.isSuccess()) { m_log << MSG::ERROR << "failed to register " << namePrefix - << " (chamber summary histograms) " << endreq; + << " (chamber summary histograms) " << endmsg; allGood = false; } } @@ -470,14 +470,14 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti xaxis = axisLabel; if(m_debuglevel) m_log << MSG::DEBUG << "Registering set with prefix" - << namePrefix << endreq; + << namePrefix << endmsg; histCollection->chamHistVect = new std::vector<TH1F*>(); sc = bookChamHists("SectorView", parDir,*histCollection->chamHistVect,namePrefix, titlePrefix, xaxis,yaxis, true,histCollection->ignoreY); if(!sc.isSuccess()) { m_log << MSG::ERROR << "failed to register " << namePrefix - << " (chamber summary histograms) " << endreq; + << " (chamber summary histograms) " << endmsg; allGood = false; } } @@ -490,7 +490,7 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti xaxis = axisLabel; if(m_debuglevel) m_log << MSG::DEBUG << "Registering set with prefix" - << namePrefix << endreq; + << namePrefix << endmsg; histCollection->laySummVect = new std::vector<TH1F*>(); sc = bookLayHists("LaySpectrum", parDir, *histCollection->laySummVect, namePrefix, titlePrefix, xaxis,yaxis, @@ -501,7 +501,7 @@ StatusCode CscCalibMonToolBase::bookHistCollection(HistCollection * histCollecti if(!sc.isSuccess()) { m_log << MSG::ERROR << " Failed to register " << namePrefix << " (Layer summary hists) " - << endreq; + << endmsg; allGood = false; } } @@ -530,7 +530,7 @@ StatusCode CscCalibMonToolBase::bookLayHists(std::string histTypeDir, std::strin histVector.resize(numHists,NULL); if(m_debuglevel) m_log << MSG::DEBUG << "Allocated space for " << numHists << " histograms" - << endreq; + << endmsg; vector<Identifier> ids = m_cscIdHelper->idVector(); vector<Identifier>::const_iterator chamItr = ids.begin(); @@ -540,7 +540,7 @@ StatusCode CscCalibMonToolBase::bookLayHists(std::string histTypeDir, std::strin IdentifierHash chamHash; m_cscIdHelper->get_module_hash(*chamItr,chamHash); if(m_debuglevel) m_log << MSG::DEBUG << "Booking histograms for chamber with hash " - << (int)chamHash << endreq; + << (int)chamHash << endmsg; stationSize = m_cscIdHelper->stationName(*chamItr); stationName = m_cscIdHelper->stationNameString(stationSize); @@ -579,7 +579,7 @@ StatusCode CscCalibMonToolBase::bookLayHists(std::string histTypeDir, std::strin if(m_verboselevel) m_log << MSG::VERBOSE << "Storing a hist on orientation " << orientationItr << " With highbound/lowbound/nbins " - << highBound << "/" << lowBound << "/" << numBins << endreq; + << highBound << "/" << lowBound << "/" << numBins << endmsg; stringstream nameStream; nameStream.setf(ios::right, ios::adjustfield); @@ -597,7 +597,7 @@ StatusCode CscCalibMonToolBase::bookLayHists(std::string histTypeDir, std::strin if(m_verboselevel) m_log << MSG::VERBOSE << "Storing " << nameStream.str() << " with title " - << titleStream.str() << "On orientation " << orientationItr << " With highbound/lowbound/nbins " << highBound << "/" << lowBound << "/" << numBins << endreq; + << titleStream.str() << "On orientation " << orientationItr << " With highbound/lowbound/nbins " << highBound << "/" << lowBound << "/" << numBins << endmsg; TH1F* hist = new TH1F(nameStream.str().c_str(), titleStream.str().c_str(), numBins, lowBound, highBound); @@ -616,14 +616,14 @@ StatusCode CscCalibMonToolBase::bookLayHists(std::string histTypeDir, std::strin if(!monGroup.regHist(hist).isSuccess()) { m_log << MSG::FATAL << "Failed to register " << nameStream.str() - << " with layIndex" << layIndex << endreq; + << " with layIndex" << layIndex << endmsg; return StatusCode::FAILURE; } else { if(m_debuglevel) m_log << MSG::DEBUG << "Succesfully registered histogram with layIndex " - << layIndex <<" and name " << hist->GetName() << endreq; + << layIndex <<" and name " << hist->GetName() << endmsg; histVector[layIndex] = hist; } }//end layer loop @@ -669,7 +669,7 @@ StatusCode CscCalibMonToolBase::bookChamHists(std::string histTypeDir, std::stri IdentifierHash chamHash; m_cscIdHelper->get_module_hash(*chamItr,chamHash); m_log << MSG::DEBUG << "Booking histograms for chamber with hash " - << (int)chamHash << endreq; + << (int)chamHash << endmsg; stationSize = m_cscIdHelper->stationName(*chamItr); //50 stationPhi = m_cscIdHelper->stationPhi(*chamItr); @@ -723,7 +723,7 @@ StatusCode CscCalibMonToolBase::bookChamHists(std::string histTypeDir, std::stri int chamIndex = getChamIndex(orientationItr,stationEta,sector); if(m_debuglevel) m_log << MSG::DEBUG << "Registering histogram with name " - << hist->GetName() << " and chamIndex " << chamIndex << endreq; + << hist->GetName() << " and chamIndex " << chamIndex << endmsg; histVector[chamIndex] = hist; @@ -732,17 +732,17 @@ StatusCode CscCalibMonToolBase::bookChamHists(std::string histTypeDir, std::stri MonGroup monGroup( this, path ,run, ATTRIB_MANAGED); if (!monGroup.regHist(hist).isSuccess()) { - m_log << MSG::WARNING <<"monGroup.regHist(hist) failed for "<< path <<endreq; + m_log << MSG::WARNING <<"monGroup.regHist(hist) failed for "<< path <<endmsg; } }//End orientation loop }//End chamber loop - if(m_debuglevel) m_log << MSG::DEBUG << "Exiting bookChamHists" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Exiting bookChamHists" << endmsg; return StatusCode::SUCCESS; }//end bookChamHists StatusCode CscCalibMonToolBase::bookHistograms() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscalibMonTool : in bookHistograms()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscalibMonTool : in bookHistograms()" << endmsg; if (newEventsBlock){} if (newLumiBlock){} if (newRun) @@ -765,7 +765,7 @@ StatusCode CscCalibMonToolBase::bookHistograms() StatusCode sc = bookHistCollection(m_statDbColl, statDbName, statDbTitle, "", "", statDbAxisLabel, statDbNumBins, statDbMin, statDbMax, statDbSubDir); if(!sc.isSuccess()){ - m_log << MSG::WARNING << " Failed to register db stat hists!" << endreq; + m_log << MSG::WARNING << " Failed to register db stat hists!" << endmsg; } //Loop through channels retrieving status words @@ -774,7 +774,7 @@ StatusCode CscCalibMonToolBase::bookHistograms() uint8_t statWord; if(!(m_cscCoolSvc->getStatus(statWord, chanItr)).isSuccess()){ m_log << MSG::WARNING << "Failed to retrieve statword for hashId " - << chanItr << endreq; + << chanItr << endmsg; } m_statDbColl->data[chanItr] = (float)statWord; } @@ -791,7 +791,7 @@ StatusCode CscCalibMonToolBase::bookHistograms() StatusCode CscCalibMonToolBase::fillHistograms() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase :: in fillHistograms()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase :: in fillHistograms()" << endmsg; return StatusCode::SUCCESS; }//end fillHistograms @@ -800,7 +800,7 @@ StatusCode CscCalibMonToolBase::fillHistograms() StatusCode CscCalibMonToolBase::procHistograms() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in procHistograms()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in procHistograms()" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -812,11 +812,11 @@ StatusCode CscCalibMonToolBase::procHistograms() sc = m_storeGate->retrieve(calibContainer, m_calibResultKey); if( !sc.isSuccess()) { - m_log << MSG::ERROR << " Cannot retrieve container with name " << m_calibResultKey << endreq; + m_log << MSG::ERROR << " Cannot retrieve container with name " << m_calibResultKey << endmsg; return StatusCode::RECOVERABLE; } - if(m_debuglevel) m_log << MSG::DEBUG << "There are " << calibContainer->size() << " parameters to monitor" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "There are " << calibContainer->size() << " parameters to monitor" << endmsg; CscCalibResultContainer::const_iterator parItr = calibContainer->begin(); CscCalibResultContainer::const_iterator parEnd = calibContainer->end(); @@ -832,7 +832,7 @@ StatusCode CscCalibMonToolBase::procHistograms() /*--retrieve histos: Overloaded in derived classes to collect interesting histograms from calibration alg--------*/ StatusCode CscCalibMonToolBase::postProc() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in postProc()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in postProc()" << endmsg; //This method should be overloaded in a derived class @@ -843,7 +843,7 @@ StatusCode CscCalibMonToolBase::postProc() StatusCode CscCalibMonToolBase::checkHists(bool /* fromFinalize */) { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in checkHists()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in checkHists()" << endmsg; return StatusCode::SUCCESS; } @@ -852,7 +852,7 @@ StatusCode CscCalibMonToolBase::checkHists(bool /* fromFinalize */) should go into procParameter*/ StatusCode CscCalibMonToolBase::handleParameter(const CscCalibResultCollection*) { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in preProcParameter" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolBase : in preProcParameter" << endmsg; return StatusCode::SUCCESS; } @@ -874,7 +874,7 @@ StatusCode CscCalibMonToolBase::procParameter(const CscCalibResultCollection *pa m_log << MSG::DEBUG << "Entering proc parameter for " << parVals->parName() << ". Max diff " << procParameterInput->maxDiff << "."; if (procParameterInput->doChi2) m_log << " Will retrieve chi2 with expected max of " << procParameterInput->chi2Max; - m_log << endreq; + m_log << endmsg; } //Start with expected channels, remove whenever one is found, leftover are @@ -907,11 +907,11 @@ StatusCode CscCalibMonToolBase::procParameter(const CscCalibResultCollection *pa m_log << MSG::WARNING << "CscCalibMonToolBase : Failed to retrieve parameter" << " for channel " << hashId << " from COOL database. Continuing with COOL value = 0" - << endreq; + << endmsg; if(numFailures==maxFailures) { m_log << MSG::FATAL << "CscCalibMonToolBase : " - << maxFailures << " failed retrievals. Quiting. " << endreq; + << maxFailures << " failed retrievals. Quiting. " << endmsg; return StatusCode::FAILURE; } } @@ -930,7 +930,7 @@ StatusCode CscCalibMonToolBase::procParameter(const CscCalibResultCollection *pa m_log << MSG::INFO << "CscCalibMonToolBase : Possible problem! " << parVals->parName() << " measurement of " << val << " varies by " << diff << " from expected value of " << oldVal << " on channel with hash Id " - << hashId << ". Specified maximum variance is " << procParameterInput->maxDiff << endreq; + << hashId << ". Specified maximum variance is " << procParameterInput->maxDiff << endmsg; isBad = true; procParameterInput->badHist->Fill(procParameterInput->badBin); //Too high a difference } @@ -1019,7 +1019,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) << " sector prof " << (int)doChamAvg << " chamber overview " << (int)doChamChan << " chamber spectrum " << (int)doChamSummary - << endreq; + << endmsg; //cout << "TEST! hash " << (int)(histCollection->hashHist != NULL) << endl; //cout << "TEST! layHist " << (int)(histCollection->layHistVect != NULL) << endl; @@ -1039,7 +1039,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) m_cscIdHelper->get_module_hash(*chamItr,chamHash); if(m_debuglevel) m_log << MSG::DEBUG << "Copying data to histograms for chamber with hash" << (int)chamHash - << endreq; + << endmsg; unsigned int stationSize = m_cscIdHelper->stationName(*chamItr); //51 = large, 50 = small @@ -1074,7 +1074,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) << "Filling all chan for sector: " << sector << "\tlayer: " << layer << "\tstationEta: " << stationEta << "\tsecLayer: " << secLayer - << "\tdata: " << datum << endreq; + << "\tdata: " << datum << endmsg; if(doSpec) { histCollection->cscSpec[measuresPhi]->Fill(datum); @@ -1091,7 +1091,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) << "Filling 1d chan for sector: " << sector << "\tlayer: " << layer << "\tstationEta: " << stationEta; if(m_verboselevel) m_log << MSG::VERBOSE << "\tsecLayer: " << secLayer - << "\tdata: " << datum << endreq; + << "\tdata: " << datum << endmsg; if(measuresPhi){ double modifiedStripNum = @@ -1101,7 +1101,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) ; if(m_verboselevel) m_log << MSG::VERBOSE << "Modified strip num: " - << modifiedStripNum << endreq; + << modifiedStripNum << endmsg; //copy data array directly to 1d histogram with all channels histCollection->allChan1dHistY->Fill( modifiedStripNum, datum); @@ -1124,7 +1124,7 @@ StatusCode CscCalibMonToolBase::copyDataToHists(HistCollection * histCollection) << "Filling 2d chan for sector: " << sector << "\tlayer: " << layer << "\tstationEta: " << stationEta; if(m_verboselevel) m_log << MSG::VERBOSE << "\tsecLayer: " << secLayer - << "\tdata: " << datum << endreq; + << "\tdata: " << datum << endmsg; //copy data array directly to 2d histogram with all channels int modifiedStripNum = strip * (measuresPhi ? -1 : 1); @@ -1234,7 +1234,7 @@ std::string CscCalibMonToolBase::getGeoPath( int eta, int sector, int wireLayer string endCap = getEndCap(eta); if(endCap == "ERROR") { - m_log << MSG::ERROR << "Eta " << eta << " is invalid. " << endreq; + m_log << MSG::ERROR << "Eta " << eta << " is invalid. " << endmsg; return errorDir; } @@ -1248,7 +1248,7 @@ std::string CscCalibMonToolBase::getGeoPath( int eta, int sector, int wireLayer if(sector <1 || sector > 16) { - m_log <<MSG::ERROR << "Sector " << sector << " is invalid. " << endreq; + m_log <<MSG::ERROR << "Sector " << sector << " is invalid. " << endmsg; return errorDir; } @@ -1262,7 +1262,7 @@ std::string CscCalibMonToolBase::getGeoPath( int eta, int sector, int wireLayer if(wireLayer < 1 || wireLayer > 4) { - m_log << MSG::ERROR << "WireLayer " << wireLayer << " is invalid." << endreq; + m_log << MSG::ERROR << "WireLayer " << wireLayer << " is invalid." << endmsg; return errorDir; } @@ -1276,7 +1276,7 @@ std::string CscCalibMonToolBase::getGeoPath( int eta, int sector, int wireLayer if(measuresPhi < 0 || measuresPhi > 1) { - m_log << MSG::ERROR << "MeasuresPhi " << measuresPhi << " is invalid." << endreq; + m_log << MSG::ERROR << "MeasuresPhi " << measuresPhi << " is invalid." << endmsg; return errorDir; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolPed.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolPed.cxx index abefba8329f..60632908c14 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolPed.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolPed.cxx @@ -127,16 +127,16 @@ StatusCode CscCalibMonToolPed::finalize() CscCalibMonToolPed::~CscCalibMonToolPed() { - m_log << MSG::INFO << "CscCalibMonToolPed : deleting CscCalibMonToolPed " << endreq; + m_log << MSG::INFO << "CscCalibMonToolPed : deleting CscCalibMonToolPed " << endmsg; } StatusCode CscCalibMonToolPed::bookHistograms() { if (!CscCalibMonToolBase::bookHistograms().isSuccess()) { - m_log << MSG::WARNING << "CscCalibMonToolPed : in bookHistograms()" << endreq; + m_log << MSG::WARNING << "CscCalibMonToolPed : in bookHistograms()" << endmsg; } - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in bookHistograms()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in bookHistograms()" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -314,128 +314,128 @@ StatusCode CscCalibMonToolPed::bookHistograms() //initialize, name, and book histograms in histogram collections: - if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedNewColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedNewColl" << endmsg; sc = bookHistCollection(m_pedNewColl, pedDataName, pedDataTitle, newCatName, newCatTitle, pedAxisLabel, pedNumBins, pedLowBound, pedHighBound, pedSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedOldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedOldColl" << endmsg; sc = bookHistCollection(m_pedOldColl, pedDataName, pedDataTitle, oldCatName, oldCatTitle, pedAxisLabel, pedNumBins, pedLowBound, pedHighBound, pedSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedDiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering pedDiffColl" << endmsg; sc = bookHistCollection(m_pedDiffColl, pedDataName, pedDataTitle, diffCatName, diffCatTitle, pedDiffAxisLabel, 100, -2, 2, pedSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseNewColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseNewColl" << endmsg; sc = bookHistCollection(m_noiseNewColl, noiseDataName, noiseDataTitle, newCatName, newCatTitle, noiseAxisLabel, noiseNumBins, noiseLowBound, noiseHighBound, noiseSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseOldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseOldColl" << endmsg; sc = bookHistCollection(m_noiseOldColl, noiseDataName, noiseDataTitle, oldCatName, oldCatTitle, noiseAxisLabel, 100, -2, 2, noiseSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseDiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering noiseDiffColl" << endmsg; sc = bookHistCollection(m_noiseDiffColl, noiseDataName, noiseDataTitle, diffCatName, diffCatTitle, noiseDiffAxisLabel, noiseNumBins, -1*noiseHighBound, noiseHighBound,noiseSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsNewColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsNewColl" << endmsg; sc = bookHistCollection(m_rmsNewColl, rmsDataName, rmsDataTitle, newCatName, newCatTitle, rmsAxisLabel, rmsNumBins, rmsLowBound, rmsHighBound, rmsSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsOldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsOldColl" << endmsg; sc = bookHistCollection(m_rmsOldColl, rmsDataName, rmsDataTitle, oldCatName, oldCatTitle, rmsAxisLabel, rmsNumBins, rmsLowBound, rmsHighBound, rmsSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsDiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering rmsDiffColl" << endmsg; sc = bookHistCollection(m_rmsDiffColl, rmsDataName, rmsDataTitle, diffCatName, diffCatTitle, rmsDiffAxisLabel, rmsNumBins, -1*rmsHighBound, rmsHighBound,rmsSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001NewColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001NewColl" << endmsg; sc = bookHistCollection(m_f001NewColl, f001DataName, f001DataTitle, newCatName, newCatTitle, f001AxisLabel, f001NumBins, f001LowBound, f001HighBound, f001SubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001OldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001OldColl" << endmsg; sc = bookHistCollection(m_f001OldColl, f001DataName, f001DataTitle, oldCatName, oldCatTitle, f001AxisLabel, 100, -2, 2, f001SubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001DiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering f001DiffColl" << endmsg; sc = bookHistCollection(m_f001DiffColl, f001DataName, f001DataTitle, diffCatName, diffCatTitle, f001DiffAxisLabel, 60, -30, 30, f001SubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering onlTHoldBreachColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering onlTHoldBreachColl" << endmsg; sc = bookHistCollection(m_onlTHoldBreachColl, onlTHoldBreachDataName, onlTHoldBreachDataTitle, "", "" , "Number of Online THold Breachs", 100, 0, 1000, onlTHoldBreachSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering Num Entries" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering Num Entries" << endmsg; sc = bookHistCollection(m_nEntriesColl, nEntriesDataName, nEntriesDataTitle, "", "", nEntriesAxisLabel, nEntriesNumBins, nEntriesLowBound, nEntriesHighBound, nEntriesSubDir, nEntriesHistMask); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -443,14 +443,14 @@ StatusCode CscCalibMonToolPed::bookHistograms() chi2AxisLabel, chi2NumBins, chi2LowBound, chi2HighBound, chi2SubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } sc = bookHistCollection(m_tholdDiffColl, "thold", "Threshold", diffCatName, diffCatTitle, "#Delta{}Threshold", 500, -10, 10, "THold"); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -467,7 +467,7 @@ StatusCode CscCalibMonToolPed::bookHistograms() //--handleParameter: Processes a vector of parameter values by filling the appropriate histograms StatusCode CscCalibMonToolPed::handleParameter(const CscCalibResultCollection* parVals) { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in procParameter()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in procParameter()" << endmsg; //The whole point of this funciton is to pass the correct histograms and setup info //to CsccalibMonToolBase::procParameter. To organize this, we store the setup info into @@ -568,7 +568,7 @@ StatusCode CscCalibMonToolPed::handleParameter(const CscCalibResultCollection* p else { m_log << MSG::INFO << "CscCalibMonToolPed : Did not recognize parameter name " - << parName << ". This is usually ok." << endreq; + << parName << ". This is usually ok." << endmsg; return StatusCode::SUCCESS; } @@ -579,7 +579,7 @@ StatusCode CscCalibMonToolPed::handleParameter(const CscCalibResultCollection* p if(!procParameter(parVals,&ProcParameterInput).isSuccess()) { m_log << MSG::FATAL << "CscCalibMonToolPed : Failed to process parameter " - << parName << endreq; + << parName << endmsg; return StatusCode::FAILURE; } @@ -623,7 +623,7 @@ void CscCalibMonToolPed::genThreshold(HistCollection * pedColl, HistCollection * //requested by the user in m_detailedHashIds. StatusCode CscCalibMonToolPed::postProc() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in postProc()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolPed : in postProc()" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -651,13 +651,13 @@ StatusCode CscCalibMonToolPed::postProc() std::vector<float> & noiseVec = m_noiseNewColl->data; size_t nEntries = rmsVec.size(); if(nEntries != noiseVec.size()){ - m_log << MSG::ERROR << "Number of noises != number of rmses" << endreq; + m_log << MSG::ERROR << "Number of noises != number of rmses" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::DEBUG << "Filling rmsVnoise " << endreq; + m_log << MSG::DEBUG << "Filling rmsVnoise " << endmsg; for(unsigned int hashId = 0; hashId < nEntries; hashId++){ - m_log << MSG::DEBUG << "Filling rmsVnoise for hash id " << hashId << endreq; + m_log << MSG::DEBUG << "Filling rmsVnoise for hash id " << hashId << endmsg; Identifier chanId; m_cscIdHelper->get_id(IdentifierHash(hashId), chanId, &chanContext); int measuresPhi = m_cscIdHelper->measuresPhi(chanId); @@ -669,7 +669,7 @@ StatusCode CscCalibMonToolPed::postProc() h2_rmsVnoiseEta->Fill(noiseVec[hashId], rmsVec[hashId]); } } - m_log <<MSG::DEBUG << "filled rmsVnoise " << endreq; + m_log <<MSG::DEBUG << "filled rmsVnoise " << endmsg; } @@ -681,7 +681,7 @@ StatusCode CscCalibMonToolPed::postProc() if( !sc.isSuccess()) { m_log << MSG::WARNING << " Cannot retrieve object from storegate with key " - << m_histKey << " aborting retrieving hists " << endreq; + << m_histKey << " aborting retrieving hists " << endmsg; return StatusCode::RECOVERABLE; } @@ -689,7 +689,7 @@ StatusCode CscCalibMonToolPed::postProc() { m_log << MSG::WARNING << "Container with key " << m_histKey << " does not have a size of one. Do not know how to proceed, so aborting" - << " retrieving calibration histograms." << endreq; + << " retrieving calibration histograms." << endmsg; return StatusCode::RECOVERABLE; } @@ -698,19 +698,19 @@ StatusCode CscCalibMonToolPed::postProc() if(pedReport->getLabel() != "pedAmps") { m_log << MSG::WARNING << "Incorrect object retrieved from container." - << " Aborting hist retrieval." << endreq; + << " Aborting hist retrieval." << endmsg; return StatusCode::RECOVERABLE; } const DataVector<TH1I> * pedAmpHists = pedReport->getPedAmpHists(); if(!pedAmpHists) m_log << MSG::WARNING << "No pedAmpHists vector found from calibration. " - << " Won't be in monitoring output file" << endreq; + << " Won't be in monitoring output file" << endmsg; const DataVector<TH1I> * bitHists = pedReport->getBitHists(); if(!bitHists) m_log << MSG::INFO << "No bit histogram vector found from calibration. " - << " Won't be in monitoring output file. " << endreq; + << " Won't be in monitoring output file. " << endmsg; const DataVector<TH2F> * bitCorrelations = NULL; @@ -725,7 +725,7 @@ StatusCode CscCalibMonToolPed::postProc() if(m_expectedHashIdsAll.count(idItr)) { m_log << MSG::VERBOSE << "Debug info for hash " << idItr - << " is being retrieved." << endreq; + << " is being retrieved." << endmsg; TH1I * sourceHist; Identifier chanId; @@ -747,7 +747,7 @@ StatusCode CscCalibMonToolPed::postProc() if(bitCorrelations) bitCorrelationPath = getFullPath(geoPath, "BitCorrelations", ""); - if(m_debuglevel) m_log << MSG::DEBUG << "Hash Id: " << idItr << ". Booking channel histograms in paths : " << pedAmpPath << " and " << bitHistPath << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Hash Id: " << idItr << ". Booking channel histograms in paths : " << pedAmpPath << " and " << bitHistPath << endmsg; //MonGroup chanMonGroup( this, path , run, ATTRIB_MANAGED); //Pedestal amplitude histograms @@ -758,7 +758,7 @@ StatusCode CscCalibMonToolPed::postProc() if(!sourceHist) { m_log << MSG::ERROR << "There is no pedestal amplitude histogram with hashId " - << idItr << endreq; + << idItr << endmsg; return StatusCode::RECOVERABLE; } @@ -768,7 +768,7 @@ StatusCode CscCalibMonToolPed::postProc() m_log << MSG::ERROR << "idItr == " << idItr << " but maximum m_nEntriesColl.data.size() == " - << m_nEntriesColl->data.size() << endreq; + << m_nEntriesColl->data.size() << endmsg; return StatusCode::RECOVERABLE; } m_nEntriesColl->data[idItr] = nEntries; @@ -833,7 +833,7 @@ StatusCode CscCalibMonToolPed::postProc() if(!sourceHist) { m_log << MSG::ERROR << "There is no bit histogram with hashId " - << idItr << " Quiting out of detailed histogram loop." << endreq; + << idItr << " Quiting out of detailed histogram loop." << endmsg; return StatusCode::RECOVERABLE; } @@ -882,7 +882,7 @@ StatusCode CscCalibMonToolPed::postProc() } else if (m_debuglevel) m_log << MSG::DEBUG << "No channels flagged for debug info retrieval" - <<endreq; + <<endmsg; //Copy data from the num entries vector to all relevant histograms copyDataToHists(m_nEntriesColl); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolSlope.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolSlope.cxx index 38b9dcc5a1a..a6905c8e0e5 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolSlope.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/CscCalibMonToolSlope.cxx @@ -98,14 +98,14 @@ CscCalibMonToolSlope::CscCalibMonToolSlope(const std::string & type, const std:: CscCalibMonToolSlope::~CscCalibMonToolSlope() { - m_log << MSG::INFO << "CscCalibMonToolSlope : deleting CscCalibMonToolSlope " << endreq; + m_log << MSG::INFO << "CscCalibMonToolSlope : deleting CscCalibMonToolSlope " << endmsg; cerr << "Deleting CscCalibMonToolSlope" << endl; } StatusCode CscCalibMonToolSlope::finalize() { - m_log << MSG::DEBUG << "Slope Finalizing "<< endreq; + m_log << MSG::DEBUG << "Slope Finalizing "<< endmsg; delete m_slopeNewColl; delete m_slopeOldColl; delete m_slopeDiffColl; @@ -128,7 +128,7 @@ StatusCode CscCalibMonToolSlope::initialize() IdContext channelContext = m_cscIdHelper->channel_context(); - m_log << MSG::DEBUG << "Expected chamber layer is " << m_expectedChamberLayer<< endreq; + m_log << MSG::DEBUG << "Expected chamber layer is " << m_expectedChamberLayer<< endmsg; for(unsigned int hash = 0 ; hash <= m_maxHashId; hash++) { @@ -148,7 +148,7 @@ StatusCode CscCalibMonToolSlope::initialize() StatusCode CscCalibMonToolSlope::bookHistograms() { CscCalibMonToolBase::bookHistograms(); - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in bookHistograms()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in bookHistograms()" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -386,71 +386,71 @@ StatusCode CscCalibMonToolSlope::bookHistograms() newCatTitle, peaktAxisLabel, peaktNumBins, peaktLowBound, peaktHighBound, peaktSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering peaktOldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering peaktOldColl" << endmsg; sc = bookHistCollection(m_peaktOldColl, peaktDataName, peaktDataTitle, oldCatName, oldCatTitle, peaktAxisLabel, peaktNumBins, peaktLowBound, peaktHighBound, peaktSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering peaktDiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering peaktDiffColl" << endmsg; sc = bookHistCollection(m_peaktDiffColl, peaktDataName, peaktDataTitle, diffCatName, diffCatTitle, peaktDiffAxisLabel, peaktNumBins, peaktLowBound, peaktHighBound, peaktSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeRatioColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeRatioColl" << endmsg; sc = bookHistCollection(m_slopeNewColl, slopeDataName, slopeDataTitle, newCatName, newCatTitle, slopeAxisLabel, slopeNumBins, slopeLowBound, slopeHighBound, slopeSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeNewColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeNewColl" << endmsg; sc = bookHistCollection(m_slopeRatioColl, slopeRatioDataName, slopeRatioDataTitle, "", "", slopeRatioAxisLabel, slopeRatioNumBins, slopeRatioLowBound, slopeRatioHighBound, slopeRatioSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeOldColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeOldColl" << endmsg; sc = bookHistCollection(m_slopeOldColl, slopeDataName, slopeDataTitle, oldCatName, oldCatTitle, slopeAxisLabel, slopeNumBins, slopeLowBound, slopeHighBound, slopeSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeDiffColl" << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering slopeDiffColl" << endmsg; sc = bookHistCollection(m_slopeDiffColl, slopeDataName, slopeDataTitle, diffCatName, diffCatTitle, slopeDiffAxisLabel, slopeNumBins, slopeLowBound, slopeHighBound, slopeSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } - if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << interceptDataTitle << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "Registering " << interceptDataTitle << endmsg; sc = bookHistCollection(m_interceptColl, interceptDataName, interceptDataTitle, "", "", interceptAxisLabel, interceptNumBins, interceptLowBound, interceptHighBound, interceptSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -458,7 +458,7 @@ StatusCode CscCalibMonToolSlope::bookHistograms() chi2AxisLabel, chi2NumBins, chi2LowBound, chi2HighBound, chi2SubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -466,7 +466,7 @@ StatusCode CscCalibMonToolSlope::bookHistograms() deadAxisLabel, deadNumBins, deadLowBound, deadHighBound, deadSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -474,7 +474,7 @@ StatusCode CscCalibMonToolSlope::bookHistograms() fitResAxisLabel, fitResNumBins, fitResLowBound, fitResHighBound, fitResSubDir); if(!sc.isSuccess()) { - m_log << MSG::FATAL << "Failed to book hist"<< endreq; + m_log << MSG::FATAL << "Failed to book hist"<< endmsg; return StatusCode::FAILURE; } @@ -488,7 +488,7 @@ StatusCode CscCalibMonToolSlope::bookHistograms() StatusCode sc = StatusCode::SUCCESS; if (m_debuglevel) - m_log << MSG::DEBUG << "CscCalibMonToolSlope :: in fillHistograms()" << endreq; + m_log << MSG::DEBUG << "CscCalibMonToolSlope :: in fillHistograms()" << endmsg; return sc; }*/ @@ -496,7 +496,7 @@ StatusCode CscCalibMonToolSlope::bookHistograms() //--handleParameter: Processes a vector of parameter values by filling the appropriate histograms StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* parVals) { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in handleParameter()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in handleParameter()" << endmsg; //The whole point of this funciton is to pass the correct histograms and setup info //to CsccalibMonToolBase::procParameter. To organize this, we store the setup info into @@ -507,7 +507,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* string parName = parVals->parName(); /*if(parName == "peakt") { - m_log << MSG::INFO << "Evaluating peaking times" << endreq; + m_log << MSG::INFO << "Evaluating peaking times" << endmsg; simpleSet.dbName = parVals->parName(); simpleSet.badHist = m_h_numBad; simpleSet.badBin = m_peaktBadBin; @@ -527,7 +527,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* */ if(parName == "pslope") { - m_log << MSG::INFO << "Evaluating slopes" << endreq; + m_log << MSG::INFO << "Evaluating slopes" << endmsg; simpleSet.dbName = parVals->parName(); simpleSet.badHist = m_h_numBad; simpleSet.badBin = m_slopeBadBin; @@ -548,7 +548,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* } else if (parName == "pinter") { - m_log << MSG::INFO << "Evaluating intercepts" << endreq; + m_log << MSG::INFO << "Evaluating intercepts" << endmsg; simpleSet.expectedVal = 0; simpleSet.badHist = m_h_numBad; simpleSet.badBin = m_interceptBadBin; @@ -567,7 +567,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* else { m_log << MSG::INFO << "CscCalibMonToolSlope : Did not recognize parameter name " - << parName << ". This is usually ok." << endreq; + << parName << ". This is usually ok." << endmsg; return StatusCode::FAILURE; } @@ -576,14 +576,14 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* if(!sc.isSuccess()) { m_log << MSG::FATAL << "CscCalibMonToolSlope : Failed to process parameter " << parName - << endreq; + << endmsg; return StatusCode::FAILURE; } if(parName == "peakt") { - m_log << MSG::INFO << "Generating peaking time histograms" << endreq; + m_log << MSG::INFO << "Generating peaking time histograms" << endmsg; copyDataToHists(m_peaktNewColl); copyDataToHists(m_peaktOldColl); @@ -592,7 +592,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* if(parName == "pslope") { - m_log << MSG::INFO << "Generating slope histograms" << endreq; + m_log << MSG::INFO << "Generating slope histograms" << endmsg; if(m_doNeighborRatios){ genNeighborRatios(m_slopeNewColl->data, m_slopeRatioColl->data); @@ -608,7 +608,7 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* } if(parName == "pinter") { - m_log << MSG::INFO << "Generating intercept histograms" << endreq; + m_log << MSG::INFO << "Generating intercept histograms" << endmsg; copyDataToHists(m_interceptColl); } return StatusCode::SUCCESS; @@ -618,9 +618,9 @@ StatusCode CscCalibMonToolSlope::handleParameter(const CscCalibResultCollection* //requested by the user in m_detailedHashIds. StatusCode CscCalibMonToolSlope::postProc() { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in retrieveHistos()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in retrieveHistos()" << endmsg; - if (m_debuglevel) m_log << MSG::DEBUG << "Do all detailed is: " << m_doAllDetailed << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "Do all detailed is: " << m_doAllDetailed << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -633,14 +633,14 @@ StatusCode CscCalibMonToolSlope::postProc() if( !sc.isSuccess()) { m_log << MSG::ERROR << " Cannot retrieve object from storegate with key " - << m_histKey << " aborting retrieving hists " << endreq; + << m_histKey << " aborting retrieving hists " << endmsg; return StatusCode::RECOVERABLE; } if(repCont->size() != 1) { m_log << MSG::ERROR << "Container with key " << m_histKey << " does not have a size of one. Do not know how to proceed, so aborting" - << " retrieving calibration histograms." << endreq; + << " retrieving calibration histograms." << endmsg; return StatusCode::RECOVERABLE; } @@ -649,13 +649,13 @@ StatusCode CscCalibMonToolSlope::postProc() if(!slopeReport) { m_log << MSG::ERROR << "No report stored in the container with key " << m_histKey - << ". Aborting retrieving histograms." << endreq; + << ". Aborting retrieving histograms." << endmsg; return StatusCode::RECOVERABLE; } if(slopeReport->getLabel() != "calGraphs") { m_log << MSG::ERROR << "Incorect object retrieved from container with key " << m_histKey - << ". Aborting hist retrieval" << endreq; + << ". Aborting hist retrieval" << endmsg; return StatusCode::RECOVERABLE; } @@ -664,7 +664,7 @@ StatusCode CscCalibMonToolSlope::postProc() if(!ampProfs) { m_log <<MSG::ERROR << "There are no amplitude profiles in the slope report! Can't find dead chans." - <<endreq; + <<endmsg; return StatusCode::RECOVERABLE; } @@ -708,23 +708,23 @@ StatusCode CscCalibMonToolSlope::postProc() //Generate fractional deviation histograms if(m_debuglevel) m_log << MSG::DEBUG << "About to generate fractional deviation graphs" - << endreq; + << endmsg; if(!makeFracGraphs(*slopeReport).isSuccess()) m_log << MSG::WARNING << "Failed to generate fractional deviation graphs. Continuing anyway.." - << endreq; + << endmsg; if(m_debuglevel) m_log << MSG::DEBUG << "About to find dead channels" - << endreq; + << endmsg; //Determine dead channels //sc = findDeadChannels(*slopeReport); //if(!sc.isSuccess()) - // m_log << MSG::WARNING << "Failure while finding dead channels" << endreq; + // m_log << MSG::WARNING << "Failure while finding dead channels" << endmsg; //Put extra info for those channels indicated in m_detailedHashIds if(m_debuglevel) m_log << MSG::DEBUG << "Picking detailed graphs to output to root file" - << endreq; + << endmsg; if(m_numBad >0 || m_maxDetailedChannels < 0 || m_doAllDetailed) { const DataVector<TGraphErrors> * calGraphs @@ -732,18 +732,18 @@ StatusCode CscCalibMonToolSlope::postProc() if(!calGraphs) { m_log << MSG::ERROR << "No calGraph stored inside object with key " << m_histKey - << ". Aborting hist retrieval." << endreq; + << ". Aborting hist retrieval." << endmsg; return StatusCode::RECOVERABLE; } else - m_log <<MSG::INFO << "Got calGraphs" << endreq; + m_log <<MSG::INFO << "Got calGraphs" << endmsg; const DataVector<TH1I> * bitHists = slopeReport->getBitHists(); if(!bitHists) m_log << MSG::INFO << "No bit histogram vector found from calibration. " - << " Won't be in monitoring output file. " << endreq; + << " Won't be in monitoring output file. " << endmsg; else - m_log <<MSG::INFO << "Got bitHists" << endreq; + m_log <<MSG::INFO << "Got bitHists" << endmsg; //These are the channels we will get detailed forr. @@ -775,7 +775,7 @@ StatusCode CscCalibMonToolSlope::postProc() if(!sourceGraph) { m_log << MSG::ERROR << "The requested calgraph for hash " - << idItr << " doesn't exist in CscCalibReport object!" << endreq; + << idItr << " doesn't exist in CscCalibReport object!" << endmsg; } else { stringstream name; @@ -789,7 +789,7 @@ StatusCode CscCalibMonToolSlope::postProc() << strip; sourceGraph->SetName(name.str().c_str()); - m_log << MSG::DEBUG << "CalGraph axis title: " << sourceGraph->GetXaxis()->GetTitle() << endreq; + m_log << MSG::DEBUG << "CalGraph axis title: " << sourceGraph->GetXaxis()->GetTitle() << endmsg; regGraph(sourceGraph, calGraphPath, run, ATTRIB_MANAGED); } @@ -799,7 +799,7 @@ StatusCode CscCalibMonToolSlope::postProc() if(!sourceProf) { m_log << MSG::ERROR << "There is no fractional profile available for hash " - << idItr << ". Quitting retrieveHistos()." << endreq; + << idItr << ". Quitting retrieveHistos()." << endmsg; } else{ stringstream fracName; @@ -825,7 +825,7 @@ StatusCode CscCalibMonToolSlope::postProc() if(!bitHist) { m_log << MSG::ERROR << "There is no bit histogram with hashId " - << idItr << " Quiting out of detailed histogram loop." << endreq; + << idItr << " Quiting out of detailed histogram loop." << endmsg; } else { @@ -858,12 +858,12 @@ StatusCode CscCalibMonToolSlope::postProc() //Generate fractional Deviation graphs StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slopeReport) { - if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in makeFracGraphs()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "CscCalibMonToolSlope : in makeFracGraphs()" << endmsg; const DataVector<TGraphErrors> * calGraphs = slopeReport.getCalGraphs(); if(!calGraphs) { m_log << MSG::ERROR << "No calGraphs in slopeReport. Not going to make fractional deviation" - << " plots." << endreq; + << " plots." << endmsg; return StatusCode::RECOVERABLE; } @@ -873,7 +873,7 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop vector<Identifier>::const_iterator chamEnd = ids.end(); for(; chamItr != chamEnd; chamItr++) { - if(m_verboselevel) m_log << MSG::VERBOSE << "in Chamber loop " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "in Chamber loop " << endmsg; unsigned int stationSize = m_cscIdHelper->stationName(*chamItr); //51 = large, 50 = small unsigned int stationPhi = m_cscIdHelper->stationPhi(*chamItr); int stationEta = m_cscIdHelper->stationEta(*chamItr); @@ -885,32 +885,32 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop vector<Identifier>::const_iterator stripEnd = stripVect.end(); for(;stripItr != stripEnd; stripItr++) { - if(m_verboselevel) m_log << MSG::VERBOSE << "in strip loop " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "in strip loop " << endmsg; IdentifierHash stripHash; m_cscIdHelper->get_channel_hash(*stripItr,stripHash); if(!m_expectedHashIdsPrec.count((int)stripHash)){ - m_log << MSG::VERBOSE << "Skipping hash" << (int)stripHash << endreq; + m_log << MSG::VERBOSE << "Skipping hash" << (int)stripHash << endmsg; continue; } - if(m_verboselevel) m_log << MSG::VERBOSE << "strip hash " << stripHash << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "strip hash " << stripHash << endmsg; const TGraphErrors * graph = (*calGraphs)[stripHash]; if(!graph) { - if(m_verboselevel) m_log << MSG::VERBOSE << "SKipping graph" << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "SKipping graph" << endmsg; continue; } TF1 * func = graph->GetFunction("simpleFunc"); if(!func){ - m_log << MSG::DEBUG << "Could not retrieve function, skipping this graph" << endreq; + m_log << MSG::DEBUG << "Could not retrieve function, skipping this graph" << endmsg; continue; } if(m_verboselevel) { - m_log << MSG::VERBOSE << "Address is " << graph<< endreq; + m_log << MSG::VERBOSE << "Address is " << graph<< endmsg; m_log << MSG::VERBOSE << "name is "<< graph->GetName() << endl; m_log << MSG::VERBOSE << "Getting n " << endl; @@ -920,12 +920,12 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop //Get identification information //Note, we don't ask for measuresPhi because there should be no //TGraphs with Y anyways. - if(m_verboselevel) m_log << MSG::VERBOSE << "getting id info " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "getting id info " << endmsg; unsigned int layer = m_cscIdHelper->wireLayer(*stripItr); unsigned int strip = m_cscIdHelper->strip(*stripItr); if(m_verboselevel) m_log << "Got strip and layer" << endl; //initialize fractional deviation profile - if(m_verboselevel) m_log << MSG::VERBOSE << "initializing profile " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "initializing profile " << endmsg; stringstream nameStream; nameStream.setf(ios::right,ios::adjustfield); @@ -947,10 +947,10 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop fracProf->GetXaxis()->SetTitle("Pulser Attenuator Settings in dB (not auscaled axis) "); fracProf->GetYaxis()->SetTitle("ADC response"); - if(m_verboselevel) m_log << MSG::VERBOSE << "getting parameters " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "getting parameters " << endmsg; float intercept = func->GetParameter(0); float slope = func->GetParameter(1); - if(m_verboselevel) m_log << MSG::VERBOSE << "got them " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "got them " << endmsg; //Loop through points in graph, and compare the adc value and charge //to that expected from the fit parameters from the TF1 object @@ -959,7 +959,7 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop for(int itr = 0; itr < nPoints; itr++) { if(m_verboselevel) m_log << MSG::VERBOSE << "in point loop on point " << itr - << endreq; + << endmsg; //Find Fractional Deviation graph->GetPoint(itr,db,adc); @@ -967,7 +967,7 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop double frac = (adc - calcAdc)/( calcAdc - intercept); //Test to see if this is a bad result - if(m_verboselevel) m_log << MSG::VERBOSE << "bad result test " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "bad result test " << endmsg; if(frac > m_fracDevMax) { m_h_numBad->Fill(m_fracBadBin); @@ -977,22 +977,22 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop //test for nan, and put into fracProf if (frac==frac) { - if(m_verboselevel) m_log << MSG::VERBOSE << "filling fracProf " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "filling fracProf " << endmsg; fracProf->Fill(itr +1, frac); } //Label bin with db amount - if(m_verboselevel) m_log << MSG::VERBOSE << "labeling bin " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "labeling bin " << endmsg; stringstream binLabel; binLabel << db; fracProf->GetXaxis()->SetBinLabel(itr+1, binLabel.str().c_str()); } - if(m_verboselevel) m_log << MSG::VERBOSE << "storing fracProf " << endreq; + if(m_verboselevel) m_log << MSG::VERBOSE << "storing fracProf " << endmsg; //Store fraction graph for later if(stripHash > m_maxHashId) { m_log << MSG::ERROR << "Tried to assign fracProf with stripHash " << stripHash - << " when max stripHash is " << m_maxHashId << endreq; + << " when max stripHash is " << m_maxHashId << endmsg; return StatusCode::RECOVERABLE; } @@ -1009,7 +1009,7 @@ StatusCode CscCalibMonToolSlope::makeFracGraphs(const CscCalibReportSlope & slop }//end loop over strips }//end loop over chambers - m_log << MSG::DEBUG << "Finished generating frac graphs" << endreq; + m_log << MSG::DEBUG << "Finished generating frac graphs" << endmsg; return StatusCode::SUCCESS; }//end makeFracGraphs @@ -1025,7 +1025,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl const set<int> * pulsedChambers = slopeReport.getPulsedChambers(); if(!pulsedChambers) { - m_log <<MSG::ERROR << "No pulsed chambers stored in slopeReport! Skipping dead channel collecting!" << endreq; + m_log <<MSG::ERROR << "No pulsed chambers stored in slopeReport! Skipping dead channel collecting!" << endmsg; return StatusCode::RECOVERABLE; } @@ -1033,7 +1033,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl if(!ampProfs) { m_log <<MSG::ERROR << "There are no amplitude profiles in the slope report! Can't find dead chans." - <<endreq; + <<endmsg; return StatusCode::RECOVERABLE; } @@ -1041,7 +1041,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl int pulserLevel = profItr->first; m_log << MSG::INFO << "Looking for dead channels. Lowest attenuation level is " - << pulserLevel << endreq; + << pulserLevel << endmsg; m_log << MSG::INFO << "Dead channel cutoff is: "<< m_deadADCCutoff; if(pulserLevel < m_deadPulserLevelCutoff) @@ -1051,12 +1051,12 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl if(!ampProf) { m_log << MSG::ERROR << "There is no profile for this attenuation level! Skipping dead channel finding!" - << endreq; + << endmsg; return StatusCode::RECOVERABLE; } if(m_debuglevel) m_log << MSG::DEBUG << "There were " << pulsedChambers->size() - << " chambers pulsed." << endreq; + << " chambers pulsed." << endmsg; //Prepare dead channel content std::vector<float> & currentDeadVals = m_deadNewColl->data; @@ -1090,7 +1090,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl if(isDead && !wasDead) { - m_log << MSG::INFO << "NEW DEAD CHANNEL! Hash: " << hashItr << " ped: " << ped << " adc " << adc << " diff: " << adc-ped << endreq; + m_log << MSG::INFO << "NEW DEAD CHANNEL! Hash: " << hashItr << " ped: " << ped << " adc " << adc << " diff: " << adc-ped << endmsg; newDead.insert(hashItr); m_h_deadOverview->Fill(m_newDeadBin); diffDeadVals[hashItr] = 1; @@ -1098,7 +1098,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl } if(!isDead && wasDead) { - m_log << MSG::INFO << "PREVIOUSLY DEAD CHANNEL NOW LIVE! Hash: " << hashItr << endreq; + m_log << MSG::INFO << "PREVIOUSLY DEAD CHANNEL NOW LIVE! Hash: " << hashItr << endmsg; newUndead.insert(hashItr); m_h_deadOverview->Fill(m_newLiveBin); diffDeadVals[hashItr] = -1; @@ -1118,11 +1118,11 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl }//End for(hashItr) //***Generate histograms - m_log << MSG::INFO << "Generating dead histograms" << endreq; + m_log << MSG::INFO << "Generating dead histograms" << endmsg; copyDataToHists(m_deadNewColl); //copyDataToHists(m_deadDiffColl); - m_log << MSG::INFO << "Finished generating dead histograms" << endreq; + m_log << MSG::INFO << "Finished generating dead histograms" << endmsg; //***Fill COOL input file if there are new dead channels****** if(newDead.size() || newUndead.size()) @@ -1130,7 +1130,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl m_log << MSG::INFO << "There are " << newDead.size() << " newly dead channels and " << newUndead.size() << " newly live channels" - << endreq; + << endmsg; ofstream out("deadInfo.cal"); out <<"00-00 " << newDead.size() + newUndead.size() << " dead_stat END_HEADER\n"; @@ -1166,7 +1166,7 @@ StatusCode CscCalibMonToolSlope::findDeadChannels(const CscCalibReportSlope & sl { m_log << MSG::ERROR << "Lowest pulser level isn't low enough to count as a dead channel test. Skipping." - << endreq; + << endmsg; return StatusCode::RECOVERABLE; } @@ -1186,7 +1186,7 @@ void CscCalibMonToolSlope::genNeighborRatios(const std::vector<float> & source, size_t nEntries = source.size(); if(nEntries != ratios.size()){ m_log << MSG::ERROR << " in genNeighborRatios, source (" << nEntries << ") and ratio (" << ratios.size() - << ") vectors have different numbers of entries!" << endreq; + << ") vectors have different numbers of entries!" << endmsg; return; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InnerDetProbeCollectorTool.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InnerDetProbeCollectorTool.cxx index 13fc90626bf..d5e9145e57f 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InnerDetProbeCollectorTool.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InnerDetProbeCollectorTool.cxx @@ -46,7 +46,7 @@ namespace Muon { if(sc.isFailure() ){ m_log << MSG::ERROR << "Unable to retrieve pointer to THistSvc" - << endreq; + << endmsg; return sc; } @@ -54,23 +54,23 @@ namespace Muon { sc = service("StoreGateSvc",m_storeGate); if (sc.isFailure()) { - m_log << MSG::FATAL << "StoreGate service not found !" << endreq; + m_log << MSG::FATAL << "StoreGate service not found !" << endmsg; return StatusCode::FAILURE; } /// Getting InsituPerformanceTools if (m_InsituPerformanceTools.retrieve().isFailure()) { - m_log << MSG::FATAL << "My Tool Service not found" << endreq; + m_log << MSG::FATAL << "My Tool Service not found" << endmsg; return StatusCode::FAILURE; } sc = m_InsituPerformanceTools->initialize(); if (sc.isFailure()) { - m_log << MSG::FATAL << "InsituPerformanceTool service not found !" << endreq; + m_log << MSG::FATAL << "InsituPerformanceTool service not found !" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::INFO << "initialize() successful in " << name() << endreq; + m_log << MSG::INFO << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -86,7 +86,7 @@ namespace Muon { StatusCode InnerDetProbeCollectorTool::createProbeCollection() { - m_log << MSG::DEBUG << "createProbeCollection() for Inner Detector" << endreq; + m_log << MSG::DEBUG << "createProbeCollection() for Inner Detector" << endmsg; StatusCode sc = StatusCode::SUCCESS; /// Record the container of Probe Muons in StoreGate @@ -95,10 +95,10 @@ namespace Muon { if (sc.isFailure()) { m_log << MSG::ERROR << "Unable to record InnerDetectorProbeTracks in StoreGate" - << endreq; + << endmsg; return sc; } else - m_log << MSG::DEBUG << "InnerDetectorProbeTracks Container recorded in StoreGate." << endreq; + m_log << MSG::DEBUG << "InnerDetectorProbeTracks Container recorded in StoreGate." << endmsg; /// Retrieve Muon Tracks @@ -106,20 +106,20 @@ namespace Muon { sc=m_storeGate->retrieve( trackTES, m_MSTrackContainerName); if( sc.isFailure() || !trackTES ) { - m_log << MSG::WARNING << "No " << m_MSTrackContainerName << " container found in TDS" << endreq; + m_log << MSG::WARNING << "No " << m_MSTrackContainerName << " container found in TDS" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::DEBUG << "MuonTrack Container successfully retrieved" << endreq; + m_log << MSG::DEBUG << "MuonTrack Container successfully retrieved" << endmsg; /// Retrieve Combined Tracks const Analysis::MuonContainer* muonTDS=0; sc=m_storeGate->retrieve( muonTDS, m_CombinedMuonTracksContainerName); if( sc.isFailure() || !muonTDS ) { - m_log << MSG::WARNING << "No AOD "<<m_CombinedMuonTracksContainerName<<" container of muons found in TDS"<< endreq; + m_log << MSG::WARNING << "No AOD "<<m_CombinedMuonTracksContainerName<<" container of muons found in TDS"<< endmsg; return StatusCode::FAILURE; } - m_log << MSG::DEBUG << "MuonContainer successfully retrieved" << endreq; + m_log << MSG::DEBUG << "MuonContainer successfully retrieved" << endmsg; /// Loop over Combined Muon Tracks Analysis::MuonContainer::const_iterator muonItr = muonTDS->begin(); @@ -151,7 +151,7 @@ namespace Muon { sc = m_storeGate->setConst(m_IDProbeTrackContainer); if( sc.isFailure()) { - m_log << MSG::WARNING << "set const failed"<< endreq; + m_log << MSG::WARNING << "set const failed"<< endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InsituTrackTools.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InsituTrackTools.cxx index 58d84e2850f..7ffd648c9f9 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InsituTrackTools.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/InsituTrackTools.cxx @@ -43,7 +43,7 @@ namespace Muon { if(sc.isFailure() ){ m_log << MSG::ERROR << "Unable to retrieve pointer to THistSvc" - << endreq; + << endmsg; return sc; } @@ -51,11 +51,11 @@ namespace Muon { sc = service("StoreGateSvc",m_storeGate); if (sc.isFailure()) { - m_log << MSG::FATAL << "StoreGate service not found !" << endreq; + m_log << MSG::FATAL << "StoreGate service not found !" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::INFO << "initialize() successful in " << name() << endreq; + m_log << MSG::INFO << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonDQAFitFunc.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonDQAFitFunc.cxx index 51f2eb552d9..cad33d0c3fa 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonDQAFitFunc.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonDQAFitFunc.cxx @@ -75,8 +75,8 @@ namespace Muon { hmass->SetBinError(i+1,mass_error); hwidth->SetBinContent(i+1,width); hwidth->SetBinError(i+1,width_error); - //m_log<<MSG::DEBUG<<"mass shift: "<<mass<<" error: "<<mass_error<<endreq; - //m_log<<MSG::DEBUG<<"mass width: "<<width<<" error: "<<width_error<<endreq; + //m_log<<MSG::DEBUG<<"mass shift: "<<mass<<" error: "<<mass_error<<endmsg; + //m_log<<MSG::DEBUG<<"mass width: "<<width<<" error: "<<width_error<<endmsg; if( (fabs(mass)+mass_error)>maxmass ) maxmass=fabs(mass)+mass_error; if( (fabs(width)+width_error)>maxwidth ) maxwidth=fabs(width)+width_error; } @@ -177,7 +177,7 @@ namespace Muon { int nBins_2d = h2d->GetNbinsX(); int nBins_1d = h1d->GetNbinsX(); - if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/RMS Histograms not set up correctly - nBins mismatch" << endreq; + if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/RMS Histograms not set up correctly - nBins mismatch" << endmsg; //calling this means that the histogram bin content is flagged //as being an average and so adding histos from different jobs @@ -204,7 +204,7 @@ namespace Muon { h1d->SetBinContent(j,hproj->GetRMS()); h1d->SetBinError(j,hproj->GetRMSError()); } - else log << MSG::DEBUG << "Incorrect switch in MeanRMSProjectionsBarrel()" << endreq; + else log << MSG::DEBUG << "Incorrect switch in MeanRMSProjectionsBarrel()" << endmsg; delete hproj; } @@ -302,7 +302,7 @@ namespace Muon { int nBins_2d = h2d->GetNbinsX(); int nBins_1d = h1d->GetNbinsX(); - if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/Width Histograms not set up correctly - nBins mismatch" << endreq; + if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/Width Histograms not set up correctly - nBins mismatch" << endmsg; for(int i = 1; i!=nBins_2d+1; i++){ @@ -330,7 +330,7 @@ namespace Muon { h1d->SetBinContent(i,Width); h1d->SetBinError(i,WidthSigma); } - else log << MSG::DEBUG << "Incorrect switch in FillGausMeanOrWidth" << endreq; + else log << MSG::DEBUG << "Incorrect switch in FillGausMeanOrWidth" << endmsg; delete hProj; delete fit; @@ -359,7 +359,7 @@ namespace Muon { int nBins_2d = h2d->GetNbinsX(); int nBins_1d = h1d->GetNbinsX(); - if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/Width Histograms not set up correctly - nBins mismatch" << endreq; + if(nBins_2d!=nBins_1d) log << MSG::DEBUG << "Mean/Width Histograms not set up correctly - nBins mismatch" << endmsg; for(int i = 1; i!=nBins_2d+1; i++){ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonSpectrometerProbeCollectorTool.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonSpectrometerProbeCollectorTool.cxx index cdf5dfd8171..f4533d22566 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonSpectrometerProbeCollectorTool.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/MuonSpectrometerProbeCollectorTool.cxx @@ -38,14 +38,14 @@ namespace Muon { m_log.setLevel(outputLevel()); if (sc.isFailure()) return sc; - m_log << MSG::DEBUG << "Initialize ()" << endreq; + m_log << MSG::DEBUG << "Initialize ()" << endmsg; /// histogram location sc = service("THistSvc", m_thistSvc); if(sc.isFailure() ){ m_log << MSG::ERROR << "Unable to retrieve pointer to THistSvc" - << endreq; + << endmsg; return sc; } @@ -53,23 +53,23 @@ namespace Muon { sc = service("StoreGateSvc",m_storeGate); if (sc.isFailure()) { - m_log << MSG::FATAL << "StoreGate service not found !" << endreq; + m_log << MSG::FATAL << "StoreGate service not found !" << endmsg; return StatusCode::FAILURE; } /// Getting InsituPerformanceTools if (m_InsituPerformanceTools.retrieve().isFailure()) { - m_log << MSG::FATAL << "My Tool Service not found" << endreq; + m_log << MSG::FATAL << "My Tool Service not found" << endmsg; return StatusCode::FAILURE; } sc = m_InsituPerformanceTools->initialize(); if (sc.isFailure()) { - m_log << MSG::FATAL << "InsituPerformanceTools service not found !" << endreq; + m_log << MSG::FATAL << "InsituPerformanceTools service not found !" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::INFO << "initialize() successful in " << name() << endreq; + m_log << MSG::INFO << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -77,7 +77,7 @@ namespace Muon { StatusCode MuonSpectrometerProbeCollectorTool::finalize() { - m_log << MSG::DEBUG << "Finalize ()" << endreq; + m_log << MSG::DEBUG << "Finalize ()" << endmsg; StatusCode sc = AlgTool::finalize(); return sc; } @@ -86,7 +86,7 @@ namespace Muon { StatusCode MuonSpectrometerProbeCollectorTool::createProbeCollection() { - m_log << MSG::DEBUG << "createProbeCollection() for Muon Spectrometer" << endreq; + m_log << MSG::DEBUG << "createProbeCollection() for Muon Spectrometer" << endmsg; StatusCode sc = StatusCode::SUCCESS; /// Record the container of Probe Muons in StoreGate @@ -95,10 +95,10 @@ namespace Muon { if (sc.isFailure()) { m_log << MSG::ERROR << "Unable to record MuonSpectrometerProbeTracks in StoreGate" - << endreq; + << endmsg; return sc; } else - m_log << MSG::DEBUG << "MuonSpectrometerProbeTracks Container recorded in StoreGate." << endreq; + m_log << MSG::DEBUG << "MuonSpectrometerProbeTracks Container recorded in StoreGate." << endmsg; /// Retrieve Inner Tracks @@ -106,20 +106,20 @@ namespace Muon { sc=m_storeGate->retrieve( trackTES, m_InnerTrackContainerName); if( sc.isFailure() || !trackTES ) { - m_log << MSG::WARNING << "No " << m_InnerTrackContainerName << " container found in TDS" << endreq; + m_log << MSG::WARNING << "No " << m_InnerTrackContainerName << " container found in TDS" << endmsg; return StatusCode::FAILURE; } - m_log << MSG::DEBUG << "TrackParticleContainer successfully retrieved" << endreq; + m_log << MSG::DEBUG << "TrackParticleContainer successfully retrieved" << endmsg; /// Retrieve Combined Tracks const Analysis::MuonContainer* muonTDS=0; sc=m_storeGate->retrieve( muonTDS, m_CombinedMuonTracksContainerName); if( sc.isFailure() || !muonTDS ) { - m_log << MSG::WARNING << "No AOD "<<m_CombinedMuonTracksContainerName<<" container of muons found in TDS"<< endreq; + m_log << MSG::WARNING << "No AOD "<<m_CombinedMuonTracksContainerName<<" container of muons found in TDS"<< endmsg; return StatusCode::FAILURE; } - m_log << MSG::DEBUG << "MuonContainer successfully retrieved" << endreq; + m_log << MSG::DEBUG << "MuonContainer successfully retrieved" << endmsg; /// Loop over Combined Muon Tracks Analysis::MuonContainer::const_iterator muonItr = muonTDS->begin(); @@ -155,7 +155,7 @@ namespace Muon { sc = m_storeGate->setConst(m_MSProbeTrackContainer); if( sc.isFailure()) { - m_log << MSG::WARNING << "set const failed"<< endreq; + m_log << MSG::WARNING << "set const failed"<< endmsg; return StatusCode::FAILURE; } return StatusCode::SUCCESS; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataValAlg.cxx index 6ac8c5f6285..1a892af74f8 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataValAlg.cxx @@ -277,7 +277,7 @@ StatusCode MdtRawDataValAlg::initialize() // ToolHandle<Trig::TrigDecisionTool> m_trigDec; // sc = m_trigDec.retrieve(); // if (sc.isFailure()) { - // mLog << MSG::WARNING << " TriggerDecision not found in SG" << endreq; + // mLog << MSG::WARNING << " TriggerDecision not found in SG" << endmsg; // return StatusCode::FAILURE; // } // const Trig::ChainGroup* m_all = m_trigDec->getChainGroup(".*"); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx index 551d99e2179..d2dd679f01e 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawDataValAlg.cxx @@ -137,7 +137,7 @@ MdtVsTgcRawDataValAlg::MdtVsTgcRawDataValAlg( const std::string & type, const st } MdtVsTgcRawDataValAlg::~MdtVsTgcRawDataValAlg(){ - m_log << MSG::INFO << " deleting MdtVsTgcRawDataValAlg " << endreq; + m_log << MSG::INFO << " deleting MdtVsTgcRawDataValAlg " << endmsg; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -148,19 +148,19 @@ MdtVsTgcRawDataValAlg::initialize(){ m_log.setLevel(outputLevel()); // individual outputlevel not known before initialise m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached - m_log << MSG::INFO << "in initializing MdtVsTgcRawDataValAlg" << endreq; + m_log << MSG::INFO << "in initializing MdtVsTgcRawDataValAlg" << endmsg; StatusCode sc; // Store Gate store sc = serviceLocator()->service("StoreGateSvc", m_eventStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endreq; + m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endmsg; return sc ; } // retrieve the active store sc = serviceLocator()->service("ActiveStoreSvc", m_activeStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endreq; + m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endmsg; return sc ; } @@ -168,31 +168,31 @@ MdtVsTgcRawDataValAlg::initialize(){ StoreGateSvc* detStore = 0; sc = service("DetectorStore", detStore); if (sc.isFailure()) { - m_log << MSG::FATAL << "DetectorStore service not found !" << endreq; + m_log << MSG::FATAL << "DetectorStore service not found !" << endmsg; return StatusCode::FAILURE; } // Retrieve the MuonDetectorManager sc = detStore->retrieve(m_muonMgr); if (sc.isFailure()) { - m_log << MSG::FATAL << "Cannot get MuonDetectorManager from detector store" << endreq; + m_log << MSG::FATAL << "Cannot get MuonDetectorManager from detector store" << endmsg; return StatusCode::FAILURE; } else { - if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endmsg; } //get TGC ID Helper sc = detStore->retrieve(m_tgcIdHelper,"TGCIDHELPER"); if (sc.isFailure()) { - m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endreq; + m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endmsg; return sc; } //get MDT ID Helper sc = detStore->retrieve(m_mdtIdHelper,"MDTIDHELPER"); if (sc.isFailure()) { - m_log << MSG::FATAL << "Cannot get MdtIdHelper" << endreq; + m_log << MSG::FATAL << "Cannot get MdtIdHelper" << endmsg; return StatusCode::FAILURE; } @@ -202,13 +202,13 @@ MdtVsTgcRawDataValAlg::initialize(){ const ITGCcablingServerSvc* TgcCabGet = 0; sc = service("TGCcablingServerSvc", TgcCabGet); if (sc.isFailure()){ - m_log << MSG::ERROR << " Can't get TGCcablingServerSvc " << endreq; + m_log << MSG::ERROR << " Can't get TGCcablingServerSvc " << endmsg; return StatusCode::FAILURE; } // get Cabling Service sc = TgcCabGet->giveCabling(m_cabling); if (sc.isFailure()){ - m_log << MSG::ERROR << " Can't get TGCcablingSvc Server" << endreq; + m_log << MSG::ERROR << " Can't get TGCcablingSvc Server" << endmsg; return StatusCode::FAILURE; } @@ -216,9 +216,9 @@ MdtVsTgcRawDataValAlg::initialize(){ int maxRodId,maxSswId, maxSbloc,minChannelId, maxChannelId; m_cabling->getReadoutIDRanges( maxRodId,maxSswId, maxSbloc,minChannelId, maxChannelId); if (maxRodId ==12) { - m_log << MSG::INFO << "TGCcabling12Svc OK" << endreq ; + m_log << MSG::INFO << "TGCcabling12Svc OK" << endmsg ; } else { - m_log << MSG::WARNING << "TGCcablingSvc(octant segmentation) OK" << endreq ; + m_log << MSG::WARNING << "TGCcablingSvc(octant segmentation) OK" << endmsg ; } } @@ -257,7 +257,7 @@ MdtVsTgcRawDataValAlg::initialize(){ /*----------------------------------------------------------------------------------*/ StatusCode MdtVsTgcRawDataValAlg::bookHistogramsRecurrent(){ /*----------------------------------------------------------------------------------*/ - if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring Histograms being booked" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring Histograms being booked" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -270,7 +270,7 @@ StatusCode MdtVsTgcRawDataValAlg::bookHistogramsRecurrent(){ if(newEventsBlock){} if(newLumiBlock){} if(newRun){ - m_log << MSG::INFO << "MdtVsTgc RawData Monitoring : begin of run" << endreq; + m_log << MSG::INFO << "MdtVsTgc RawData Monitoring : begin of run" << endmsg; sc = bookmaphists(mdtvstgclv1_expert_a, mdtvstgclv1_expert_c); @@ -287,13 +287,13 @@ StatusCode MdtVsTgcRawDataValAlg::bookHistogramsRecurrent(){ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ /*----------------------------------------------------------------------------------*/ StatusCode sc = StatusCode::SUCCESS; - if (m_debuglevel) m_log << MSG::DEBUG << "MdtVsTgcRawDataValAlg::TGC RawData Monitoring Histograms being filled" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "MdtVsTgcRawDataValAlg::TGC RawData Monitoring Histograms being filled" << endmsg; //TGC PRD const Muon::TgcPrepDataContainer* tgc_prd_container; sc = (*m_activeStore)->retrieve(tgc_prd_container, m_tgc_PrepDataContainerName); if (sc.isFailure()) { - m_log << MSG::ERROR << " Cannot retrieve TgcPrepDataContainer " << "m_tgc_PrepDataContainerName" << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcPrepDataContainer " << "m_tgc_PrepDataContainerName" << endmsg; return sc; } @@ -301,17 +301,17 @@ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ const Muon::TgcCoinDataContainer* tgc_coin_container; sc = (*m_activeStore)->retrieve(tgc_coin_container, m_tgc_CoinContainerName); if (sc.isFailure()) { - m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer " << "m_tgc_CoinContainerName" << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer " << "m_tgc_CoinContainerName" << endmsg; return sc; } - if (m_debuglevel) m_log << MSG::DEBUG << "size of tgc container is " << tgc_coin_container -> size() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "size of tgc container is " << tgc_coin_container -> size() << endmsg; //MDT PRD const Muon::MdtPrepDataContainer* mdt_prd_container; sc = (*m_activeStore)->retrieve(mdt_prd_container, m_mdt_PrepDataContainerName); if (sc.isFailure()) { - m_log << MSG::ERROR << " Cannot retrieve MdtPrepDataContainer " << m_mdt_PrepDataContainerName << endreq; + m_log << MSG::ERROR << " Cannot retrieve MdtPrepDataContainer " << m_mdt_PrepDataContainerName << endmsg; return sc; } @@ -319,7 +319,7 @@ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ const xAOD::MuonSegmentContainer* mdt_new_segment ; sc = (*m_activeStore)->retrieve(mdt_new_segment, m_mdt_SegmentCollectionName); if (sc.isFailure()) { - m_log << MSG::ERROR << " Cannot retrieve New Mdt SegmentCollection " << m_mdt_SegmentCollectionName << endreq; + m_log << MSG::ERROR << " Cannot retrieve New Mdt SegmentCollection " << m_mdt_SegmentCollectionName << endmsg; return sc; } tgceffcalc(mdt_new_segment, tgc_prd_container); @@ -329,7 +329,7 @@ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ const Trk::SegmentCollection* mdt_segment_collection; sc = (*m_activeStore)->retrieve(mdt_segment_collection, m_mdt_SegmentCollectionName); if (sc.isFailure()) { - m_log << MSG::ERROR << " Cannot retrieve Mdt SegmentCollection " << m_mdt_SegmentCollectionName << endreq; + m_log << MSG::ERROR << " Cannot retrieve Mdt SegmentCollection " << m_mdt_SegmentCollectionName << endmsg; return sc; } tgceffcalc(mdt_segment_collection, tgc_prd_container); @@ -349,8 +349,8 @@ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ //TH1* testptr0 = tgclv1roietavsphi[0]; //sc = tgclv1_expert.getHist(testptr0,"RoI_Eta_Vs_Phi_A"); //tgclv1roietavsphi[0] = dynamic_cast<TH2*>(testptr0); - //if(sc.isFailure() ) m_log << MSG::WARNING << "couldn't get tgclv1roietavsphi[0] hist to MonGroup" << endreq; - //m_log<<MSG::INFO <<"RoI_Eta_Vs_Phi_A_Side has been got"<<endreq; + //if(sc.isFailure() ) m_log << MSG::WARNING << "couldn't get tgclv1roietavsphi[0] hist to MonGroup" << endmsg; + //m_log<<MSG::INFO <<"RoI_Eta_Vs_Phi_A_Side has been got"<<endmsg; //fill MDT hit vs TGC RoI correlation(mdt_prd_container, tgc_coin_container); @@ -363,7 +363,7 @@ StatusCode MdtVsTgcRawDataValAlg::fillHistograms(){ StatusCode MdtVsTgcRawDataValAlg::procHistograms(){ /*----------------------------------------------------------------------------------*/ - if (m_debuglevel) m_log << MSG::DEBUG << "MdtVsTgcRawDataValAlg finalize()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "MdtVsTgcRawDataValAlg finalize()" << endmsg; if(endOfEventsBlock){} if(endOfLumiBlock){} if(endOfRun){ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_TGCEffCheck.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_TGCEffCheck.cxx index b5d8b80d615..123d5ea2bd2 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_TGCEffCheck.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_TGCEffCheck.cxx @@ -41,7 +41,7 @@ using namespace std; void MdtVsTgcRawDataValAlg::tgceffcalc(const xAOD::MuonSegmentContainer *m_newmdtsegment, const Muon::TgcPrepDataContainer *tgc_prepcontainer){ - if(m_debuglevel) m_log<<MSG::DEBUG<<"inside tgcEIFIeffcalc"<<endreq; + if(m_debuglevel) m_log<<MSG::DEBUG<<"inside tgcEIFIeffcalc"<<endmsg; ////////////////////////////////////////////////////// // Declare vector arrays to hold segment pointers @@ -91,7 +91,7 @@ MdtVsTgcRawDataValAlg::tgceffcalc(const xAOD::MuonSegmentContainer *m_newmdtsegm void MdtVsTgcRawDataValAlg::tgceffcalc(const Trk::SegmentCollection *m_segmcollection, const Muon::TgcPrepDataContainer *tgc_prepcontainer){ - if(m_debuglevel) m_log<<MSG::DEBUG<<"inside tgcEIFIeffcalc"<<endreq; + if(m_debuglevel) m_log<<MSG::DEBUG<<"inside tgcEIFIeffcalc"<<endmsg; ////////////////////////////////////////////////////// // Declare vector arrays to hold segment pointers @@ -188,7 +188,7 @@ MdtVsTgcRawDataValAlg::prepareTREarray(){ // Get TRE and put into to array TREarray[stationNameIndex][tgcAC][absStationEta][stationPhi] = m_muonMgr->getTgcReadoutElement(tgc_testId); if(TREarray[stationNameIndex][tgcAC][absStationEta][stationPhi]==0){ - m_log << MSG::WARNING << "prepareTREarray: TgcReadoutElement==0 passed checks" << endreq; + m_log << MSG::WARNING << "prepareTREarray: TgcReadoutElement==0 passed checks" << endmsg; continue; } }// Station Phi @@ -252,35 +252,35 @@ MdtVsTgcRawDataValAlg::tgceffcalcfinalize(){ int MdtVsTgcRawDataValAlg::TGCgetlayer(int stationName, int g){ if(g<1){ - m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap g=" << g << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap g=" << g << endmsg; return -1; } int l = g-1; if(stationName==41||stationName==42){ if(g>3){ - m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endmsg; return -1; } }else if(stationName==43||stationName==44){ if(g>2){ - m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endmsg; return -1; } l+=3; }else if(stationName==45||stationName==46){ if(g>2){ - m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endmsg; return -1; } l+=5; }else if(stationName==47||stationName==48){ if(g>2){ - m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid gasgap and stationName combination n=" << stationName << " g=" << g << endmsg; return -1; } l+=7; }else{ - m_log << MSG::WARNING << "TGCgetlayer passed invalid stationName n=" << stationName << endreq; + m_log << MSG::WARNING << "TGCgetlayer passed invalid stationName n=" << stationName << endmsg; return -1; } return l; @@ -294,7 +294,7 @@ MdtVsTgcRawDataValAlg::TGClayer2stationindex(int l){ else if(l==5||l==6)return 2; else if(l==7||l==8)return 3; else{ - m_log << MSG::WARNING << "TGClayer2Station passed invalid layer number:" << l << endreq; + m_log << MSG::WARNING << "TGClayer2Station passed invalid layer number:" << l << endmsg; return -1; } }// End of function @@ -306,7 +306,7 @@ MdtVsTgcRawDataValAlg::TGCstationname2stationindex(int stationName){ else if(stationName==45||stationName==46)return 2; else if(stationName==47||stationName==48)return 3; else{ - m_log << MSG::WARNING << "TGCstationname2stationindex passed invalid stationName n=" << stationName << endreq; + m_log << MSG::WARNING << "TGCstationname2stationindex passed invalid stationName n=" << stationName << endmsg; return -1; } }// End of function @@ -315,15 +315,15 @@ MdtVsTgcRawDataValAlg::TGCstationname2stationindex(int stationName){ int MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stationEta, int stationPhi){ // Display error messages if invalid TRE variables are passed in - if((stationFE!=0)&&(stationFE!=1)) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationFE=" << stationFE << endreq; - if((l<0)||(l>8)) m_log << MSG::WARNING << "getStationMapIndex passed invalid layer index l=" << l << endreq; - if(stationEta<1) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationEta=" << stationEta << endreq; - if(stationPhi<1) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationPhi=" << stationPhi << endreq; + if((stationFE!=0)&&(stationFE!=1)) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationFE=" << stationFE << endmsg; + if((l<0)||(l>8)) m_log << MSG::WARNING << "getStationMapIndex passed invalid layer index l=" << l << endmsg; + if(stationEta<1) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationEta=" << stationEta << endmsg; + if(stationPhi<1) m_log << MSG::WARNING << "getStationMapIndex passed invalid stationPhi=" << stationPhi << endmsg; int index=0; switch(x){ case 1:// Getting Eta Index //use old eta bin if(l==0||l==1||l==2){// T1 - if(stationEta>4) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endreq; + if(stationEta>4) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endmsg; if(stationFE==0)index=32+l; else{ index=4-stationEta; @@ -331,7 +331,7 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati } } else if(l==3||l==4){// T2 - if(stationEta>5) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endreq; + if(stationEta>5) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endmsg; if(stationFE==0)index=32+l; else { index=5-stationEta; @@ -340,7 +340,7 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati } } else if(l==5||l==6){// T3 - if(stationEta>5) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endreq; + if(stationEta>5) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endmsg; if(stationFE==0)index=32+l; else{ index=5-stationEta; @@ -349,7 +349,7 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati } } else if(l==7||l==8){// T4 - if(stationEta>1) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endreq; + if(stationEta>1) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " stationEta=" << stationEta << endmsg; if(stationFE==0){ if(l==7){index=41;} else if(l==8){index=42;} @@ -362,17 +362,17 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati case 2:// Getting Phi Index if(stationFE==0){// Forward if((l==7)||(l==8)){// FI - if(stationPhi>24) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endreq; + if(stationPhi>24) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endmsg; index=(stationPhi-1)*2; } else{// Forward Midstation - if(stationPhi>24) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endreq; + if(stationPhi>24) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endmsg; index=(stationPhi-1)*2; } } else{// Endcap if((l==7)||(l==8)){// EI - if(stationPhi>21) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endreq; + if(stationPhi>21) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endmsg; index=(stationPhi-1); if(index>7)index++; if(index>15)index++; @@ -380,7 +380,7 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati index*=2; } else{// Endcap Midstation - if(stationPhi>48) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endreq; + if(stationPhi>48) m_log << MSG::WARNING << "getStationMapIndex(" << x << ") passed invalid l=" << l << " FE=" << stationFE << " stationPhi=" << stationPhi << endmsg; index=stationPhi-1; } } @@ -389,7 +389,7 @@ MdtVsTgcRawDataValAlg::getStationMapIndex(int x, int l, int stationFE, int stati if(index>47)index-=48; break; default: - m_log << MSG::WARNING << "getStationMapIndex(" << x << ") is invalid" << endreq; + m_log << MSG::WARNING << "getStationMapIndex(" << x << ") is invalid" << endmsg; break; } return index; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_bookhistograms.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_bookhistograms.cxx index b85f56ef38c..b805a3cf630 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_bookhistograms.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_bookhistograms.cxx @@ -52,7 +52,7 @@ MdtVsTgcRawDataValAlg::bookmaphists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mvt_cutspassed[i]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mvt_cutspassed["<<i<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mvt_cutspassed["<<i<<"] Failed to register histogram " << endmsg; return sc; } mvt_cutspassed[i]->GetYaxis()->SetTitle("nEvents"); @@ -92,7 +92,7 @@ MdtVsTgcRawDataValAlg::bookmaphists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mdt_segmmap[i][jMDT]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mdt_segmmap["<<i<<"]["<<jMDT<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mdt_segmmap["<<i<<"]["<<jMDT<<"] Failed to register histogram " << endmsg; return sc; } mdt_segmmap[i][jMDT]->GetXaxis()->SetTitle("MDT Phi"); @@ -142,7 +142,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(eff_stationmapbase[i][k][e]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "eff_stationmapbase["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "eff_stationmapbase["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endmsg; return sc; } labelStationMap(eff_stationmapbase[i][k][e], i,k); @@ -161,7 +161,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(eff_stationmapmid[i][k][e]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "eff_stationmapmid["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "eff_stationmapmid["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endmsg; return sc; } labelStationMap(eff_stationmapmid[i][k][e], i,k); @@ -180,7 +180,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(eff_stationmap[i][k][e]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "eff_stationmap["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "eff_stationmap["<<i<<"]["<<k<<"]["<<e<<"] Failed to register histogram " << endmsg; return sc; } labelStationMap(eff_stationmap[i][k][e], i,k); @@ -216,7 +216,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mvt_extrprdsag[i][jTGC][f][k][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mvt_extrprdsag["<<i<<"]["<<jTGC<<"]["<<f<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mvt_extrprdsag["<<i<<"]["<<jTGC<<"]["<<f<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } mvt_extrprdsag[i][jTGC][f][k][x]->GetXaxis()->SetTitle(RhoEtaPhiZ[x].c_str()); @@ -236,7 +236,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mvt_extrprdsag2[i][jTGC][f][k][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mvt_extrprdsag2["<<i<<"]["<<jTGC<<"]["<<f<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mvt_extrprdsag2["<<i<<"]["<<jTGC<<"]["<<f<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } mvt_extrprdsag2[i][jTGC][f][k][x]->GetXaxis()->SetTitle(RhoEtaPhiZ[x].c_str()); @@ -275,7 +275,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(tgc_prdcompsag[i][k][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "tgc_prdcompsag["<<i<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgc_prdcompsag["<<i<<"]["<<k<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } tgc_prdcompsag[i][k][x]->GetXaxis()->SetTitle(RhoEtaPhiZ[x].c_str()); @@ -319,7 +319,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mdt_segmmatchsag[i][jMDT1][jMDT2][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mdt_segmmatchsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mdt_segmmatchsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } mdt_segmmatchsag[i][jMDT1][jMDT2][x]->GetXaxis()->SetTitle(RhoEtaPhiThe[x].c_str()); @@ -368,7 +368,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mdt_segmposdirsag[i][jMDT1][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mdt_segmposdirsag["<<i<<"]["<<jMDT1<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mdt_segmposdirsag["<<i<<"]["<<jMDT1<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } mdt_segmposdirsag[i][jMDT1][x]->GetXaxis()->SetTitle(RhoEtaPhiThe[x].c_str()); @@ -393,7 +393,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mdt_trackdirdirsag[i][jMDT1][jMDT2][x]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mdt_trackdirdirsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mdt_trackdirdirsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"] Failed to register histogram " << endmsg; return sc; } mdt_trackdirdirsag[i][jMDT1][jMDT2][x]->GetXaxis()->SetTitle(RhoEtaPhiThe[x].c_str()); @@ -417,7 +417,7 @@ MdtVsTgcRawDataValAlg::bookeffhists(MonGroup &mdtvstgclv1_expert_a, sc=mdtvstgclv1_expert_c.regHist(mdt_trackchecksag[i][jMDT1][jMDT2][x][v]); } if(sc.isFailure()){ - m_log << MSG::FATAL << "mdt_segmmatchsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"]["<<v<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "mdt_segmmatchsag["<<i<<"]["<<jMDT1<<"]["<<jMDT2<<"]["<<x<<"]["<<v<<"] Failed to register histogram " << endmsg; return sc; } mdt_trackchecksag[i][jMDT1][jMDT2][x][v]->GetXaxis()->SetTitle(RhoEtaPhiThe[x].c_str()); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx index 3ffa7fc8491..68b30003002 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_correlation.cxx @@ -49,7 +49,7 @@ void MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_container, const Muon::TgcCoinDataContainer* tgccontainer){ - if (m_debuglevel) m_log<<MSG::DEBUG<<"inside correlation"<<endreq; + if (m_debuglevel) m_log<<MSG::DEBUG<<"inside correlation"<<endmsg; //StatusCode sc=StatusCode::SUCCESS; //loop over TGC RoI container @@ -59,7 +59,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con ++it){ - if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgc collection is " << (*it) -> size() << endreq; + if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgc collection is " << (*it) -> size() << endmsg; //loop over TGC RoI collection Muon::TgcCoinDataCollection::const_iterator itc_end=(*it)->end(); @@ -101,7 +101,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con <<" roiphi "<<roiphi <<" tgcEta "<<tgcEta <<" tgcPhi "<<tgcPhi - <<endreq; + <<endmsg; } @@ -145,7 +145,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con //if (m_debuglevel){ //m_log<<MSG::DEBUG /// <<"mmdtStationName "<<mdtStationName - // <<endreq; + // <<endmsg; //} //only Endcap middle MDT @@ -161,7 +161,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con //same Side if(ac!=mdtAC)continue; - if (m_debuglevel) m_log<<MSG::DEBUG<< "size of mdt collection is " << (*containerIt) -> size() << endreq; + if (m_debuglevel) m_log<<MSG::DEBUG<< "size of mdt collection is " << (*containerIt) -> size() << endmsg; if (m_debuglevel){ m_log<<MSG::DEBUG @@ -169,7 +169,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con <<" mdtStationEta "<<mdtStationEta <<" mdtStationPhi "<<mdtStationPhi <<" mdtSectorPhi "<<mdtSectorPhi - <<endreq; + <<endmsg; } //if( itgcstationEta!=RoIEta || itgcstationPhi!=RoIPhi48 || end_or_for!=RoIEF || a_or_c!=RoISide )continue; @@ -200,7 +200,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con <<" mdtTubeLayer "<<mdtTubeLayer <<" mdtTube "<<mdtTube <<" mdtTubeIdForEM "<<mdtTubeIdForEM - <<endreq; + <<endmsg; } if(tmp[mdtMultiLayer-1][mdtTubeLayer-1][mdtTube-1]==1)continue; @@ -236,7 +236,7 @@ MdtVsTgcRawDataValAlg::correlation(const Muon::MdtPrepDataContainer* mdt_hit_con <<" SecPhi "<<mdtSectorPhi <<" ADC "<<adc <<" TDC "<<tdc - <<endreq; + <<endmsg; } }//MDT collection diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx index c078b4ec674..dae0a60625a 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_functions.cxx @@ -96,7 +96,7 @@ MdtVsTgcRawDataValAlg::numberOfSL(const Muon::TgcCoinDataContainer* tgctrgcontai ++it){ - if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgc collection is " << (*it) -> size() << endreq; + if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgc collection is " << (*it) -> size() << endmsg; //loop over TGC RoI collection Muon::TgcCoinDataCollection::const_iterator itc_end=(*it)->end(); @@ -107,7 +107,7 @@ MdtVsTgcRawDataValAlg::numberOfSL(const Muon::TgcCoinDataContainer* tgctrgcontai Muon::TgcCoinData* tcd=*itc; if( tcd->type() != Muon::TgcCoinData::TYPE_SL )continue; - m_log<<MSG::DEBUG<<"pt"<<tcd->pt()<<endreq; + m_log<<MSG::DEBUG<<"pt"<<tcd->pt()<<endmsg; nSL++; theSL=tcd; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx index ef2292476bd..6f63e1c2c59 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/MdtVsTgcRawData_maptgchits.cxx @@ -39,7 +39,7 @@ using namespace std; void MdtVsTgcRawDataValAlg::maphists(const xAOD::MuonSegmentContainer *m_newsegment, const Muon::TgcPrepDataContainer *tgc_prepcontainer){//use new mdt segment - if(m_debuglevel) m_log<<MSG::DEBUG<<"inside maptgchits"<<endreq; + if(m_debuglevel) m_log<<MSG::DEBUG<<"inside maptgchits"<<endmsg; /////////////////////////////////////////////////////////////////////////////////////////////// // loop over MDT Segment Collection @@ -151,7 +151,7 @@ MdtVsTgcRawDataValAlg::maphists(const xAOD::MuonSegmentContainer *m_newsegment, void MdtVsTgcRawDataValAlg::maphists(const Trk::SegmentCollection *m_segmcollection, const Muon::TgcPrepDataContainer *tgc_prepcontainer){//use old mdt segment - if(m_debuglevel) m_log<<MSG::DEBUG<<"inside maptgchits"<<endreq; + if(m_debuglevel) m_log<<MSG::DEBUG<<"inside maptgchits"<<endmsg; ////////////////////////////////////////////////////// // Declare flags for data types present diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_MidstationMatching.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_MidstationMatching.cxx index 25a9d9b90af..b0ed6241428 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_MidstationMatching.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_MidstationMatching.cxx @@ -523,7 +523,7 @@ MdtVsTgcRawDataValAlg::MidstationOnlyCheck(vector<const Muon::MuonSegment*> (&so // If matching array was somehow empty (should be impossible) if(nlayerMax==0)continue; if(bestTPDmatches[k]->size()==0){ - m_log << MSG::WARNING << "MidstationOnly: empty bestTPDmatches["<<k<<"] passed" << endreq; + m_log << MSG::WARNING << "MidstationOnly: empty bestTPDmatches["<<k<<"] passed" << endmsg; continue; } @@ -584,7 +584,7 @@ MdtVsTgcRawDataValAlg::MidstationOnlyCheck(vector<const Muon::MuonSegment*> (&so m_log << MSG::WARNING << "MidstationOnly: canCheckSector passed for jTGC=" << stationIndex << " but, FE="<<TGCstation_StationFEFill[stationIndex] << " Eta="<<TGCstation_StationEtaFill[stationIndex] - << " Phi=" << TGCstation_StationPhiFill[stationIndex] << endreq; + << " Phi=" << TGCstation_StationPhiFill[stationIndex] << endmsg; continue; } // Get Sector histogram indexes diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_PRDonTrack.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_PRDonTrack.cxx index 0895e7c02ec..9bc2f8c7cd9 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_PRDonTrack.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/functions/MdtVsTgcRawData_PRDonTrack.cxx @@ -301,7 +301,7 @@ MdtVsTgcRawDataValAlg::CheckTGConTrack(vector<SegmTrack> (&matchedSegments)[2], // Trk::GlobalPosition tgcExtrapolatedPos; Amg::Vector3D tgcExtrapolatedPos; if(stationIndex==3){// Extrapolate position from Inner Position to PRD Z position - //if(innerSegmPos=0)m_log << MSG::WARNING << "MidstationOnly: innerSegmPos=0 but passed canCheckGlobal" << endreq; + //if(innerSegmPos=0)m_log << MSG::WARNING << "MidstationOnly: innerSegmPos=0 but passed canCheckGlobal" << endmsg; float dZ = abs(tgcZ) - abs(innerSegmZ); //tgcExtrapolatedPos = Trk::GlobalPosition(innerSegmPos+(innerSegmDirzunit*dZ)); tgcExtrapolatedPos = Amg::Vector3D(innerSegmPos+(innerSegmDirzunit*dZ)); @@ -363,7 +363,7 @@ MdtVsTgcRawDataValAlg::CheckTGConTrack(vector<SegmTrack> (&matchedSegments)[2], m_log << MSG::WARNING << "SegmTrack: canCheckSector passed for jTGC=" << stationIndex << " but, FE=" << TGCstation_StationFE[stationIndex] << " Eta=" << TGCstation_StationEta[stationIndex] - << " Phi=" << TGCstation_StationPhi[stationIndex] << endreq; + << " Phi=" << TGCstation_StationPhi[stationIndex] << endmsg; continue; } // Get Sector histogram indexes diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx index 909febe7806..2911d6c6c29 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataEfficiency.cxx @@ -53,7 +53,7 @@ RpcLv1RawDataEfficiency::RpcLv1RawDataEfficiency( const std::string & type, //================================================================================================================================ RpcLv1RawDataEfficiency::~RpcLv1RawDataEfficiency() { - msg(MSG::INFO) << " Deleting RpcLv1RawDataEfficiency " << endreq; + msg(MSG::INFO) << " Deleting RpcLv1RawDataEfficiency " << endmsg; } //================================================================================================================================ @@ -63,8 +63,8 @@ StatusCode RpcLv1RawDataEfficiency::initialize() m_log.setLevel(outputLevel()); // individual outputLevel not known before initialize m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached - msg(MSG::INFO) << "In initializing 'RpcLv1RawDataEfficiency'" << endreq; - msg(MSG::INFO) << "Package version = "<< PACKAGE_VERSION << endreq; + msg(MSG::INFO) << "In initializing 'RpcLv1RawDataEfficiency'" << endmsg; + msg(MSG::INFO) << "Package version = "<< PACKAGE_VERSION << endmsg; StatusCode sc; @@ -106,36 +106,36 @@ StatusCode RpcLv1RawDataEfficiency::initialize() // Store Gate store sc = serviceLocator()->service("StoreGateSvc", m_eventStore); if (sc != StatusCode::SUCCESS ) { - msg(MSG::ERROR) << " Cannot get StoreGateSvc! " << endreq; + msg(MSG::ERROR) << " Cannot get StoreGateSvc! " << endmsg; return sc; } // Retrieve the active store where all the information is being read from sc = serviceLocator()->service("ActiveStoreSvc", m_activeStore); if (sc != StatusCode::SUCCESS ) { - msg(MSG::ERROR) << " Cannot get ActiveStoreSvc! " << endreq; + msg(MSG::ERROR) << " Cannot get ActiveStoreSvc! " << endmsg; return sc; } // Initialize the IdHelper StoreGateSvc* detStore = 0; sc = service("DetectorStore", detStore); if (sc.isFailure()) { - msg(MSG::FATAL) << "DetectorStore service not found !" << endreq; + msg(MSG::FATAL) << "DetectorStore service not found !" << endmsg; return StatusCode::FAILURE; } // Retrieve RPCIdHelper sc = detStore->retrieve(m_rpcIdHelper,"RPCIDHELPER"); if (sc.isFailure()) { - msg(MSG::FATAL) << "Can't retrieve RpcIdHelper" << endreq; + msg(MSG::FATAL) << "Can't retrieve RpcIdHelper" << endmsg; return sc; } // Retrieve the MuonDetectorManager sc = detStore->retrieve(m_muonMgr); if (sc.isFailure()) { - msg(MSG::FATAL) << "Cannot get MuonDetectorManager from detector store" << endreq; + msg(MSG::FATAL) << "Cannot get MuonDetectorManager from detector store" << endmsg; return StatusCode::FAILURE;} else { - if (m_debuglevel) msg(MSG::DEBUG) << "Found the MuonDetectorManager from detector store." << endreq ; + if (m_debuglevel) msg(MSG::DEBUG) << "Found the MuonDetectorManager from detector store." << endmsg ; } // Ignore the checking code ManagedMonitorToolBase::initialize().ignore(); @@ -149,7 +149,7 @@ StatusCode RpcLv1RawDataEfficiency::initialize() //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::readOfflineMuonContainer( std::string key ) { - if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Reading OfflineMuonContainer... " << endreq; + if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Reading OfflineMuonContainer... " << endmsg; // read the container the first time or again, so delete the old one m_OfflineMuons.clear(); @@ -163,7 +163,7 @@ StatusCode RpcLv1RawDataEfficiency::readOfflineMuonContainer( std::string key ) // retrieve the offline muon container StatusCode sc = (*m_activeStore)->retrieve(muonCont, key); if(sc.isFailure()) { - msg(MSG::WARNING) << "Container of muon particle with key " << key << " not found in ActiveStore" << endreq; + msg(MSG::WARNING) << "Container of muon particle with key " << key << " not found in ActiveStore" << endmsg; return StatusCode::SUCCESS; } @@ -232,7 +232,7 @@ StatusCode RpcLv1RawDataEfficiency::readOfflineMuonContainer( std::string key ) offmu.SetPtEtaPhiQ( pt/CLHEP::GeV, eta, (*it)->phi(), (*it)->charge() ); m_OfflineMuons.push_back(offmu); } - if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Number of offline muons before dR check : " << m_OfflineMuons.size() << endreq; + if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Number of offline muons before dR check : " << m_OfflineMuons.size() << endmsg; // check if no track is too close to another track bool bTooClose = false; @@ -250,7 +250,7 @@ StatusCode RpcLv1RawDataEfficiency::readOfflineMuonContainer( std::string key ) ++it1; } if(bTooClose) m_OfflineMuons.clear(); - if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Finished reading OfflineMuonContainer... " << endreq; + if (m_log.level() == MSG::VERBOSE) msg(MSG::VERBOSE) << "Finished reading OfflineMuonContainer... " << endmsg; return StatusCode::SUCCESS; } @@ -261,13 +261,13 @@ StatusCode RpcLv1RawDataEfficiency::readOfflineMuonContainer( std::string key ) //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::readRpcCoinDataContainer() { - if (m_debuglevel) msg(MSG::DEBUG) << "Reading RpcCoincidenceContainer... " << endreq; + if (m_debuglevel) msg(MSG::DEBUG) << "Reading RpcCoincidenceContainer... " << endmsg; const Muon::RpcCoinDataContainer* rpc_coin_container; StatusCode sc = StatusCode::SUCCESS; sc = (*m_activeStore)->retrieve(rpc_coin_container, "RPC_triggerHits" ); if (sc.isFailure()) { - msg(MSG::ERROR) << "Cannot retrieve RPC trigger hits container" << endreq; + msg(MSG::ERROR) << "Cannot retrieve RPC trigger hits container" << endmsg; return sc; } Muon::RpcCoinDataContainer::const_iterator it_container; @@ -281,7 +281,7 @@ StatusCode RpcLv1RawDataEfficiency::readRpcCoinDataContainer() for( it_container = rpc_coin_container->begin(); it_container != rpc_coin_container->end(); ++it_container ) { for ( Muon::RpcCoinDataCollection::const_iterator it_collection = (*it_container)->begin(); it_collection != (*it_container)->end(); ++it_collection ) { // each collection is a trigger signal - if (m_debuglevel) msg(MSG::DEBUG) << "Original RPC container: " << (*it_collection)->threshold() <<int((*it_collection)->isLowPtCoin()) << int((*it_collection)->isHighPtCoin()) << endreq; + if (m_debuglevel) msg(MSG::DEBUG) << "Original RPC container: " << (*it_collection)->threshold() <<int((*it_collection)->isLowPtCoin()) << int((*it_collection)->isHighPtCoin()) << endmsg; if(int((*it_collection)->threshold())<1 || (*it_collection)->threshold()>3 || (int((*it_collection)->isLowPtCoin())+int((*it_collection)->isHighPtCoin())!=1)) continue; // some thresholds are 99 (lowpt=highpt=0)->skip CoincidenceData* coindata = new CoincidenceData; coindata->SetThresholdLowHigh(int((*it_collection)->threshold()), int((*it_collection)->isLowPtCoin()), int((*it_collection)->isHighPtCoin())); @@ -312,7 +312,7 @@ StatusCode RpcLv1RawDataEfficiency::readRpcCoinDataContainer() m_CoincidenceData.push_back( coindata ); } } - if (m_debuglevel) msg(MSG::DEBUG) << "Finished with reading the RpcCoinDataContainer... " << endreq; + if (m_debuglevel) msg(MSG::DEBUG) << "Finished with reading the RpcCoinDataContainer... " << endmsg; return StatusCode::SUCCESS; } @@ -321,16 +321,16 @@ StatusCode RpcLv1RawDataEfficiency::readRpcCoinDataContainer() //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::StoreTriggerType() { - if (m_debuglevel) msg(MSG::DEBUG) << "Storing Trigger Type... " << endreq; + if (m_debuglevel) msg(MSG::DEBUG) << "Storing Trigger Type... " << endmsg; const xAOD::EventInfo* eventInfo; StatusCode sc = StatusCode::SUCCESS; sc = m_eventStore -> retrieve(eventInfo); if (sc.isFailure()){ - msg(MSG::ERROR) << "Cannot find EventInfo! " << endreq; + msg(MSG::ERROR) << "Cannot find EventInfo! " << endmsg; return sc; } else if (m_debuglevel) - msg(MSG::DEBUG) << "RpcLv1RawDataEfficiency::retrieved eventInfo" << endreq; + msg(MSG::DEBUG) << "RpcLv1RawDataEfficiency::retrieved eventInfo" << endmsg; // Protection against simulated cosmics when the trigger_info() of the event_info is not filled and returns a null pointer. m_trigtype = eventInfo->level1TriggerType(); @@ -348,7 +348,7 @@ StatusCode RpcLv1RawDataEfficiency::StoreTriggerType() //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::bookHistogramsRecurrent() { - msg(MSG::INFO) << "Booking Sector Hits histograms for RPCLV1RawDataEfficiency... " << endreq; + msg(MSG::INFO) << "Booking Sector Hits histograms for RPCLV1RawDataEfficiency... " << endmsg; StatusCode sc = StatusCode::SUCCESS; // not used yet, but commenting them out leads to "unused variables" warnings since they are passed as arguments to the function @@ -366,7 +366,7 @@ StatusCode RpcLv1RawDataEfficiency::bookHistogramsRecurrent() rpclv1_sectorhits_C[iMuThreshold] = new TH2I(m_ss.str().c_str(), (m_ss.str() + ";LB;Sector").c_str() , 500, 0., 1500., 32, 0., 32.); sc = MG_SectorHits.regHist(rpclv1_sectorhits_C[iMuThreshold]); if( sc.isFailure()) { - msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endreq; + msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endmsg; return sc; } @@ -374,7 +374,7 @@ StatusCode RpcLv1RawDataEfficiency::bookHistogramsRecurrent() rpclv1_sectorhits_A[iMuThreshold] = new TH2I(m_ss.str().c_str(), (m_ss.str() + ";LB;Sector").c_str() , 500, 0., 1500., 32, 32., 64.); sc = MG_SectorHits.regHist(rpclv1_sectorhits_A[iMuThreshold]); if( sc.isFailure()) { - msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endreq; + msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endmsg; return sc; } @@ -382,7 +382,7 @@ StatusCode RpcLv1RawDataEfficiency::bookHistogramsRecurrent() rpclv1_sectorhits_all[iMuThreshold] = new TH2I(m_ss.str().c_str(), (m_ss.str() + ";LB;Sector").c_str() , 500, 0., 1500., 64, 0., 64.); sc = MG_SectorHits.regHist(rpclv1_sectorhits_all[iMuThreshold]); if( sc.isFailure()) { - msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endreq; + msg(MSG::FATAL) << m_ss.str() << " Failed to register histogram!" << endmsg; return sc; } } @@ -398,13 +398,13 @@ StatusCode RpcLv1RawDataEfficiency::bookHistogramsRecurrent() //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::fillHistograms( ) { - msg(MSG::DEBUG) << "Filling histograms for RPCLv1RawDataEfficiency... " << endreq; + msg(MSG::DEBUG) << "Filling histograms for RPCLv1RawDataEfficiency... " << endmsg; StatusCode sc = StatusCode::SUCCESS; // Retreive and store trigger type for this event if (StoreTriggerType() != StatusCode::SUCCESS) - msg(MSG::ERROR) << "Cannot find StoreTriggerType! " << endreq; + msg(MSG::ERROR) << "Cannot find StoreTriggerType! " << endmsg; // == Filling the Histograms //--------------------Sector Hits--------------------------------- @@ -412,7 +412,7 @@ StatusCode RpcLv1RawDataEfficiency::fillHistograms( ) sc = (*m_activeStore) -> retrieve(sectorLogicContainer); if (sc.isFailure()) { - msg(MSG::INFO) << "Cannot retrieve the RpcSectorLogicContainer" << endreq; + msg(MSG::INFO) << "Cannot retrieve the RpcSectorLogicContainer" << endmsg; return sc; } else { @@ -451,7 +451,7 @@ StatusCode RpcLv1RawDataEfficiency::fillHistograms( ) //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::procHistograms() { - msg(MSG::INFO) << "RpcLv1RawDataEfficiency finalize()" << endreq; + msg(MSG::INFO) << "RpcLv1RawDataEfficiency finalize()" << endmsg; if(endOfEventsBlock){} // Process histograms per LumiBlock @@ -472,6 +472,6 @@ StatusCode RpcLv1RawDataEfficiency::procHistograms() //================================================================================================================================ StatusCode RpcLv1RawDataEfficiency::finalize() { - msg(MSG::INFO) << "RpcLv1RawDataEfficiency finalize()" << endreq; + msg(MSG::INFO) << "RpcLv1RawDataEfficiency finalize()" << endmsg; return StatusCode::SUCCESS; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx index 3f360588806..cbd40d01e3d 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataSectorLogic.cxx @@ -45,7 +45,7 @@ RpcLv1RawDataSectorLogic::RpcLv1RawDataSectorLogic( const std::string & type, //*********************************************************************************************************************** RpcLv1RawDataSectorLogic::~RpcLv1RawDataSectorLogic() { - m_log << MSG::INFO << " Deleting RpcLv1RawDataSectorLogic " << endreq; + m_log << MSG::INFO << " Deleting RpcLv1RawDataSectorLogic " << endmsg; } @@ -56,8 +56,8 @@ StatusCode RpcLv1RawDataSectorLogic::initialize() m_log.setLevel(outputLevel()); // individual outputLevel not known before initialize m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached - m_log << MSG::INFO << "In initializing 'RpcLv1RawDataSectorLogic': " << endreq; - m_log << MSG::INFO << "Package version = " << PACKAGE_VERSION << endreq; + m_log << MSG::INFO << "In initializing 'RpcLv1RawDataSectorLogic': " << endmsg; + m_log << MSG::INFO << "Package version = " << PACKAGE_VERSION << endmsg; StatusCode sc; @@ -90,14 +90,14 @@ StatusCode RpcLv1RawDataSectorLogic::initialize() // Store Gate store sc = serviceLocator() -> service("StoreGateSvc", m_eventStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get StoreGateSvc !" << endreq; + m_log << MSG::ERROR << " Cannot get StoreGateSvc !" << endmsg; return sc; } // Retrieve the active store sc = serviceLocator() -> service("ActiveStoreSvc", m_activeStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get ActiveStoreSvc !" << endreq; + m_log << MSG::ERROR << " Cannot get ActiveStoreSvc !" << endmsg; return sc; } @@ -105,7 +105,7 @@ StatusCode RpcLv1RawDataSectorLogic::initialize() StoreGateSvc* detStore = 0; sc = service("DetectorStore", detStore); if (sc.isFailure()) { - m_log << MSG::FATAL << "DetectorStore service not found !" << endreq; + m_log << MSG::FATAL << "DetectorStore service not found !" << endmsg; return StatusCode::FAILURE; } @@ -127,11 +127,11 @@ StatusCode RpcLv1RawDataSectorLogic::StoreTriggerType() StatusCode sc = StatusCode::SUCCESS; sc = m_eventStore -> retrieve(eventInfo); if (sc.isFailure()){ - m_log << MSG::ERROR << "Cannot find eventInfo " << endreq; + m_log << MSG::ERROR << "Cannot find eventInfo " << endmsg; return sc; } else if (m_debuglevel) - m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic::retrieved eventInfo" << endreq; + m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic::retrieved eventInfo" << endmsg; trigtype = eventInfo->level1TriggerType(); @@ -149,13 +149,13 @@ StatusCode RpcLv1RawDataSectorLogic::fillHistograms( ) m_environment == AthenaMonManager::online ) { if (m_debuglevel) - m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic::RPCLV1SectorLogic RawData Monitoring Histograms being filled" << endreq; + m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic::RPCLV1SectorLogic RawData Monitoring Histograms being filled" << endmsg; // Retreive and store trigger type for this event if (StoreTriggerType() != StatusCode::SUCCESS) - m_log << MSG::ERROR << "Cannot find StoreTriggerType !" << endreq; + m_log << MSG::ERROR << "Cannot find StoreTriggerType !" << endmsg; if (m_debuglevel) - m_log << MSG::DEBUG << "GetTriggerType(): "<< GetTriggerType() << endreq; + m_log << MSG::DEBUG << "GetTriggerType(): "<< GetTriggerType() << endmsg; // Path for Sector Logic Monitoring @@ -171,53 +171,53 @@ StatusCode RpcLv1RawDataSectorLogic::fillHistograms( ) // get histograms // per lumi block sc = rpclv1sl_lumi_block.getHist(rpclv1_TriggerHitsperEventperTriggerSector_LB,"SL_TriggerHits_per_Event_per_TriggerSector_LB"); - if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event_per_TriggerSector_LB: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event_per_TriggerSector_LB: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_lumi_block.getHist(rpclv1_Hits_per_TriggerSector_LB,"SL_Hits_per_TriggerSector_LB"); - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_Hits_per_TriggerSector_LB: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_Hits_per_TriggerSector_LB: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_lumi_block.getHist( rpclv1_triggerBCid_inout_LB, "SL_triggerBCid_inout_LB") ; - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_LB: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_LB: Histogram could not be associated to MonGroup." << endmsg; } // Overview sc = rpclv1sl_shift.getHist(rpclv1_TriggerHitsperEvent,"SL_TriggerHits_per_Event"); - if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerHitsperEventperTriggerSector,"SL_TriggerHits_per_Event_per_TriggerSector"); - if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event_per_TriggerSector: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure()) m_log << MSG::WARNING << "SL_TriggerHits_per_Event_per_TriggerSector: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_Hits_per_TriggerSector,"SL_Hits_per_TriggerSector"); - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_Hits_per_TriggerSector: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_Hits_per_TriggerSector: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_triggerBCid_inout,"SL_TriggerSector_vs_Tower_triggerBCid_inout"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_triggerBCid_inout: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_triggerBCid_inout: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad,"SL_TriggerSector_vs_Tower"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt1,"SL_TriggerSector_vs_Tower_Pt1"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt1: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt1: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt2,"SL_TriggerSector_vs_Tower_Pt2"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt2: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt2: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt3,"SL_TriggerSector_vs_Tower_Pt3"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt3: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt3: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt4,"SL_TriggerSector_vs_Tower_Pt4"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt4: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt4: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt5,"SL_TriggerSector_vs_Tower_Pt5"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt5: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt5: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_TriggerSector_vs_Pad_Pt6,"SL_TriggerSector_vs_Tower_Pt6"); - if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt6: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "rpclv1_TriggerSector_vs_Pad_Pt6: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist(rpclv1_triggerBCid_inout_vs_TriggerSector,"SL_triggerBCid_inout_vs_TriggerSector"); - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_vs_TriggerSector: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_vs_TriggerSector: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist( rpclv1_rowinBCid_vs_TriggerSector, "SL_rowinBCid_vs_TriggerSector") ; - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_rowinBCid_vs_TriggerSector: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_rowinBCid_vs_TriggerSector: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist( rpclv1_triggerBCid_inout_vs_Tower , "SL_triggerBCid_inout_vs_Tower") ; - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_vs_Tower: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout_vs_Tower: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist( rpclv1_ptid_vs_Tower, "SL_ptid_vs_Tower") ; - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_ptid_vs_Tower: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_ptid_vs_Tower: Histogram could not be associated to MonGroup." << endmsg; sc = rpclv1sl_shift.getHist( rpclv1_triggerBCid_inout, "SL_triggerBCid_inout") ; - if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout: Histogram could not be associated to MonGroup." << endreq; + if( sc.isFailure() ) m_log << MSG::WARNING << "SL_triggerBCid_inout: Histogram could not be associated to MonGroup." << endmsg; //--------------------------------------- @@ -230,7 +230,7 @@ StatusCode RpcLv1RawDataSectorLogic::fillHistograms( ) sc = (*m_activeStore) -> retrieve(sectorLogicContainer); if (sc.isFailure()) { - m_log << MSG::INFO << "Cannot retrieve the RpcSectorLogicContainer" << endreq; + m_log << MSG::INFO << "Cannot retrieve the RpcSectorLogicContainer" << endmsg; return StatusCode::SUCCESS; } else { @@ -395,7 +395,7 @@ StatusCode RpcLv1RawDataSectorLogic::fillHistograms( ) //*********************************************************************************************************************** StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() { - if (m_debuglevel) m_log << MSG::DEBUG << "Booking Histograms for RPC RawData Sector Logic Monitoring" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "Booking Histograms for RPC RawData Sector Logic Monitoring" << endmsg; StatusCode sc = StatusCode::SUCCESS; @@ -413,9 +413,9 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() if(newLumiBlock && m_lumiblockhist){ MonGroup rpclv1sl_lumi_block ( this, m_generic_path_rpclv1monitoring + "/lumiblock", lumiBlock, ATTRIB_UNMANAGED ) ; if (m_debuglevel) { - //m_log << MSG::DEBUG << "SHIFT : "<< shift << endreq; - m_log << MSG::DEBUG << "RUN : " << run << endreq; - m_log << MSG::DEBUG << "LumiBlock : " << lumiBlock << endreq; + //m_log << MSG::DEBUG << "SHIFT : "<< shift << endmsg; + m_log << MSG::DEBUG << "RUN : " << run << endmsg; + m_log << MSG::DEBUG << "LumiBlock : " << lumiBlock << endmsg; } //_____________________________________________________________________ @@ -428,14 +428,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_lumi_block.regHist(rpclv1_Hits_per_TriggerSector_LB); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_LB_stat Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_LB_stat Failed to register histogram " << endmsg; return sc; } rpclv1_Hits_per_TriggerSector_LB -> SetFillColor(9); rpclv1_Hits_per_TriggerSector_LB -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_Hits_per_TriggerSector_LB -> GetYaxis() -> SetTitle("Counts per trigger sector"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_Hits_per_TriggerSector_LB << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_Hits_per_TriggerSector_LB << endmsg; @@ -449,14 +449,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_lumi_block.regHist(rpclv1_TriggerHitsperEventperTriggerSector_LB) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerHitsperEventperTriggerSector_LB: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerHitsperEventperTriggerSector_LB: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerHitsperEventperTriggerSector_LB -> SetOption("COLZ"); rpclv1_TriggerHitsperEventperTriggerSector_LB -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_TriggerHitsperEventperTriggerSector_LB -> GetYaxis() -> SetTitle("RPC trigger hits / event"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEventperTriggerSector_LB << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEventperTriggerSector_LB << endmsg; //_____________________________________________________________________ @@ -469,14 +469,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_lumi_block.regHist(rpclv1_triggerBCid_inout_LB); if(sc.isFailure()){ - m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_LB Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_LB Failed to register histogram " << endmsg; return sc; } rpclv1_triggerBCid_inout_LB -> SetFillColor(9); rpclv1_triggerBCid_inout_LB -> GetXaxis() -> SetTitle("triggerBCid (in - out)"); rpclv1_triggerBCid_inout_LB -> GetYaxis() -> SetTitle("Counts"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_LB << m_rpclv1_triggerBCid_inout_LB_title.c_str() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_LB << m_rpclv1_triggerBCid_inout_LB_title.c_str() << endmsg; }// isNewLumiBlock @@ -485,8 +485,8 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() if(newRun) { if (m_debuglevel) { - //m_log << MSG::DEBUG << "SHIFT : "<< shift << endreq; - m_log << MSG::DEBUG << "RUN : " << run << endreq; + //m_log << MSG::DEBUG << "SHIFT : "<< shift << endmsg; + m_log << MSG::DEBUG << "RUN : " << run << endmsg; } //_____________________________________________________________________ @@ -498,14 +498,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist( rpclv1_rowinBCid_vs_TriggerSector ); if(sc.isFailure()){ - m_log << MSG::FATAL << "rpclv1_BCid_vs_TriggerSector Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_BCid_vs_TriggerSector Failed to register histogram " << endmsg; return sc; } rpclv1_rowinBCid_vs_TriggerSector -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_rowinBCid_vs_TriggerSector -> GetYaxis() -> SetTitle("rowinBCid"); rpclv1_rowinBCid_vs_TriggerSector -> SetOption("COLZ"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_rowinBCid_vs_TriggerSector << m_rpclv1_rowinBCid_vs_TriggerSector_title.c_str() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_rowinBCid_vs_TriggerSector << m_rpclv1_rowinBCid_vs_TriggerSector_title.c_str() << endmsg; @@ -519,14 +519,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist( rpclv1_triggerBCid_inout_vs_Tower ); if(sc.isFailure()){ - m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_vs_Tower Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_vs_Tower Failed to register histogram " << endmsg; return sc; } rpclv1_triggerBCid_inout_vs_Tower -> GetXaxis() -> SetTitle("Tower"); rpclv1_triggerBCid_inout_vs_Tower -> GetYaxis() -> SetTitle("triggerBCid (in - out)"); rpclv1_triggerBCid_inout_vs_Tower -> SetOption("COLZ"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_vs_Tower << m_rpclv1_triggerBCid_inout_vs_Tower_title.c_str() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_vs_Tower << m_rpclv1_triggerBCid_inout_vs_Tower_title.c_str() << endmsg; @@ -540,14 +540,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_Hits_per_TriggerSector); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_stat Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_stat Failed to register histogram " << endmsg; return sc; } rpclv1_Hits_per_TriggerSector -> SetFillColor(9); rpclv1_Hits_per_TriggerSector -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_Hits_per_TriggerSector -> GetYaxis() -> SetTitle("Counts per trigger sector"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_Hits_per_TriggerSector << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_Hits_per_TriggerSector << endmsg; //_____________________________________________________________________ // Trigger hits per event @@ -559,14 +559,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerHitsperEvent) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerHitsperEvent: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerHitsperEvent: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerHitsperEvent -> SetFillColor(9); rpclv1_TriggerHitsperEvent -> GetXaxis() -> SetTitle("RPC trigger hits / event"); rpclv1_TriggerHitsperEvent -> GetYaxis() -> SetTitle("Counts"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEvent << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEvent << endmsg; @@ -580,14 +580,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerHitsperEventperTriggerSector) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerHitsperEventperTriggerSector: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerHitsperEventperTriggerSector: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerHitsperEventperTriggerSector -> SetOption("COLZ"); rpclv1_TriggerHitsperEventperTriggerSector -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_TriggerHitsperEventperTriggerSector -> GetYaxis() -> SetTitle("RPC trigger hits / event"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEventperTriggerSector << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerHitsperEventperTriggerSector << endmsg; //_____________________________________________________________________ @@ -600,14 +600,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_triggerBCid_inout); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> SetOption("COLZ"); rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> GetXaxis() -> SetTitle("Tower"); rpclv1_TriggerSector_vs_Pad_triggerBCid_inout -> GetYaxis() -> SetTitle("RPC trigger sector"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerSector_vs_Pad_triggerBCid_inout << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerSector_vs_Pad_triggerBCid_inout << endmsg; //_____________________________________________________________________ //TriggerSector_vs_Tower @@ -619,14 +619,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad -> SetOption("COLZ"); rpclv1_TriggerSector_vs_Pad -> GetXaxis() -> SetTitle("Tower"); rpclv1_TriggerSector_vs_Pad -> GetYaxis() -> SetTitle("RPC trigger sector"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerSector_vs_Pad << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_TriggerSector_vs_Pad << endmsg; //_____________________________________________________________________ //TriggerSector_vs_Tower_Pt1 @@ -637,7 +637,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt1); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt1: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt1: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt1 -> SetOption("COLZ"); @@ -652,7 +652,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt2); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt2: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt2: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt2 -> SetOption("COLZ"); @@ -667,7 +667,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt3); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt3: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt3: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt3 -> SetOption("COLZ"); @@ -682,7 +682,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt4); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt4: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt4: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt4 -> SetOption("COLZ"); @@ -697,7 +697,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt5); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt5: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt5: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt5 -> SetOption("COLZ"); @@ -712,7 +712,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_TriggerSector_vs_Pad_Pt6); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt6: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_TriggerSector_vs_Pad_Pt6: Histogram registration failed. " << endmsg; return sc; } rpclv1_TriggerSector_vs_Pad_Pt6 -> SetOption("COLZ"); @@ -731,14 +731,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_triggerBCid_inout_vs_TriggerSector); if (sc.isFailure()) { - m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_vs_TriggerSector: Histogram registration failed. " << endreq; + m_log << MSG::FATAL << "rpclv1_triggerBCid_inout_vs_TriggerSector: Histogram registration failed. " << endmsg; return sc; } rpclv1_triggerBCid_inout_vs_TriggerSector -> SetOption("COLZ"); rpclv1_triggerBCid_inout_vs_TriggerSector -> GetXaxis() -> SetTitle("RPC trigger sector"); rpclv1_triggerBCid_inout_vs_TriggerSector -> GetYaxis() -> SetTitle("triggerBCid (in - out)"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_vs_TriggerSector << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout_vs_TriggerSector << endmsg; @@ -752,14 +752,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_ptid_vs_Tower); if(sc.isFailure()){ - m_log << MSG::FATAL << "rpclv1_ptid_vs_Tower Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_ptid_vs_Tower Failed to register histogram " << endmsg; return sc; } rpclv1_ptid_vs_Tower -> SetOption("COLZ"); rpclv1_ptid_vs_Tower -> GetXaxis() -> SetTitle("Tower"); rpclv1_ptid_vs_Tower -> GetYaxis() -> SetTitle("Threshold"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_ptid_vs_Tower << m_rpclv1_ptid_vs_Tower_title.c_str() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_ptid_vs_Tower << m_rpclv1_ptid_vs_Tower_title.c_str() << endmsg; //_____________________________________________________________________ @@ -772,14 +772,14 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() sc = rpclv1sl_shift.regHist(rpclv1_triggerBCid_inout); if(sc.isFailure()){ - m_log << MSG::FATAL << "rpclv1_triggerBCid_inout Failed to register histogram " << endreq; + m_log << MSG::FATAL << "rpclv1_triggerBCid_inout Failed to register histogram " << endmsg; return sc; } rpclv1_triggerBCid_inout -> SetFillColor(9); rpclv1_triggerBCid_inout -> GetXaxis() -> SetTitle("triggerBCid (in - out)"); rpclv1_triggerBCid_inout -> GetYaxis() -> SetTitle("Counts"); - if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout << m_rpclv1_triggerBCid_inout_title.c_str() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "INSIDE bookHistograms successfully: " << rpclv1_triggerBCid_inout << m_rpclv1_triggerBCid_inout_title.c_str() << endmsg; @@ -797,7 +797,7 @@ StatusCode RpcLv1RawDataSectorLogic::bookHistogramsRecurrent() StatusCode RpcLv1RawDataSectorLogic::procHistograms() { - if (m_debuglevel) m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic finalize()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic finalize()" << endmsg; if(endOfEventsBlock){} if(endOfLumiBlock){} if(endOfRun){} @@ -808,7 +808,7 @@ StatusCode RpcLv1RawDataSectorLogic::procHistograms() //*********************************************************************************************************************** StatusCode RpcLv1RawDataSectorLogic::finalize() { - if (m_debuglevel) m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic finalize()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "RpcLv1RawDataSectorLogic finalize()" << endmsg; return StatusCode::SUCCESS; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx index 1dd8bba828e..fe53f918c3d 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg.cxx @@ -190,7 +190,7 @@ TgcLv1RawDataValAlg::TgcLv1RawDataValAlg(const std::string &type, const std::str // TgcLv1RawDataValAlg Destructor /////////////////////////////////////////////////////////////////////////// TgcLv1RawDataValAlg::~TgcLv1RawDataValAlg(){ - m_log << MSG::INFO << " deleting TgcLv1RawDataValAlg " << endreq; + m_log << MSG::INFO << " deleting TgcLv1RawDataValAlg " << endmsg; } @@ -204,7 +204,7 @@ TgcLv1RawDataValAlg::initialize(){ //m_log.setLevel(MSG::DEBUG); // individual outputlevel not known before initialise m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached - m_log << MSG::INFO << "in TgcLv1RawDataValAlg initialize" << endreq; + m_log << MSG::INFO << "in TgcLv1RawDataValAlg initialize" << endmsg; StatusCode sc; @@ -212,7 +212,7 @@ TgcLv1RawDataValAlg::initialize(){ // Store Gate store sc = serviceLocator()->service("StoreGateSvc", m_eventStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endreq; + m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endmsg; return sc ; } */ @@ -220,7 +220,7 @@ TgcLv1RawDataValAlg::initialize(){ // Retrieve the Active Store sc = serviceLocator()->service("ActiveStoreSvc", m_activeStore); if(sc != StatusCode::SUCCESS ){ - m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endreq; + m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endmsg; return sc ; } @@ -228,22 +228,22 @@ TgcLv1RawDataValAlg::initialize(){ StoreGateSvc* detStore = 0; sc = service("DetectorStore", detStore); if(sc.isFailure()){ - m_log << MSG::FATAL << "DetectorStore service not found !" << endreq; + m_log << MSG::FATAL << "DetectorStore service not found !" << endmsg; return StatusCode::FAILURE; } // Retrieve the MuonDetectorManager sc = detStore->retrieve(m_muonMgr); if(sc.isFailure()){ - m_log << MSG::FATAL << "Cannot get MuonDetectorManager from detector store" << endreq; + m_log << MSG::FATAL << "Cannot get MuonDetectorManager from detector store" << endmsg; return StatusCode::FAILURE; }else{ - if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endmsg; } sc = detStore->retrieve(m_tgcIdHelper,"TGCIDHELPER"); if(sc.isFailure()){ - m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endreq; + m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endmsg; return sc; } @@ -253,13 +253,13 @@ TgcLv1RawDataValAlg::initialize(){ const ITGCcablingServerSvc* TgcCabGet = 0; sc = service("TGCcablingServerSvc", TgcCabGet); if (sc.isFailure()){ - m_log << MSG::ERROR << " Can't get TGCcablingServerSvc " << endreq; + m_log << MSG::ERROR << " Can't get TGCcablingServerSvc " << endmsg; return StatusCode::FAILURE; } // get Cabling Service sc = TgcCabGet->giveCabling(m_cabling); if (sc.isFailure()){ - m_log << MSG::ERROR << " Can't get TGCcablingSvc Server" << endreq; + m_log << MSG::ERROR << " Can't get TGCcablingSvc Server" << endmsg; return StatusCode::FAILURE; } @@ -267,9 +267,9 @@ TgcLv1RawDataValAlg::initialize(){ int maxRodId,maxSswId, maxSbloc,minChannelId, maxChannelId; m_cabling->getReadoutIDRanges( maxRodId,maxSswId, maxSbloc,minChannelId, maxChannelId); if (maxRodId ==12) { - m_log << MSG::INFO << "TGCcabling12Svc OK" << endreq ; + m_log << MSG::INFO << "TGCcabling12Svc OK" << endmsg ; } else { - m_log << MSG::WARNING << "TGCcablingSvc(octant segmentation) OK" << endreq ; + m_log << MSG::WARNING << "TGCcablingSvc(octant segmentation) OK" << endmsg ; } } @@ -290,14 +290,14 @@ TgcLv1RawDataValAlg::initialize(){ /////////////////////////////////////////////////////////////////////////// StatusCode TgcLv1RawDataValAlg::bookHistogramsRecurrent(){ - if (m_debuglevel) m_log << MSG::DEBUG << "TGCLV1 RawData Monitoring Histograms being booked" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TGCLV1 RawData Monitoring Histograms being booked" << endmsg; // Book histograms per 10LBs if( newRun || newLowStatInterval ){ // not monitor these profiles at GM if( m_environment != AthenaMonManager::online ){ if( ( bookHistogramsLowStat() ).isFailure() ){ - m_log << MSG::FATAL << "bookLowStatHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookLowStatHisto() Failed " << endmsg; return StatusCode::FAILURE; } } @@ -317,25 +317,25 @@ TgcLv1RawDataValAlg::bookHistogramsRecurrent(){ if(newRun){ // Book Number Of Trigger And Profile histograms if((bookHistogramsNumberOfTriggersAndProfile()).isFailure()){ - m_log << MSG::FATAL << "bookNumberOfTriggersAndProfileHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookNumberOfTriggersAndProfileHisto() Failed " << endmsg; return StatusCode::FAILURE; } // Book Number Of Trigger Rate histograms if((bookHistogramsTriggerRate()).isFailure()){ - m_log << MSG::FATAL << "bookTriggerRateHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookTriggerRateHisto() Failed " << endmsg; return StatusCode::FAILURE; } // Book Timing histograms if((bookHistogramsTiming()).isFailure()){ - m_log << MSG::FATAL << "bookTimingHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookTimingHisto() Failed " << endmsg; return StatusCode::FAILURE; } // Book Turn-on curves and efficiency maps if((bookHistogramsEfficiency()).isFailure()){ - m_log << MSG::FATAL << "bookEfficiencyHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookEfficiencyHisto() Failed " << endmsg; return StatusCode::FAILURE; } @@ -343,7 +343,7 @@ TgcLv1RawDataValAlg::bookHistogramsRecurrent(){ if( m_environment != AthenaMonManager::online ){ // Book Coincidence Windows if((bookHistogramsCoincidenceWindow()).isFailure()){ - m_log << MSG::FATAL << "bookCoincidenceWindowHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookCoincidenceWindowHisto() Failed " << endmsg; return StatusCode::FAILURE; } } @@ -360,12 +360,12 @@ TgcLv1RawDataValAlg::bookHistogramsRecurrent(){ // Book Summary histograms if( ( bookHistogramsSummary() ).isFailure() ){ - m_log << MSG::FATAL << "bookSummaryHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookSummaryHisto() Failed " << endmsg; return StatusCode::FAILURE; } }// newRun - m_log << MSG::INFO << "TGCLV1 RawData Monitoring : histo booked " << endreq; + m_log << MSG::INFO << "TGCLV1 RawData Monitoring : histo booked " << endmsg; return StatusCode::SUCCESS; }// EOF @@ -377,7 +377,7 @@ TgcLv1RawDataValAlg::bookHistogramsRecurrent(){ StatusCode TgcLv1RawDataValAlg::fillHistograms(){ StatusCode sc = StatusCode::SUCCESS; - if (m_debuglevel) m_log << MSG::DEBUG << "TgcLv1RawDataValAlg::TGCLV1 RawData Monitoring Histograms being filled" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TgcLv1RawDataValAlg::TGCLV1 RawData Monitoring Histograms being filled" << endmsg; /////////////////////////////////////////////////////////////////////////// // Get Event Data @@ -385,7 +385,7 @@ TgcLv1RawDataValAlg::fillHistograms(){ // Read Event Info sc=readEventInfo(); if( sc.isFailure() ){ - m_log << MSG::WARNING << "no event info container" << endreq; + m_log << MSG::WARNING << "no event info container" << endmsg; } // Read L1 Trigger Data sc = readL1TriggerType(); @@ -400,26 +400,26 @@ TgcLv1RawDataValAlg::fillHistograms(){ // Previous sc = (*m_activeStore)->retrieve(tgc_previous_coin_container, m_coinCollectionLocationPrevious); if (sc.isFailure() || 0 == tgc_previous_coin_container ) { - m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for previous BC" << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for previous BC" << endmsg; return sc; } - if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc previous coin container size() : " << tgc_previous_coin_container->size() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc previous coin container size() : " << tgc_previous_coin_container->size() << endmsg; // Current sc = (*m_activeStore)->retrieve(tgc_current_coin_container, m_coinCollectionLocation); if (sc.isFailure() || 0 == tgc_current_coin_container ) { - m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for current BC" << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for current BC" << endmsg; return sc; } - if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc current coin container size() : " << tgc_current_coin_container->size() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc current coin container size() : " << tgc_current_coin_container->size() << endmsg; // Next sc = (*m_activeStore)->retrieve(tgc_next_coin_container, m_coinCollectionLocationNext); if (sc.isFailure() || 0 == tgc_next_coin_container ) { - m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for next BC" << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer for next BC" << endmsg; return sc; } - if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc next coin container size() : " << tgc_next_coin_container->size() << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "****** tgc next coin container size() : " << tgc_next_coin_container->size() << endmsg; /////////////////////////////////////////////////////////////////////////// @@ -427,7 +427,7 @@ TgcLv1RawDataValAlg::fillHistograms(){ ///////////////////////////////////// // Read Offline Muon Containers if(readOfflineMuonContainer( "Muons", &m_muid_pt, &m_muid_eta, &m_muid_phi, &m_muid_q).isFailure()){ - m_log << MSG::ERROR << " fillOfflineMuon failed" << endreq; + m_log << MSG::ERROR << " fillOfflineMuon failed" << endmsg; return StatusCode::FAILURE; } @@ -469,7 +469,7 @@ TgcLv1RawDataValAlg::fillHistograms(){ /* int numberOfSL=m_nSL[0]+m_nSL[1]+m_nSL[2]; // check hit Timing if single RoI - if (m_debuglevel) m_log << MSG::DEBUG << "number of SL " << numberOfSL << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "number of SL " << numberOfSL << endmsg; if(numberOfSL!=1) return StatusCode::SUCCESS;//not single RoI */ @@ -482,7 +482,7 @@ TgcLv1RawDataValAlg::fillHistograms(){ /////////////////////////////////////////////////////////////////////////// StatusCode TgcLv1RawDataValAlg::procHistograms(){ - if (m_debuglevel) m_log << MSG::DEBUG << "TgcLv1RawDataValAlg finalize()" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TgcLv1RawDataValAlg finalize()" << endmsg; // Process histograms per LumiBlock if(endOfLumiBlock){ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx index aae89a92161..c3218df9843 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_CoincidenceWindow.cxx @@ -84,7 +84,7 @@ TgcLv1RawDataValAlg::bookHistogramsCoincidenceWindow(){ ss.str(""); ss << "CW_Mod"<< mod << "_RoI" << roi << "_PT"<< pt+1 << "_" << side[ac] ; tgclv1cw[ac][mod][pt] = new TH2F(ss.str().c_str(), (ss.str() + ";d#phi;dR").c_str(), 15, -7, 8, 31, -15, 16); if( ( tgclv1_cw_ac[ac]->regHist(tgclv1cw[ac][mod][pt]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Coincidence Window for SL triggers compared with Offline Muons @@ -93,7 +93,7 @@ TgcLv1RawDataValAlg::bookHistogramsCoincidenceWindow(){ ss.str(""); ss << "CW_Mod"<< mod << "_RoI" << roi << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] ; tgclv1cwoffline[ac][mod][pt][m] = new TH2F(ss.str().c_str(), (ss.str() + ";d#phi;dR").c_str(), 15, -7, 8, 31, -15, 16); if( ( tgclv1_cw_ac[ac]->regHist(tgclv1cwoffline[ac][mod][pt][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -101,7 +101,7 @@ TgcLv1RawDataValAlg::bookHistogramsCoincidenceWindow(){ ss.str(""); ss << "!CW_Mod"<< mod << "_RoI" << roi << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] ; tgclv1cwrejectedoffline[ac][mod][pt][m] = new TH2F(ss.str().c_str(), (ss.str() + ";d#phi;dR").c_str(), 15, -7, 8, 31, -15, 16); if( ( tgclv1_cw_ac[ac]->regHist(tgclv1cwrejectedoffline[ac][mod][pt][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// muon algorithm diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx index 4cd31333f6f..7afa530c02a 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Efficiency.cxx @@ -117,11 +117,11 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ for(int m=0;m<m_nMuonAlgorithms;m++){// Typically Muid (and Staco) //DeltaR ss.str(""); ss << "DeltaR_BTW_Track_And_Trigger_PT"<<pt+1 << "_" << muid[m] << "_" << side[ac] ; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1deltar[ac][pt][m] = new TH1F(ss.str().c_str(), (ss.str() + ";DeltaR;Entries").c_str() , 200, -1., 1.); if( ( tgclv1_turnon_numdenom_ac[ac]->regHist(tgclv1deltar[ac][pt][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -130,11 +130,11 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ // Turn on Curve // Efficiency ss.str(""); ss << "Trigger_Turn_On_Curve" << spna[pna] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] ; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnon[ac][pt][pna][m] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Efficiency").c_str(), pt_nbins, pt_bins); tgclv1turnon[ac][pt][pna][m]->Sumw2(); if( ( tgclv1_turnon_ac[ac]->regHist(tgclv1turnon[ac][pt][pna][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Efficiency Fit Graph @@ -143,27 +143,27 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1turnontg[ac][pt][pna][m]->SetTitle( (ss.str() + ";p_{T} GeV/c;Efficiency").c_str() ); tgclv1turnontg[ac][pt][pna][m]->SetMarkerStyle(22); if( ( tgclv1_turnon_ac[ac]->regGraph(tgclv1turnontg[ac][pt][pna][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Numerator ss.str(""); ss << "Trigger_Turn_On_Curve" << spna[pna] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] << "_Numerator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnonnum[ac][pt][pna][m] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Entries").c_str(), pt_nbins, pt_bins); tgclv1turnonnum[ac][pt][pna][m]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac[ac]->regHist(tgclv1turnonnum[ac][pt][pna][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Denominator ss.str(""); ss << "Trigger_Turn_On_Curve" << spna[pna] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] << "_Denominator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnondenom[ac][pt][pna][m] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Entries").c_str(), pt_nbins, pt_bins); tgclv1turnondenom[ac][pt][pna][m]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac[ac]->regHist(tgclv1turnondenom[ac][pt][pna][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -172,36 +172,36 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ for( int pcn = 0 ; pcn < 3 ; pcn++ ){// Prev/Curr/Next // Efficiency ss.str(""); ss << "Trigger_Efficiency" << spna[pna] << spcn[pcn] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] ; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1effetavsphi[ac][pt][pna][m][pcn] = new TH2F(ss.str().c_str(), (ss.str() + ";eta;phi").c_str(), 28, 1.0, 2.4, 48, -CLHEP::pi/12, 23*CLHEP::pi/12 ); tgclv1effetavsphi[ac][pt][pna][m][pcn]->Sumw2(); if( ( tgclv1_turnon_ac[ac]->regHist(tgclv1effetavsphi[ac][pt][pna][m][pcn]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1effetavsphi[ac][pt][pna][m][pcn]->SetMaximum(1.0); // Numerator ss.str(""); ss << "Trigger_Efficiency" << spna[pna] << spcn[pcn] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] << "_Numerator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1effetavsphinum[ac][pt][pna][m][pcn] = new TH2F(ss.str().c_str(), (ss.str() + ";eta;phi").c_str(), 28, 1.0, 2.4, 48, -CLHEP::pi/12, 23*CLHEP::pi/12 ); tgclv1effetavsphinum[ac][pt][pna][m][pcn]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac[ac]->regHist(tgclv1effetavsphinum[ac][pt][pna][m][pcn]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }//pcn // Denominator ss.str(""); ss << "Trigger_Efficiency" << spna[pna] << "_PT"<< pt+1 << "_" << muid[m] << "_" << side[ac] << "_Denominator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1effetavsphidenom[ac][pt][pna][m] = new TH2F(ss.str().c_str(), (ss.str() + ";eta;phi").c_str(), 28, 1.0, 2.4, 48, -CLHEP::pi/12, 23*CLHEP::pi/12 ); tgclv1effetavsphidenom[ac][pt][pna][m]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac[ac]->regHist(tgclv1effetavsphidenom[ac][pt][pna][m]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -219,11 +219,11 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ for(int pt=0;pt<6;pt++){ // Efficiency ss.str(""); ss << "ES_Trigger_Turn_On_Curve" << "_PT"<< pt+1 << "_" << side[ac] ; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnon_ES[ac][pt] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Efficiency").c_str(), pt_nbins, pt_bins); tgclv1turnon_ES[ac][pt]->Sumw2(); if( ( tgclv1_turnon_ac_ES[ac]->regHist(tgclv1turnon_ES[ac][pt]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Efficiency Fit Graph @@ -232,27 +232,27 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1turnontg_ES[ac][pt]->SetTitle( (ss.str() + ";p_{T} GeV/c;Efficiency").c_str() ); tgclv1turnontg_ES[ac][pt]->SetMarkerStyle(22); if( ( tgclv1_turnon_ac_ES[ac]->regGraph(tgclv1turnontg_ES[ac][pt]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Numerator ss.str(""); ss << "ES_Trigger_Turn_On_Curve" << "_PT"<< pt+1 << "_" << side[ac] << "_Numerator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnonnum_ES[ac][pt] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Entries").c_str(), pt_nbins, pt_bins); tgclv1turnonnum_ES[ac][pt]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac_ES[ac]->regHist(tgclv1turnonnum_ES[ac][pt]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } // Denominator ss.str(""); ss << "ES_Trigger_Turn_On_Curve" << "_PT"<< pt+1 << "_" << side[ac] << "_Denominator"; - m_log << MSG::DEBUG << ss.str() << endreq; + m_log << MSG::DEBUG << ss.str() << endmsg; tgclv1turnondenom_ES[ac][pt] = new TH1F(ss.str().c_str(), (ss.str() + ";p_{T} GeV/c;Entries").c_str(), pt_nbins, pt_bins); tgclv1turnondenom_ES[ac][pt]->Sumw2(); if( ( tgclv1_turnon_numdenom_ac_ES[ac]->regHist(tgclv1turnondenom_ES[ac][pt]) ).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -267,7 +267,7 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1_plateau_eff_counting_ES[ac] ->SetMinimum(0.7); tgclv1_plateau_eff_counting_ES[ac] ->SetMaximum(1.05); if( ( tgclv1_turnon_ac_ES[ac]->regHist( tgclv1_plateau_eff_counting_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -276,7 +276,7 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1_plateau_eff_counting_num_ES[ac] = new TH1F(ss.str().c_str(), (ss.str() + ";PT;efficiency").c_str(), 6, 0, 6 ); tgclv1_plateau_eff_counting_num_ES[ac] ->Sumw2(); if( ( tgclv1_turnon_numdenom_ac_ES[ac]->regHist( tgclv1_plateau_eff_counting_num_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -285,7 +285,7 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1_plateau_eff_counting_denom_ES[ac] = new TH1F(ss.str().c_str(), (ss.str() + ";PT;efficiency").c_str(), 6, 0, 6 ); tgclv1_plateau_eff_counting_denom_ES[ac] ->Sumw2(); if( ( tgclv1_turnon_numdenom_ac_ES[ac]->regHist( tgclv1_plateau_eff_counting_denom_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -296,7 +296,7 @@ TgcLv1RawDataValAlg::bookHistogramsEfficiency(){ tgclv1_plateau_eff_counting_ES_GM[ac] ->SetMinimum(0.7); tgclv1_plateau_eff_counting_ES_GM[ac] ->SetMaximum(1.05); if( ( tgclv1_turnon_ac_ES_GM[ac]->regHist( tgclv1_plateau_eff_counting_ES_GM[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -324,7 +324,7 @@ void TgcLv1RawDataValAlg::fillEfficiency(int ms,// 0:Muid 1:Staco vector<float>* mu_pt, vector<float>* mu_eta, vector<float>* mu_phi,vector<float>* mu_q){ - if(m_debuglevel ) m_log << "inside fillEfficiency" << endreq; + if(m_debuglevel ) m_log << "inside fillEfficiency" << endmsg; int osize = mu_pt->size(); float deltarcutpt1 = 0.5; float deltarcut = 0.25; @@ -501,7 +501,7 @@ TgcLv1RawDataValAlg::fillEfficiency(int ms,// 0:Muid 1:Staco isForwardlpts != slisForward || phi48lpts != slphi48 ) continue ; - if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endreq; + if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endmsg; tgclv1lpttimingtrack[ac][ms]->Fill(pcn); if( slpt > 1 ) tgclv1lpttimingptcuttrack[ac][ms]->Fill(pcn); @@ -517,5 +517,5 @@ TgcLv1RawDataValAlg::fillEfficiency(int ms,// 0:Muid 1:Staco }//offline muid - if(m_debuglevel ) m_log << "finish fillEfficiency" << endreq; + if(m_debuglevel ) m_log << "finish fillEfficiency" << endmsg; }// EOF fillEfficiency diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx index 8bc670c4c59..428b55dde23 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_NumberOfTrigger.cxx @@ -86,14 +86,14 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "LB_VS_LPT_Wire_Trigger_Sector_" << side[ac] ; tgclv1lptwireinlbvssect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;").c_str(), 1250, 1, 2501, 72, 1, 73 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1lptwireinlbvssect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } // Lpt strip triggers per sector, per lumi block ss.str(""); ss << "LB_VS_LPT_Strip_Trigger_Sector_" << side[ac] ; tgclv1lptstripinlbvssect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;").c_str(), 1250, 1, 2501, 72, 1, 73 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1lptstripinlbvssect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -102,13 +102,13 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "EIFI_Sector_VS_Bit_" << side[ac] ; tgclv1hptstripinlbvssecteifisect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; Trigger_Sector;Bit").c_str(), 48, 1, 49, 8, 0, 8 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1hptstripinlbvssecteifisect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } ss.str(""); ss << "EIFI_Lumi_VS_Bit_" << side[ac] ; tgclv1hptstripinlbvssecteifilumi[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;Bit").c_str(), 1250, 1, 2501, 8, 0, 8 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1hptstripinlbvssecteifilumi[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -116,7 +116,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "LB_VS_HPT_Wire_Trigger_Sector_" << side[ac] ; tgclv1hptwireinlbvssect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;").c_str(), 1250, 1, 2501, 72, 1, 73 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1hptwireinlbvssect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -124,7 +124,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "LB_VS_HPT_Strip_Trigger_Sector_" << side[ac] ; tgclv1hptstripinlbvssect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;").c_str(), 1250, 1, 2501, 72, 1, 73 ); if( ( tgclv1_expert_ac[ac]->regHist( tgclv1hptstripinlbvssect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -132,7 +132,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "LB_VS_SL_Trigger_Sector_" << side[ac] ; tgclv1slinlbvssect[ac] = new TH2F( ss.str().c_str(), (ss.str() + "; LB;").c_str(), 1250, 1, 2501, 72, 1, 73 ); if( ( tgclv1_shift_ac[ac]->regHist( tgclv1slinlbvssect[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -181,7 +181,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(pcnt>2) sc=tgclv1_shift.regHist(tgclv1numberoflptwire[pcnt]) ; else sc=tgclv1_expert.regHist(tgclv1numberoflptwire[pcnt]) ; if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1numberoflptwire Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1numberoflptwire Failed to register histogram " << endmsg; return sc; } tgclv1numberoflptwire[pcnt]->GetXaxis()->SetTitle("Low Pt Wire Triggers"); @@ -193,7 +193,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(pcnt>2) sc=tgclv1_shift.regHist(tgclv1numberoflptstrip[pcnt]) ; else sc=tgclv1_expert.regHist(tgclv1numberoflptstrip[pcnt]) ; if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1numberoflptstrip Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1numberoflptstrip Failed to register histogram " << endmsg; return sc; } tgclv1numberoflptstrip[pcnt]->GetXaxis()->SetTitle("Low Pt Strip Triggers"); @@ -205,7 +205,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(pcnt>2) sc=tgclv1_shift.regHist(tgclv1numberofhptwire[pcnt]) ; else sc=tgclv1_expert.regHist(tgclv1numberofhptwire[pcnt]) ; if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1numberofhptwire Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1numberofhptwire Failed to register histogram " << endmsg; return sc; } tgclv1numberofhptwire[pcnt]->GetXaxis()->SetTitle("High Pt Wire Triggers"); @@ -217,7 +217,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(pcnt>2) sc=tgclv1_shift.regHist(tgclv1numberofhptstrip[pcnt]) ; else sc=tgclv1_expert.regHist(tgclv1numberofhptstrip[pcnt]) ; if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1numberofhptstrip Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1numberofhptstrip Failed to register histogram " << endmsg; return sc; } tgclv1numberofhptstrip[pcnt]->GetXaxis()->SetTitle("High Pt Strip Triggers"); @@ -229,7 +229,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(pcnt>2) sc=tgclv1_shift.regHist(tgclv1numberofsl[pcnt]) ; else sc=tgclv1_expert.regHist(tgclv1numberofsl[pcnt]) ; if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1numberofsl Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1numberofsl Failed to register histogram " << endmsg; return sc; } tgclv1numberofsl[pcnt]->GetXaxis()->SetTitle("Sector Logic Triggers"); @@ -252,7 +252,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ m_log << MSG::DEBUG << ss.str().c_str() << std::endl; tgclv1roietavsphiAll =new TH2F(ss.str().c_str(), (ss.str() + ";C-side: Eta < 0, A-side: Eta > 0").c_str(), 55, -55, 55, 48, 0, 48); if( (tgclv1_shift.regHist(tgclv1roietavsphiAll)).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -262,7 +262,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ m_log << MSG::DEBUG << ss.str().c_str() << std::endl; tgclv1roietavsphiptAll[ipt] =new TH2F(ss.str().c_str(), (ss.str() + ";C-side: Eta < 0, A-side: Eta > 0").c_str(), 55, -55, 55, 48, 0, 48); if( (tgclv1_shift.regHist(tgclv1roietavsphiptAll[ipt])).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// pt @@ -292,7 +292,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0) sc=tgclv1_shift_a.regHist(tgclv1pt[ac]); else sc=tgclv1_shift_c.regHist(tgclv1pt[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1pt Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1pt Failed to register histogram " << endmsg; return sc; } tgclv1pt[ac]->GetXaxis()->SetTitle("Pt Threshold"); @@ -309,7 +309,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ m_log << MSG::DEBUG << ss.str().c_str() << std::endl; tgclv1roietavsphi[ac] =new TH2F(ss.str().c_str(), (ss.str() + ";Eta").c_str(), 53, 0, 53, 192, 0, 48); if( (tgclv1_shift_ac[ac]->regHist(tgclv1roietavsphi[ac])).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -319,7 +319,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ m_log << MSG::DEBUG << ss.str().c_str() << std::endl; tgclv1roietavsphipt[ac][ipt] =new TH2F(ss.str().c_str(), (ss.str() + ";Eta").c_str(), 53, 0, 53, 192, 0, 48); if( (tgclv1_shift_ac[ac]->regHist(tgclv1roietavsphipt[ac][ipt])).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// pt @@ -347,7 +347,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "SL_Chamber_All"; tgclv1slchamberAll =new TH2F(ss.str().c_str(),ss.str().c_str(), 14, -7, 7, 48, 1, 49); if( ( tgclv1_shift.regHist(tgclv1slchamberAll) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } for(int ieta=0;ieta<6;ieta++){// X bins @@ -378,7 +378,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0) sc=tgclv1_expert_a.regHist(tgclv1lptsectwire[ac]); else sc=tgclv1_expert_c.regHist(tgclv1lptsectwire[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1lptsectwire["<<ac<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1lptsectwire["<<ac<<"] Failed to register histogram " << endmsg; return sc; } //tgclv1lptsectwire->GetXaxis()->SetTitle("Side*12+Sector"); @@ -392,7 +392,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0) sc=tgclv1_expert_a.regHist(tgclv1lptsectstrip[ac]); else sc=tgclv1_expert_c.regHist(tgclv1lptsectstrip[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1lptsectstrip["<<ac<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1lptsectstrip["<<ac<<"] Failed to register histogram " << endmsg; return sc; } //tgclv1lptsectstrip->GetXaxis()->SetTitle("Side*12+Sector"); @@ -406,7 +406,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0) sc=tgclv1_expert_a.regHist(tgclv1hptsectwire[ac]); else sc=tgclv1_expert_c.regHist(tgclv1hptsectwire[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1hptsectwire["<<ac<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1hptsectwire["<<ac<<"] Failed to register histogram " << endmsg; return sc; } //tgclv1hptsectwire->GetXaxis()->SetTitle("Side*12+Sector"); @@ -420,7 +420,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0) sc=tgclv1_expert_a.regHist(tgclv1hptsectstrip[ac]); else sc=tgclv1_expert_c.regHist(tgclv1hptsectstrip[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1hptsectstrip[" << ac << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1hptsectstrip[" << ac << "] Failed to register histogram " << endmsg; return sc; } //tgclv1hptsectstrip[ac]->GetXaxis()->SetTitle("Sector"); @@ -434,7 +434,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ if(ac==0)sc=tgclv1_shift_a.regHist(tgclv1slsect[ac]); else sc=tgclv1_shift_c.regHist(tgclv1slsect[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1slsect[" << ac << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1slsect[" << ac << "] Failed to register histogram " << endmsg; return sc; } //tgclv1slsect->GetXaxis()->SetTitle("Side*12+Sector"); @@ -483,7 +483,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "Low_Pt_Wire_Chamber_" << side[ac]; tgclv1lptwirechamber[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 12, 0, 12, 48, 1, 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lptwirechamber[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -491,7 +491,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "Low_Pt_Strip_Chamber_" << side[ac]; tgclv1lptstripchamber[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 12, 0, 12, 48, 1, 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lptstripchamber[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -499,7 +499,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "High_Pt_Wire_Chamber_" << side[ac]; tgclv1hptwirechamber[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 11, 0, 11, 48, 1, 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1hptwirechamber[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -507,7 +507,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "High_Pt_Strip_Chamber_" << side[ac]; tgclv1hptstripchamber[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 11, 0, 11, 48, 1, 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1hptstripchamber[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -515,7 +515,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "SL_Chamber_" << side[ac]; tgclv1slchamber[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 6, 0, 6, 48, 1, 49); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1slchamber[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -568,7 +568,7 @@ TgcLv1RawDataValAlg::bookHistogramsNumberOfTriggersAndProfile(){ ss.str(""); ss << "ES_SL_vs_Muon_Chain_"; tgclv1_SL_vs_muonchain_ES = new TH2F( ss.str().c_str(), ( ss.str() + ";SL;No Muon Chain" ).c_str(), 2, 0, 2, 2, 0, 2 ); if( ( tgclv1_expert_ES.regHist( tgclv1_SL_vs_muonchain_ES ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } tgclv1_SL_vs_muonchain_ES->GetXaxis()->SetBinLabel(1,"false"); @@ -609,7 +609,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_Events_In_2LB"; tgclv1eventsinlb = new TH1F( ss.str().c_str(), ( ss.str() + ";LB;Events / 2LB" ).c_str(), 1250, 1,2501 ); if( ( tgclv1_rate.regHist( tgclv1eventsinlb ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -617,7 +617,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_Events_In_10BCID"; tgclv1eventsinbcid = new TH1F( ss.str().c_str(), ( ss.str() + ";BCID;Events / 10BCID" ).c_str(), 357, 0, 3570 );//BCID 0-3564 if( ( tgclv1_rate.regHist( tgclv1eventsinbcid ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -629,7 +629,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_SL_Triggers_In_2LB_" << side[ac]; tgclv1slinlb[ac] = new TH1F( ss.str().c_str(), ( ss.str() + ";LB;SL / 2LB" ).c_str(), 1250, 1,2501 ); if( ( tgclv1_rate_ac[ac]->regHist( tgclv1slinlb[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -637,7 +637,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_SL_Triggers_In_10BCID_" << side[ac]; tgclv1slinbcid[ac] = new TH1F( ss.str().c_str(), ( ss.str() + ";BCID;SL / 10BCID" ).c_str(), 357, 0, 3570 );//BCID 0-3564 if( ( tgclv1_rate_ac[ac]->regHist( tgclv1slinbcid[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -645,7 +645,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_SL_Triggers_Per_Event_Vs_2LB_" << side[ac]; tgclv1slpereventlb[ac] = new TH1F( ss.str().c_str(), ( ss.str() + ";LB;SL / Events" ).c_str(), 1250, 1,2501 ); if( ( tgclv1_ratio_ac[ac]->regHist( tgclv1slpereventlb[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -653,7 +653,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_SL_Triggers_Per_Event_Vs_10BCID_" << side[ac]; tgclv1slpereventbcid[ac] = new TH1F( ss.str().c_str(), ( ss.str() + ";BCID;SL / Events" ).c_str(), 357, 0, 3570 );//BCID 0-3564 if( ( tgclv1_ratio_ac[ac]->regHist( tgclv1slpereventbcid[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -663,7 +663,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_PT" << pt + 1 << "_Triggers_In_2LB_" << side[ac]; tgclv1slinlbpt[ac][pt] = new TH1F( ss.str().c_str(), ( ss.str() + ";LB;SL / 2LB" ).c_str(), 1250, 1,2501 ); if( ( tgclv1_rate_ac[ac]->regHist( tgclv1slinlbpt[ac][pt] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -671,7 +671,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_PT" << pt + 1 << "_Triggers_In_10BCID_" << side[ac]; tgclv1slinbcidpt[ac][pt] = new TH1F( ss.str().c_str(), ( ss.str() + ";BCID;SL / 10BCID" ).c_str(), 357, 0, 3570 );//BCID 0-3564 if( ( tgclv1_rate_ac[ac]->regHist( tgclv1slinbcidpt[ac][pt] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -679,7 +679,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_PT" << pt + 1 << "_Triggers_Per_Event_Vs_2LB_" << side[ac]; tgclv1slpereventlbpt[ac][pt] = new TH1F( ss.str().c_str(), ( ss.str() + ";LB;SL / Events" ).c_str(), 1250, 1,2501 ); if( ( tgclv1_ratio_ac[ac]->regHist( tgclv1slpereventlbpt[ac][pt] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -687,7 +687,7 @@ TgcLv1RawDataValAlg::bookHistogramsTriggerRate(){ ss.str(""); ss << "Number_Of_PT" << pt + 1 << "_Triggers_Per_Event_Vs_10BCID_" << side[ac]; tgclv1slpereventbcidpt[ac][pt] = new TH1F( ss.str().c_str(), ( ss.str() + ";BCID;SL / Events" ).c_str(), 357, 0, 3570 );//BCID 0-3564 if( ( tgclv1_ratio_ac[ac]->regHist( tgclv1slpereventbcidpt[ac][pt] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } }// pT diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx index 6dbd4993328..8cb8dbbb7b4 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_ReadContainer.cxx @@ -130,7 +130,7 @@ TgcLv1RawDataValAlg::clearVectorsArrays(){ void TgcLv1RawDataValAlg::readTgcCoinDataContainer(const Muon::TgcCoinDataContainer* tgc_coin_container, int pcn){ std::string WS[2]={"wire","strip"}; - if (m_debuglevel) m_log << MSG::DEBUG << "reading TgcCoinDataContainer into vectors" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "reading TgcCoinDataContainer into vectors" << endmsg; if(pcn!=TOTA){ // PREV/CURR/NEXT timing @@ -140,7 +140,7 @@ TgcLv1RawDataValAlg::readTgcCoinDataContainer(const Muon::TgcCoinDataContainer* it!=it_end; ++it){ if(it == it_end || (*it)->size()==0)continue; //check if there are counts - if(m_debuglevel) m_log << MSG::DEBUG << "size of tgc collection is " << (*it) -> size() << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "size of tgc collection is " << (*it) -> size() << endmsg; // Loop over Collection Muon::TgcCoinDataCollection::const_iterator itc_end=(*it)->end(); @@ -173,7 +173,7 @@ TgcLv1RawDataValAlg::readTgcCoinDataContainer(const Muon::TgcCoinDataContainer* // Fill vectors for different Coincidence Types if( tcd->type() == Muon::TgcCoinData::TYPE_TRACKLET ){ // LpT triggers - if (m_debuglevel)m_log << MSG::DEBUG << "Low_Pt" << WS[ws] << endreq; + if (m_debuglevel)m_log << MSG::DEBUG << "Low_Pt" << WS[ws] << endmsg; // Do flags and counters m_hasLpTtrigger[ws][ac][etaout][phi48][pcn]=true; @@ -195,7 +195,7 @@ TgcLv1RawDataValAlg::readTgcCoinDataContainer(const Muon::TgcCoinDataContainer* } else if( tcd->type() == Muon::TgcCoinData::TYPE_HIPT ){ // HpT triggers - if (m_debuglevel)m_log << MSG::DEBUG << "HighPt" << WS[ws] << endreq; + if (m_debuglevel)m_log << MSG::DEBUG << "HighPt" << WS[ws] << endmsg; // Do flags and counters //m_hasHpTtrigger[ws][ac][etaout][phi48][pcn]=true; @@ -219,7 +219,7 @@ TgcLv1RawDataValAlg::readTgcCoinDataContainer(const Muon::TgcCoinDataContainer* } else if( tcd->type() == Muon::TgcCoinData::TYPE_SL ){ // SL triggers - if (m_debuglevel)m_log << MSG::DEBUG << "SL" << endreq; + if (m_debuglevel)m_log << MSG::DEBUG << "SL" << endmsg; // Do flags and counters if(m_earliestTrigger<0)m_earliestTrigger=pcn; @@ -434,7 +434,7 @@ TgcLv1RawDataValAlg::readL1TriggerType(){ const xAOD::MuonRoIContainer* muonRoIs; StatusCode sc = (*m_activeStore)->retrieve(muonRoIs, m_L1muonRoIName); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::WARNING << " Cannot get LVL1 muon ROI " << endreq; + m_log << MSG::WARNING << " Cannot get LVL1 muon ROI " << endmsg; return sc ; } xAOD::MuonRoIContainer::const_iterator mu_it = muonRoIs->begin(); @@ -469,7 +469,7 @@ TgcLv1RawDataValAlg::readL1TriggerType(){ const xAOD::EmTauRoIContainer* emtauRoIs; sc = (*m_activeStore)->retrieve(emtauRoIs, m_L1emtauRoIName); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::WARNING << " Cannot get LVL1 emtau ROI " << endreq; + m_log << MSG::WARNING << " Cannot get LVL1 emtau ROI " << endmsg; return sc ; } xAOD::EmTauRoIContainer::const_iterator em_it = emtauRoIs->begin(); @@ -487,7 +487,7 @@ TgcLv1RawDataValAlg::readL1TriggerType(){ const xAOD::JetRoIContainer* jetRoIs; sc = (*m_activeStore)->retrieve(jetRoIs, m_L1jetRoIName); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::WARNING << " Cannot get LVL1 jet ROI " << endreq; + m_log << MSG::WARNING << " Cannot get LVL1 jet ROI " << endmsg; return sc ; } xAOD::JetRoIContainer::const_iterator j_it = jetRoIs->begin(); @@ -505,7 +505,7 @@ TgcLv1RawDataValAlg::readL1TriggerType(){ //* const xAOD::JetEtRoI* jetetRoIs; //* sc = (*m_activeStore)->retrieve(jetetRoIs); //* if (sc != StatusCode::SUCCESS ) { - //* m_log << MSG::WARNING << " Cannot get LVL1 jetet ROI " << endreq; + //* m_log << MSG::WARNING << " Cannot get LVL1 jetet ROI " << endmsg; //* return sc ; //* } //* m_L1TriggerType[3]++; @@ -515,7 +515,7 @@ TgcLv1RawDataValAlg::readL1TriggerType(){ const xAOD::EnergySumRoI* esumRoIs; sc = (*m_activeStore)->retrieve(esumRoIs); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::WARNING << " Cannot get LVL1 jetet ROI " << endreq; + m_log << MSG::WARNING << " Cannot get LVL1 jetet ROI " << endmsg; return sc ; } m_L1TriggerType[3]++; @@ -540,7 +540,7 @@ TgcLv1RawDataValAlg::readEventInfo(){ // Get Event Info DataHandle const DataHandle<xAOD::EventInfo> event_handle; if((*m_activeStore)->retrieve(event_handle).isFailure()){ - m_log << MSG::ERROR <<" Cannot retrieve EventInfo " <<endreq; + m_log << MSG::ERROR <<" Cannot retrieve EventInfo " <<endmsg; return StatusCode::FAILURE; } @@ -572,7 +572,7 @@ TgcLv1RawDataValAlg::readEventInfo(){ if( !(*m_activeStore)->contains<TrigOperationalInfoCollection>(key) ){ continuesearch=false; if (errcnt < 1) { - m_log << MSG::INFO <<" Missing TrigOperationalInfoCollection: key= " << key <<endreq; + m_log << MSG::INFO <<" Missing TrigOperationalInfoCollection: key= " << key <<endmsg; errcnt++; } } @@ -583,7 +583,7 @@ TgcLv1RawDataValAlg::readEventInfo(){ if( !(*m_activeStore)->retrieve<TrigOperationalInfoCollection>(opi,key).isSuccess() ){ continuesearch=false; if (errcnt < 1) { - m_log << MSG::INFO <<" Failed to retrieve TrigOperationalInfoCollection: key= " << key <<endreq; + m_log << MSG::INFO <<" Failed to retrieve TrigOperationalInfoCollection: key= " << key <<endmsg; errcnt++; } } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx index dd61af69137..96dcdbca395 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_Summary_LowStat.cxx @@ -77,7 +77,7 @@ TgcLv1RawDataValAlg::bookHistogramsSummary(){ if(ac==0) sc=tgclv1_summary_a.regHist(tgclv1summaryofsltiming[ac]); else sc=tgclv1_summary_c.regHist(tgclv1summaryofsltiming[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1summaryofsltiming[" << ac << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1summaryofsltiming[" << ac << "] Failed to register histogram " << endmsg; return sc; } tgclv1summaryofsltiming[ac]->GetXaxis()->SetTitle("Current BC fraction"); @@ -89,7 +89,7 @@ TgcLv1RawDataValAlg::bookHistogramsSummary(){ if(ac==0) sc=tgclv1_summary_a.regHist(tgclv1summaryoflpttiming[ac]); else sc=tgclv1_summary_c.regHist(tgclv1summaryoflpttiming[ac]); if(sc.isFailure()){ - m_log << MSG::FATAL << "tgclv1summaryoflpttiming[" << ac << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1summaryoflpttiming[" << ac << "] Failed to register histogram " << endmsg; return sc; } tgclv1summaryoflpttiming[ac]->GetXaxis()->SetTitle("Current BC fraction"); @@ -105,7 +105,7 @@ TgcLv1RawDataValAlg::bookHistogramsSummary(){ sc=tgclv1_summary.regHist(tgclv1summaryofsltimingperchambertype[itype]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgclv1summaryofsltimingperchambertype[" << itype << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1summaryofsltimingperchambertype[" << itype << "] Failed to register histogram " << endmsg; return sc; } tgclv1summaryofsltimingperchambertype[itype]->GetXaxis()->SetTitle("Current BC fraction"); @@ -117,7 +117,7 @@ TgcLv1RawDataValAlg::bookHistogramsSummary(){ sc=tgclv1_summary.regHist(tgclv1summaryoflpttimingperchambertype[itype]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgclv1summaryoflpttimingperchambertype[" << itype << "] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgclv1summaryoflpttimingperchambertype[" << itype << "] Failed to register histogram " << endmsg; return sc; } tgclv1summaryoflpttimingperchambertype[itype]->GetXaxis()->SetTitle("Current BC fraction"); @@ -155,7 +155,7 @@ TgcLv1RawDataValAlg::bookHistogramsLowStat(){ ss.str(""); ss << "SL_Chamber_In_10LBs_" << side[ac]; tgclv1slchamberlowstat[ac] =new TH2F(ss.str().c_str(),ss.str().c_str(), 6, 0, 6, 48, 1, 49); if((tgclv1_lowstat_ac[ac]->regHist(tgclv1slchamberlowstat[ac])).isFailure()){ - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -164,7 +164,7 @@ TgcLv1RawDataValAlg::bookHistogramsLowStat(){ tgclv1sltimingptcutlowstat[ac] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingptcutlowstat[ac]); if((tgclv1_lowstat_ac[ac]->regHist(tgclv1sltimingptcutlowstat[ac])).isFailure()){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx index 41c362c4078..48b37be4857 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcLv1RawDataValAlg_TriggerTiming.cxx @@ -108,7 +108,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltiming[ac] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltiming[ac]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1sltiming[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -117,7 +117,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingptcut[ac] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingptcut[ac]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1sltimingptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -127,7 +127,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingpt[ac][ipt] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingpt[ac][ipt]); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingpt[ac][ipt]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } } @@ -139,7 +139,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << sltiming << "_Map_" << side[ac]; tgclv1sltimingmap[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1sltimingmap[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1sltimingmap[ac]->SetMinimum(0.0); @@ -148,7 +148,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << sl << "Timing_Fraction_Map_" << side[ac]; tgclv1slcurrentfractionmap[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1slcurrentfractionmap[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -156,7 +156,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << sltiming << "_Map" << morethanpt1 << "_" << side[ac]; tgclv1sltimingmapptcut[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1sltimingmapptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1sltimingmapptcut[ac]->SetMinimum(0.0); @@ -165,7 +165,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << sl << "Timing_Fraction_Map" << morethanpt1 << side[ac]; tgclv1slcurrentfractionmapptcut[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1slcurrentfractionmapptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -200,7 +200,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1sltimingsector[ac][isect] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingsector[ac][isect]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1sltimingsector[ac][isect]); @@ -211,7 +211,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1sltimingptcutsector[ac][isect] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingptcutsector[ac][isect]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1sltimingptcutsector[ac][isect]); @@ -225,7 +225,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingtrg[ac][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingtrg[ac][itrig]); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1sltimingtrg[ac][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -234,7 +234,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingptcuttrg[ac][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingptcuttrg[ac][itrig]); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1sltimingptcuttrg[ac][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -244,7 +244,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingpttrg[ac][ipt][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1sltimingpttrg[ac][ipt][itrig]); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingpttrg[ac][ipt][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// pT @@ -260,7 +260,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1sltimingsectortrg[ac][isect][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1sltimingsectortrg[ac][isect][itrig]); @@ -269,10 +269,10 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << sltiming << morethanpt1 << triggertype[itrig] << "_" << side[ac]; if(isect+1<10)ss << "0"; ss << isect+1; - m_log << MSG::DEBUG << "histos for SL sector timing for pt>2" << endreq; + m_log << MSG::DEBUG << "histos for SL sector timing for pt>2" << endmsg; tgclv1sltimingptcutsectortrg[ac][isect][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1sltimingptcutsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1sltimingptcutsectortrg[ac][isect][itrig]); @@ -287,7 +287,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingtrack[ac][imuid] = new TH1F(ss.str().c_str(), ss.str().c_str(), 3, 0, 3 ); setTH1TitleLabelBCID(tgclv1sltimingtrack[ac][imuid]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1sltimingtrack[ac][imuid] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -296,7 +296,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1sltimingptcuttrack[ac][imuid] = new TH1F(ss.str().c_str(), ss.str().c_str(), 3, 0, 3 ); setTH1TitleLabelBCID(tgclv1sltimingptcuttrack[ac][imuid]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1sltimingptcuttrack[ac][imuid] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// muonalg @@ -313,7 +313,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpttiming << "_" << side[ac]; tgclv1lpttiming[ac] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1lpttiming[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttiming[ac]); @@ -322,7 +322,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpttiming << morethanpt1 << "_" << side[ac]; tgclv1lpttimingptcut[ac] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lpttimingptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttimingptcut[ac]); @@ -332,7 +332,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpttiming << PT << ipt+1 << "_" << side[ac]; tgclv1lpttimingpt[ac][ipt] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingpt[ac][ipt]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingpt[ac][ipt]->SetMinimum(0.0); @@ -346,7 +346,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpttiming << "_Map_" << side[ac]; tgclv1lpttimingmap[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lpttimingmap[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingmap[ac]->SetMinimum(0.0); @@ -355,7 +355,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpt << "Timing_Fraction_Map_" << side[ac]; tgclv1lptcurrentfractionmap[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lptcurrentfractionmap[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -363,7 +363,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpttiming << "_Map" << morethanpt1 << side[ac]; tgclv1lpttimingmapptcut[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lpttimingmapptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingmapptcut[ac]->SetMinimum(0.0); @@ -372,7 +372,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << lpt << "Timing_Fraction_Map" << morethanpt1 << side[ac]; tgclv1lptcurrentfractionmapptcut[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 18, 0, 18, 48, 1 , 49); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lptcurrentfractionmapptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -408,19 +408,19 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << k+1; tgclv1lpttimingsector[ac][k] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingsector[ac][k]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttimingsector[ac][k]); // LpT Timing hist for pT threshold > pT1 - m_log << MSG::DEBUG << "histos for LPT sector timing for pt>2" << endreq; + m_log << MSG::DEBUG << "histos for LPT sector timing for pt>2" << endmsg; ss.str(""); ss << lpttiming << morethanpt1 << "_" << side[ac]; if(k+1<10)ss << "0"; ss << k+1; tgclv1lpttimingptcutsector[ac][k] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingptcutsector[ac][k]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttimingptcutsector[ac][k]); @@ -434,7 +434,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1lpttimingtrg[ac][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1lpttimingtrg[ac][itrig]); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lpttimingtrg[ac][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingtrg[ac][itrig]->SetMinimum(0.0); @@ -444,7 +444,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1lpttimingptcuttrg[ac][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1lpttimingptcuttrg[ac][itrig]); if( ( tgclv1_expert_ac[ac]->regHist(tgclv1lpttimingptcuttrg[ac][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingptcuttrg[ac][itrig]->SetMinimum(0.0); @@ -455,7 +455,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1lpttimingpttrg[ac][ipt][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); setTH1TitleLabelBCID(tgclv1lpttimingpttrg[ac][ipt][itrig]); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingpttrg[ac][ipt][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } tgclv1lpttimingpttrg[ac][ipt][itrig]->SetMinimum(0.0); @@ -472,7 +472,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1lpttimingsectortrg[ac][isect][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttimingsectortrg[ac][isect][itrig]); @@ -483,7 +483,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1lpttimingptcutsectortrg[ac][isect][itrig] = new TH1F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1lpttimingptcutsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1lpttimingptcutsectortrg[ac][isect][itrig]); @@ -498,7 +498,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1lpttimingtrack[ac][imuid] = new TH1F(ss.str().c_str(), ss.str().c_str(), 3, 0, 3 ); setTH1TitleLabelBCID(tgclv1lpttimingtrack[ac][imuid]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1lpttimingtrack[ac][imuid] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -507,7 +507,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ tgclv1lpttimingptcuttrack[ac][imuid] = new TH1F(ss.str().c_str(), ss.str().c_str(), 3, 0, 3 ); setTH1TitleLabelBCID(tgclv1lpttimingptcuttrack[ac][imuid]); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1lpttimingptcuttrack[ac][imuid] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } }// muonalg @@ -523,7 +523,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << slvslpttiming << "_" << side[ac]; tgclv1slvslpttiming[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1slvslpttiming[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH2TitleLabelBCID(tgclv1slvslpttiming[ac]); @@ -532,7 +532,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << slvslpttiming << morethanpt1 << "_" << side[ac]; tgclv1slvslpttimingptcut[ac] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_shift_ac[ac]->regHist(tgclv1slvslpttimingptcut[ac]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH2TitleLabelBCID(tgclv1slvslpttimingptcut[ac]); @@ -546,7 +546,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1slvslpttimingsector[ac][isect] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1slvslpttimingsector[ac][isect]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1slvslpttimingsector[ac][isect]); @@ -557,7 +557,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1slvslpttimingptcutsector[ac][isect] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1slvslpttimingptcutsector[ac][isect]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1slvslpttimingptcutsector[ac][isect]); @@ -573,7 +573,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1slvslpttimingsectortrg[ac][isect][itrig] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1slvslpttimingsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1slvslpttimingsectortrg[ac][isect][itrig]); @@ -584,7 +584,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss << isect+1; tgclv1slvslpttimingptcutsectortrg[ac][isect][itrig] = new TH2F(ss.str().c_str(),ss.str().c_str(), 3, 0, 3, 3, 0, 3); if( ( tgclv1_timing_ac[ac]->regHist(tgclv1slvslpttimingptcutsectortrg[ac][isect][itrig]) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } setTH1TitleLabelBCID(tgclv1slvslpttimingptcutsectortrg[ac][isect][itrig]); @@ -602,7 +602,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << sltiming << "_" << side[ac]; tgclv1_SL_trigger_timing_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Current Fraction").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_SL_trigger_timing_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -610,7 +610,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_GM_" << sltiming << "_" << side[ac]; tgclv1_SL_trigger_timing_ES_GM[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Current Fraction").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES_GM[ac]->regHist( tgclv1_SL_trigger_timing_ES_GM[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -618,7 +618,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << sltiming << "_" << side[ac] << "_Numerator"; tgclv1_SL_trigger_timing_num_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Entry").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_SL_trigger_timing_num_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -626,7 +626,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << sltiming << "_" << side[ac] << "_Denominator"; tgclv1_SL_trigger_timing_denom_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Entry").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_SL_trigger_timing_denom_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -634,7 +634,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << lpttiming << "_" << side[ac]; tgclv1_LPT_trigger_timing_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Current Fraction").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_LPT_trigger_timing_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -642,7 +642,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_GM_" << lpttiming << "_" << side[ac]; tgclv1_LPT_trigger_timing_ES_GM[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Current Fraction").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES_GM[ac]->regHist( tgclv1_LPT_trigger_timing_ES_GM[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -650,7 +650,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << lpttiming << "_" << side[ac] << "_Numerator"; tgclv1_LPT_trigger_timing_num_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Entry").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_LPT_trigger_timing_num_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -658,7 +658,7 @@ TgcLv1RawDataValAlg::bookHistogramsTiming(){ ss.str(""); ss << "ES_" << lpttiming << "_" << side[ac] << "_Denominator"; tgclv1_LPT_trigger_timing_denom_ES[ac] = new TH1F(ss.str().c_str(), ( ss.str() + ";;Entry").c_str(), 12, 0, 12); if( ( tgclv1_timing_ac_ES[ac]->regHist( tgclv1_LPT_trigger_timing_denom_ES[ac] ) ).isFailure() ){ - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return StatusCode::FAILURE; } @@ -1022,7 +1022,7 @@ TgcLv1RawDataValAlg::fillTriggerTimingAssociatedWithTrack( int ms,// 0:Muid 1:St }//trigger //fill SL timing if(tptmin!=-1){ - if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endreq; + if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endmsg; tgclv1sltimingtrack[ac][ms]->Fill(pcn); if( tptmin > 1 ) tgclv1sltimingptcuttrack[ac][ms]->Fill(pcn); @@ -1072,7 +1072,7 @@ TgcLv1RawDataValAlg::fillTriggerTimingAssociatedWithTrack( int ms,// 0:Muid 1:St phi48lpts != slphi48 ) continue ; // Fill LpT Track Timing Histograms - if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endreq; + if(m_debuglevel ) m_log << "fill triggertiming " <<ac <<" " << ms << " " << pcn << endmsg; tgclv1lpttimingtrack[ac][ms]->Fill(pcn); if( slpt > 1 ) tgclv1lpttimingptcuttrack[ac][ms]->Fill(pcn); diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx index b0f7877ef9b..11b386ab741 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg.cxx @@ -71,7 +71,7 @@ TgcRawDataValAlg::TgcRawDataValAlg( const std::string & type, const std::string // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * TgcRawDataValAlg::~TgcRawDataValAlg(){ - m_log << MSG::INFO << " deleting TgcRawDataValAlg " << endreq; + m_log << MSG::INFO << " deleting TgcRawDataValAlg " << endmsg; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -83,7 +83,7 @@ TgcRawDataValAlg::initialize(){ //m_log.setLevel(MSG::DEBUG); m_debuglevel = (m_log.level() <= MSG::DEBUG); // save if threshold for debug printout reached - m_log << MSG::INFO << "in initializing TgcRawDataValAlg" << endreq; + m_log << MSG::INFO << "in initializing TgcRawDataValAlg" << endmsg; StatusCode sc; sc = ManagedMonitorToolBase::initialize(); @@ -93,7 +93,7 @@ TgcRawDataValAlg::initialize(){ // Store Gate store sc = serviceLocator()->service("StoreGateSvc", m_eventStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endreq; + m_log << MSG::ERROR << " Cannot get StoreGateSvc " << endmsg; return sc ; } */ @@ -101,7 +101,7 @@ TgcRawDataValAlg::initialize(){ // Retrieve the Active Store sc = serviceLocator()->service("ActiveStoreSvc", m_activeStore); if (sc != StatusCode::SUCCESS ) { - m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endreq; + m_log << MSG::ERROR << " Cannot get ActiveStoreSvc " << endmsg; return sc ; } @@ -109,7 +109,7 @@ TgcRawDataValAlg::initialize(){ StoreGateSvc* detStore = 0; sc = service("DetectorStore", detStore); if (sc.isFailure()) { - m_log << MSG::FATAL << "DetectorStore service not found !" << endreq; + m_log << MSG::FATAL << "DetectorStore service not found !" << endmsg; return StatusCode::FAILURE; } @@ -117,13 +117,13 @@ TgcRawDataValAlg::initialize(){ sc = detStore->retrieve(m_muonMgr); if (sc.isFailure()) { m_log << MSG::FATAL - << "Cannot get MuonDetectorManager from detector store" << endreq; + << "Cannot get MuonDetectorManager from detector store" << endmsg; return StatusCode::FAILURE; - } else { if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endreq; } + } else { if (m_debuglevel) m_log << MSG::DEBUG << " Found the MuonDetectorManager from detector store. " << endmsg; } sc = detStore->retrieve(m_tgcIdHelper,"TGCIDHELPER"); if (sc.isFailure()) { - m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endreq; + m_log << MSG::ERROR << "Can't retrieve TgcIdHelper" << endmsg; return sc; } @@ -138,7 +138,7 @@ TgcRawDataValAlg::initialize(){ //set minimum and maximum of channel difference setChannelDifferenceRange(); - // m_log << MSG::INFO<<"TgcRawDataValAlg initialize finished "<<endreq; + // m_log << MSG::INFO<<"TgcRawDataValAlg initialize finished "<<endmsg; //do not monitor profile histograms //m_mon_profile=false; @@ -151,7 +151,7 @@ TgcRawDataValAlg::initialize(){ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * StatusCode TgcRawDataValAlg::bookHistogramsRecurrent(){ - if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring Histograms being booked" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring Histograms being booked" << endmsg; StatusCode sc = StatusCode::SUCCESS; if( newRun || newLowStatInterval ){ @@ -159,7 +159,7 @@ TgcRawDataValAlg::bookHistogramsRecurrent(){ if( m_environment != AthenaMonManager::online ) { sc = bookHistogramsLowStat(); if(sc.isFailure()){ - m_log << MSG::FATAL << "bookLowStatHisto() Failed " << endreq; + m_log << MSG::FATAL << "bookLowStatHisto() Failed " << endmsg; return StatusCode::FAILURE; } } @@ -172,7 +172,7 @@ TgcRawDataValAlg::bookHistogramsRecurrent(){ if(newLumiBlock){} if(newRun) { - //if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring : newRun" << endreq; + //if (m_debuglevel) m_log << MSG::DEBUG << "TGC RawData Monitoring : newRun" << endmsg; sc = bookHistogramsNumberOfHits(); sc = bookHistogramsProfile(); @@ -181,16 +181,16 @@ TgcRawDataValAlg::bookHistogramsRecurrent(){ sc = bookHistogramsSummary(); if (m_debuglevel) { - m_log << MSG::DEBUG << "INSIDE bookHistograms : " << tgcevents << generic_path_tgcmonitoring << endreq; - //m_log << MSG::DEBUG << "SHIFT : " << shift << " RUN : " << run << " Booked booktgcevents successfully" << endreq; //attention + m_log << MSG::DEBUG << "INSIDE bookHistograms : " << tgcevents << generic_path_tgcmonitoring << endmsg; + //m_log << MSG::DEBUG << "SHIFT : " << shift << " RUN : " << run << " Booked booktgcevents successfully" << endmsg; //attention } - if(m_debuglevel) m_log << MSG::DEBUG << "have registered histograms for Number of Wire/Strip Hits" << endreq ; + if(m_debuglevel) m_log << MSG::DEBUG << "have registered histograms for Number of Wire/Strip Hits" << endmsg ; }//new run - //m_log << MSG::INFO << "TGC RawData Monitoring Histograms booked" << endreq; + //m_log << MSG::INFO << "TGC RawData Monitoring Histograms booked" << endmsg; return sc; } @@ -201,13 +201,13 @@ StatusCode TgcRawDataValAlg::fillHistograms(){ StatusCode sc = StatusCode::SUCCESS; - if (m_debuglevel) m_log << MSG::DEBUG << "TgcRawDataValAlg::TGC RawData Monitoring Histograms being filled" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "TgcRawDataValAlg::TGC RawData Monitoring Histograms being filled" << endmsg; clearVectorsArrays(); //fillEventInfo information if ( (fillEventInfo() ).isFailure() ){ - m_log << MSG::ERROR << " Cannot fillEventInfo " << endreq; + m_log << MSG::ERROR << " Cannot fillEventInfo " << endmsg; return sc; } @@ -220,31 +220,31 @@ TgcRawDataValAlg::fillHistograms(){ // Previous sc = (*m_activeStore)->retrieve(tgc_previous_prd_container, m_tgcPrepDataPreviousContainerName); if(sc.isFailure()|| 0 == tgc_previous_prd_container) { - m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for previous BC" << endreq; + m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for previous BC" << endmsg; return sc; } - if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc previous prd container size() : " << tgc_previous_prd_container->size() << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc previous prd container size() : " << tgc_previous_prd_container->size() << endmsg; // Current sc = (*m_activeStore)->retrieve(tgc_current_prd_container, m_tgcPrepDataContainerName); if(sc.isFailure()|| 0 == tgc_current_prd_container ) { - m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for current BC" << endreq; + m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for current BC" << endmsg; return sc; } - if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc current prd container size() : " << tgc_current_prd_container->size() << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc current prd container size() : " << tgc_current_prd_container->size() << endmsg; // Next sc = (*m_activeStore)->retrieve(tgc_next_prd_container, m_tgcPrepDataNextContainerName); if(sc.isFailure()|| 0 == tgc_next_prd_container) { - m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for next BC" << endreq; + m_log << MSG::WARNING << " Cannot retrieve TgcPrepDataContainer for next BC" << endmsg; return sc; } - if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc next prd container size() : " << tgc_next_prd_container->size() << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "****** tgc next prd container size() : " << tgc_next_prd_container->size() << endmsg; // Increment event counter m_nEvent++; - if(m_debuglevel) m_log << MSG::DEBUG <<"event : " << m_nEvent << endreq; + if(m_debuglevel) m_log << MSG::DEBUG <<"event : " << m_nEvent << endmsg; ///////////////////////////////////// @@ -275,7 +275,7 @@ TgcRawDataValAlg::fillHistograms(){ //vector<double> SLPhi[2]; if (m_debuglevel) { - m_log << MSG::DEBUG << "********TGC event number : " << m_nEvent << endreq; + m_log << MSG::DEBUG << "********TGC event number : " << m_nEvent << endmsg; } return sc; // statuscode check @@ -287,8 +287,8 @@ TgcRawDataValAlg::fillHistograms(){ StatusCode TgcRawDataValAlg::procHistograms(){ if (m_debuglevel) { - m_log << MSG::DEBUG << "********Reached Last Event in TgcRawDataValAlg !!!" << endreq; - m_log << MSG::DEBUG << "TgcRawDataValAlg finalize()" << endreq; + m_log << MSG::DEBUG << "********Reached Last Event in TgcRawDataValAlg !!!" << endmsg; + m_log << MSG::DEBUG << "TgcRawDataValAlg finalize()" << endmsg; } if(endOfLumiBlock){ //histogram division every LB only for Global Montioring @@ -404,7 +404,7 @@ TgcRawDataValAlg::fillEventInfo(){ const xAOD::EventInfo* evt(0); StatusCode sc = (*m_activeStore)->retrieve(evt); if ( sc.isFailure() || evt==0) { - m_log << MSG::ERROR <<" Cannot retrieve EventInfo " <<endreq; + m_log << MSG::ERROR <<" Cannot retrieve EventInfo " <<endmsg; //tgceventsinlb->Fill( m_lumiblock ); //tgceventsinbcid->Fill( m_BCID ); return StatusCode::FAILURE; @@ -417,7 +417,7 @@ TgcRawDataValAlg::fillEventInfo(){ //tgceventsinlb->Fill( m_lumiblock ); //tgceventsinbcid->Fill( m_BCID ); - //m_log << MSG::INFO << "event " << m_event <<" lumiblock " << m_lumiblock << endreq; + //m_log << MSG::INFO << "event " << m_event <<" lumiblock " << m_lumiblock << endmsg; return StatusCode::SUCCESS; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx index eee26ee31e7..bee2d89c897 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Efficiency.cxx @@ -73,7 +73,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ // Summary_Of_Wire_Efficiency_Per_Chamber_Type_Station[1-3]_{E,F[1-5]}_T[1-9] // Summary_Of_Strip_Efficiency_Per_Chamber_Type_Station[1-3]_{E,F[1-5]}_T[1-9] - m_log << MSG::INFO << "bookHistogramsEfficiency" << endreq; + m_log << MSG::INFO << "bookHistogramsEfficiency" << endmsg; StatusCode sc=StatusCode::SUCCESS; MonGroup tgcprd_eff_a( this, generic_path_tgcmonitoring + "/TGCEA/Efficiency", run, ATTRIB_UNMANAGED ); @@ -107,7 +107,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceff[ac]=new TH1F(ss.str().c_str(), (ss.str() + ";;Efficiency").c_str(),13,0,13); sc=tgcprd_eff_ac[ac]->regHist(tgceff[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgceff[ac] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgceff[ac] Failed to register histogram " << endmsg; return sc; } @@ -117,7 +117,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffnum[ac]->Sumw2(); sc=tgcprd_effnumdenom_ac[ac]->regHist(tgceffnum[ac]); if(sc.isFailure()) { - m_log << MSG::FATAL << "tgceffnum[ac] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgceffnum[ac] Failed to register histogram " << endmsg; return sc; } @@ -127,7 +127,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffdenom[ac]->Sumw2(); sc=tgcprd_effnumdenom_ac[ac]->regHist(tgceffdenom[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgceffdenom[ac] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgceffdenom[ac] Failed to register histogram " << endmsg; return sc; } @@ -143,7 +143,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffmap[ac][ws] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_eff_ac[ac]->regHist(tgceffmap[ac][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -152,7 +152,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffmapnum[ac][ws] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_effnumdenom_ac[ac]->regHist(tgceffmapnum[ac][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -161,7 +161,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffmapdenom[ac][ws] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_effnumdenom_ac[ac]->regHist(tgceffmapdenom[ac][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -172,7 +172,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffmapbc[ac][ws][bc] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_eff_expert_ac[ac]->regHist(tgceffmapbc[ac][ws][bc]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -181,7 +181,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffmapnumbc[ac][ws][bc] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_effnumdenom_expert_ac[ac]->regHist(tgceffmapnumbc[ac][ws][bc]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } } @@ -351,7 +351,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffsector[i][ws]=new TH1F(ss.str().c_str(), (ss.str() + ";;Efficiency").c_str(),84,0,84); sc=tgcprd_eff_expert_ac[i]->regHist(tgceffsector[i][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() <<" Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() <<" Failed to register histogram " << endmsg; return sc; } @@ -361,7 +361,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffsectornum[i][ws]->Sumw2(); sc=tgcprd_effnumdenom_expert_ac[i]->regHist(tgceffsectornum[i][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -371,7 +371,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgceffsectordenom[i][ws]->Sumw2(); sc=tgcprd_effnumdenom_expert_ac[i]->regHist(tgceffsectordenom[i][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } } @@ -395,7 +395,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgcsummaryofeffpergasgap[i][ws]=new TH1F(ss.str().c_str(), (ss.str() + ";Efficiency; Entries").c_str(), 101, 0., 1.01); sc=tgcprd_summary_ac[i]->regHist(tgcsummaryofeffpergasgap[i][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } } @@ -415,7 +415,7 @@ TgcRawDataValAlg::bookHistogramsEfficiency(){ tgcsummaryofeffperchambertype[ws][ntype]=new TH1F(ss.str().c_str(), (ss.str() + ";Efficiency; Entries").c_str(), 101, 0., 1.01); sc=tgcprd_summary.regHist(tgcsummaryofeffperchambertype[ws][ntype++]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } } @@ -443,7 +443,7 @@ TgcRawDataValAlg::fillEfficiency(){ const Muon::TgcCoinDataContainer* tgc_trg_container(0); sc = (*m_activeStore)->retrieve(tgc_trg_container, m_outputCoinCollectionLocation); if (sc.isFailure() || 0 == tgc_trg_container ) { - m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer " << endreq; + m_log << MSG::ERROR << " Cannot retrieve TgcCoinDataContainer " << endmsg; return sc; } @@ -453,7 +453,7 @@ TgcRawDataValAlg::fillEfficiency(){ it!=it_end; ++it){ if(it == it_end || (*it)->size()==0)continue; //check if there are counts - if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgccoin collection is " << (*it) -> size() << endreq; + if (m_debuglevel) m_log<<MSG::DEBUG<< "size of tgccoin collection is " << (*it) -> size() << endmsg; // Loop over Collection Muon::TgcCoinDataCollection::const_iterator itc_end=(*it)->end(); @@ -824,6 +824,6 @@ TgcRawDataValAlg::calculateEfficiency(int ac, int ws, int eta, int phi48, int la } } - if(m_debuglevel)m_log<<MSG::DEBUG<<"no matching hit for efficiency calculation"<<endreq; + if(m_debuglevel)m_log<<MSG::DEBUG<<"no matching hit for efficiency calculation"<<endmsg; return; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx index 66b968537c8..c42499ff07e 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Functions.cxx @@ -58,7 +58,7 @@ using namespace std; // Private function to select tgc chambersId of the spectrometer void TgcRawDataValAlg::tgcchamberId(){ - if (m_debuglevel) m_log << MSG::DEBUG << "in TGC ChambersIDvector" << endreq; + if (m_debuglevel) m_log << MSG::DEBUG << "in TGC ChambersIDvector" << endmsg; //std::vector<Identifier>::const_iterator idfirst = m_tgcIdHelper->module_begin(); std::vector<Identifier>::const_iterator idlast = m_tgcIdHelper->module_end(); @@ -82,7 +82,7 @@ TgcRawDataValAlg::tgcchamberId(){ std::string hardware_name=convertChamberName(stationName, stationEta, stationPhi, type) ; - //m_log << MSG::DEBUG << "Adding the chamber Identifier: " << extid << endreq;} + //m_log << MSG::DEBUG << "Adding the chamber Identifier: " << extid << endmsg;} //m_log << MSG::DEBUG << "Adding the chamber Identifier: " << extid <<" "; /* m_log << MSG::DEBUG << "Adding the chamber " << hardware_name <<" "; @@ -92,9 +92,9 @@ TgcRawDataValAlg::tgcchamberId(){ if (m_debuglevel) m_log.setf( std::ios::hex, std::ios::basefield ); if (m_debuglevel) m_log << Id; //if (m_debuglevel) m_log.setf( std::ios::dec, std::ios::basefield ); - if (m_debuglevel) m_log << MSG::DEBUG <<" its hash Id is "<< Idhash << endreq; + if (m_debuglevel) m_log << MSG::DEBUG <<" its hash Id is "<< Idhash << endmsg; }else{ - if (m_debuglevel) m_log << MSG::DEBUG<<" hash Id NOT computed "<< Idhash << endreq; + if (m_debuglevel) m_log << MSG::DEBUG<<" hash Id NOT computed "<< Idhash << endmsg; } */ } @@ -277,7 +277,7 @@ TgcRawDataValAlg::getWireNumberPerPhi48(Identifier id) const{ int stationName=m_tgcIdHelper->stationName(id);//41:T1F 42:T1E 43:T2F 44:T2E 45:T3F 46:T3E 47:T3F 48:T4E (T4 means inner small wheel TGCs, EI/FI) if(stationName==47||stationName==48){ - m_log << MSG::WARNING << "getWireNumberPerPhi48 is not implemented yet for EIFI" << endreq; + m_log << MSG::WARNING << "getWireNumberPerPhi48 is not implemented yet for EIFI" << endmsg; return -1; } @@ -299,7 +299,7 @@ TgcRawDataValAlg::getWireNumberPerPhi48(Identifier id) const{ int TgcRawDataValAlg::getWireNumberPerPhi48(int tgc, int ws, int channel, int eta) const{ if(tgc==3){ - m_log << MSG::WARNING << "getWireNumberPerPhi48 is not implemented yet for EIFI" << endreq; + m_log << MSG::WARNING << "getWireNumberPerPhi48 is not implemented yet for EIFI" << endmsg; return -1; } int n; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx index a38ac8da549..e18c975cdbd 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_NumberOfHits.cxx @@ -61,7 +61,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ // Number_Of_TGC_Strip_Hits_Per_Event // Number_Of_TGC_Hits_Per_Event_{A,C} - m_log << MSG::INFO << "bookHistogramsNumberOfHits" << endreq; + m_log << MSG::INFO << "bookHistogramsNumberOfHits" << endmsg; StatusCode sc=StatusCode::SUCCESS; @@ -78,7 +78,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ tgceventcounter=new TH1F("Event_Counter","Event_Counter; [counts]; Number of Hits/Events",1,0,1.); sc=tgcprd_shift.regHist(tgceventcounter) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgceventcounter Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgceventcounter Failed to register histogram " << endmsg; return sc; } @@ -86,7 +86,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ tgcevents=new TH1F("Number_Of_TGC_Hits_Per_Event", "Number_Of_TGC_Hits_Per_Event; [counts]; Number of Hits/Events",500,0,500.); sc=tgcprd_shift.regHist(tgcevents) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgcevents Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgcevents Failed to register histogram " << endmsg; return sc; } @@ -95,7 +95,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ tgcnumberofwirehits=new TH1F("Number_Of_TGC_Wire_Hits_Per_Event", "Number_Of_TGC_Wire_Hits_Per_Event; [counts]; Number of Wire Hits/Event",300,0,300.); sc=tgcprd_expert.regHist(tgcnumberofwirehits) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgcnumberofwirehits Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgcnumberofwirehits Failed to register histogram " << endmsg; return sc; } @@ -104,7 +104,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ tgcnumberofstriphits=new TH1F("Number_Of_TGC_Strip_Hits_Per_Event", "Number_Of_TGC_Strip_Hits_Per_Event; [counts]; Number of Strip Hits/Events",300,0,300.); sc=tgcprd_expert.regHist(tgcnumberofstriphits) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgcnumberofstriphits Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgcnumberofstriphits Failed to register histogram " << endmsg; return sc; } @@ -115,7 +115,7 @@ TgcRawDataValAlg::bookHistogramsNumberOfHits(){ if(ac==0) sc=tgcprd_shift_a.regHist(tgcnumberofhits[ac]) ; else sc=tgcprd_shift_c.regHist(tgcnumberofhits[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx index 933cd056dc0..4c308b1770d 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Profile.cxx @@ -73,7 +73,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ // Summary_Of_Wire_Occupancy_Per_Chamber_Type_Station[1-3]_{E,F[0-5]}_T[1-9] // Summary_Of_Strip_Occupancy_Per_Chamber_Type_Station[1-3]_{E,F[0-5]}_T[1-9] - m_log << MSG::INFO << "bookHistogramsProfile(" << endreq; + m_log << MSG::INFO << "bookHistogramsProfile(" << endmsg; StatusCode sc=StatusCode::SUCCESS; @@ -108,7 +108,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgctripletdoublethitsinlbvssect[ac]=new TH2F(ss.str().c_str(), (ss.str() + "; LB;" ).c_str(),1250,1.,2501., 148, 0, 148 ); sc=tgcprd_shift_ac[ac]->regHist(tgctripletdoublethitsinlbvssect[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -138,7 +138,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgcprofilemap[ac][ws] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_profile_s_ac[ac]->regHist(tgcprofilemap[ac][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } tgcprofilemap[ac][ws]->SetMaximum(1.2); @@ -149,7 +149,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgcoccupancymap[ac][ws] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_occupancy_s_ac[ac]->regHist(tgcoccupancymap[ac][ws]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } tgcoccupancymap[ac][ws]->SetMaximum(1.2); @@ -161,7 +161,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgcwirestripcoin[ac] = new TH2F( ss.str().c_str(), ss.str().c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_shift_ac[ac]->regHist(tgcwirestripcoin[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } }//ac @@ -350,7 +350,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgcwireprofilephi48[ac][i][phi48] = new TH1F(ss.str().c_str(), (ss.str() + ";Wire #; Events").c_str(),m_nWireTGCSingleLayerInPhi48Division[tgc] , 0, m_nWireTGCSingleLayerInPhi48Division[tgc]); sc=tgcprd_profile_ac[ac]->regHist(tgcwireprofilephi48[ac][i][phi48]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -360,7 +360,7 @@ TgcRawDataValAlg::bookHistogramsProfile(){ tgcstripprofilephi48[ac][i][phi48] = new TH1F(ss.str().c_str(), (ss.str() + ";Strip #; Events" ).c_str(),m_nStripTGCSingleLayerInPhi48Division[tgc] , 0, m_nStripTGCSingleLayerInPhi48Division[tgc]); sc=tgcprd_profile_ac[ac]->regHist(tgcstripprofilephi48[ac][i][phi48]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx index 045509c28cc..0eb31462f2a 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_ReadContainer.cxx @@ -91,7 +91,7 @@ TgcRawDataValAlg::readTgcPrepDataContainer(const Muon::TgcPrepDataContainer* tgc containerIt!=container_end; ++containerIt){ if(containerIt==container_end || (*containerIt)->size()==0)continue; //check if there are counts - if(m_debuglevel) m_log << MSG::DEBUG << "size of tgc collection is " << (*containerIt) -> size() << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << "size of tgc collection is " << (*containerIt) -> size() << endmsg; // Increment Collection counter m_nColl++; @@ -194,18 +194,18 @@ TgcRawDataValAlg::readTgcPrepDataContainer(const Muon::TgcPrepDataContainer* tgc m_hitPosPhi[ac][ws].push_back(channelPos.phi()); } - if(m_debuglevel) m_log << MSG::DEBUG << " TgcPrepData number: " << m_nPrd << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << " TgcPrepData number: " << m_nPrd << endmsg; if(m_nPrd>m_maxPrd-1){ - m_log << MSG::WARNING << "Maximum number of TgcPrepData in the Histograms reached: " << m_maxPrd << endreq; + m_log << MSG::WARNING << "Maximum number of TgcPrepData in the Histograms reached: " << m_maxPrd << endmsg; return; } }// Collection - if(m_debuglevel) m_log << MSG::DEBUG << " TgcCollection number " << m_nColl << endreq; + if(m_debuglevel) m_log << MSG::DEBUG << " TgcCollection number " << m_nColl << endmsg; if(m_nColl>m_maxColl-1){ m_log << MSG::WARNING << "Maximum number of TgcPrepDataCollection in the TGCRawData Monitoring Histos reached: " - << m_maxColl << endreq; + << m_maxColl << endmsg; return; } }// Container 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 b8ad5e38d17..04adf69c3c9 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_Summary_LowStat.cxx @@ -53,7 +53,7 @@ using namespace std; StatusCode TgcRawDataValAlg::bookHistogramsSummary(){ - m_log << MSG::INFO << "bookHistogramsSummary" << endreq; + m_log << MSG::INFO << "bookHistogramsSummary" << endmsg; StatusCode sc=StatusCode::SUCCESS; /////////////////////////////////////////////////////////////////////////// @@ -74,7 +74,7 @@ TgcRawDataValAlg::bookHistogramsSummary(){ tgcsummaryoflog10wireoccupancypergasgap[i]=new TH1F(ss.str().c_str(), (ss.str() + ";log10(Occupancy); Entries").c_str(),80,-8.,0.); sc=tgcprd_summary_ac[i]->regHist(tgcsummaryoflog10wireoccupancypergasgap[i]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } @@ -82,7 +82,7 @@ TgcRawDataValAlg::bookHistogramsSummary(){ tgcsummaryoflog10stripoccupancypergasgap[i]=new TH1F(ss.str().c_str(), (ss.str() + ";log10(Occupancy); Entries" ).c_str(),80,-8.,0.); sc=tgcprd_summary_ac[i]->regHist(tgcsummaryoflog10stripoccupancypergasgap[i]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << " Failed to register histogram " << endmsg; return sc; } }// side @@ -115,7 +115,7 @@ TgcRawDataValAlg::bookHistogramsSummary(){ tgcsummaryoflog10wireoccupancyperchambertype[ntype]=new TH1F(ss.str().c_str(), ( ss.str() + ";log10(Occupancy); Entries").c_str(),80,-8.,0.); sc=tgcprd_summary.regHist(tgcsummaryoflog10wireoccupancyperchambertype[ntype]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgcsummaryoflog10wireoccupancyperchambertype["<<ntype<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgcsummaryoflog10wireoccupancyperchambertype["<<ntype<<"] Failed to register histogram " << endmsg; return sc; } // Summary @@ -123,7 +123,7 @@ TgcRawDataValAlg::bookHistogramsSummary(){ tgcsummaryoflog10stripoccupancyperchambertype[ntype]=new TH1F(ss.str().c_str(), ( ss.str() + ";log10(Occupancy); Entries").c_str(),80,-8.,0.); sc=tgcprd_summary.regHist(tgcsummaryoflog10stripoccupancyperchambertype[ntype]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << "tgcsummaryoflog10stripoccupancyperchambertype["<<ntype<<"] Failed to register histogram " << endreq; + m_log << MSG::FATAL << "tgcsummaryoflog10stripoccupancyperchambertype["<<ntype<<"] Failed to register histogram " << endmsg; return sc; } ntype++; @@ -137,7 +137,7 @@ TgcRawDataValAlg::bookHistogramsSummary(){ StatusCode TgcRawDataValAlg::bookHistogramsLowStat(){ - m_log << MSG::INFO << "bookHistogramsLowStat" << endreq; + m_log << MSG::INFO << "bookHistogramsLowStat" << endmsg; StatusCode sc=StatusCode::SUCCESS; MonGroup tgcprd_lowstat_a( this, generic_path_tgcmonitoring + "/TGCEA", lowStat, ATTRIB_UNMANAGED ); @@ -156,7 +156,7 @@ TgcRawDataValAlg::bookHistogramsLowStat(){ tgcwirestripcoinlowstat[ac] = new TH2F( ss.str().c_str(), ss.str() .c_str(),43, 0, 43, 48, 1, 49 ); sc=tgcprd_lowstat_ac[ac]->regHist(tgcwirestripcoinlowstat[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx index c5f22b16645..d1330ba80c7 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataValAlg_XYView.cxx @@ -60,7 +60,7 @@ TgcRawDataValAlg::bookHistogramsXYView(){ // XY_View_A_Layer[1-9] // XY_View_C_Layer[1-9] - m_log << MSG::INFO << "bookHistogramsXYView" << endreq; + m_log << MSG::INFO << "bookHistogramsXYView" << endmsg; StatusCode sc=StatusCode::SUCCESS; @@ -81,7 +81,7 @@ TgcRawDataValAlg::bookHistogramsXYView(){ tgcxyview[ac] = new TH2F( ss.str().c_str(), (ss.str() + ";X [cm]; Y[cm]").c_str(),120,-1200,1200,120,-1200,1200 );//20cmx20cm cell sc=tgcprd_shift_ac[ac]->regHist(tgcxyview[ac]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() << "Failed to register histogram " << endmsg; return sc; } @@ -94,7 +94,7 @@ TgcRawDataValAlg::bookHistogramsXYView(){ tgcxyviewlayer[ac][i] = new TH2F(ss.str().c_str(), (ss.str() + ";X [cm]; Y [cm]").c_str(),120,-1200,1200,120,-1200,1200 );//20cmx20cm cell sc=tgcprd_expert_ac[ac]->regHist(tgcxyviewlayer[ac][i]) ; if(sc.isFailure()) { - m_log << MSG::FATAL << ss.str() <<" Failed to register histogram " << endreq; + m_log << MSG::FATAL << ss.str() <<" Failed to register histogram " << endmsg; return sc; } }//loop over layer diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx index ab85ceecbcb..7e3b87030bc 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx @@ -41,37 +41,37 @@ namespace JiveXML { */ StatusCode AODCaloClusterRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<CaloClusterContainer> iterator, end; const CaloClusterContainer* ccc; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endmsg; StatusCode sc = evtStore()->retrieve(ccc, m_sgKeyFavourite); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ DataMap data = getData(ccc, false); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKeyFavourite, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") AODCaloCluster retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") AODCaloCluster retrieved" << endmsg; } } // uncalibrated topo clusters: calibFlag=true //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve CaloCalTopoCluster (for non-calib)" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve CaloCalTopoCluster (for non-calib)" << endmsg; StatusCode sc3 = evtStore()->retrieve(ccc, "CaloCalTopoCluster"); if (sc3.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection CaloCalTopoCluster (for non-calib) not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection CaloCalTopoCluster (for non-calib) not found in SG " << endmsg; }else{ DataMap data = getData(ccc, true); // calibFlag: If true, use getBasicEnergy() instead of et() if ( FormatTool->AddToEvent(dataTypeName(), "BasicEnergyCaloCalTopoCluster", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection CaloCalTopoCluster (for non-calib) not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection CaloCalTopoCluster (for non-calib) not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " CaloCalTopoCluster (for non-calib) AODCaloCluster retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " CaloCalTopoCluster (for non-calib) AODCaloCluster retrieved" << endmsg; } } @@ -79,7 +79,7 @@ namespace JiveXML { //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << - "Unable to retrieve iterator for AODCaloCluster collection" << endreq; + "Unable to retrieve iterator for AODCaloCluster collection" << endmsg; // return false; } @@ -89,15 +89,15 @@ namespace JiveXML { if ( m_doWriteHLT ){ position = 99; } // override SG key find // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " AODCaloCluster: HLTAutoKey in " << iterator.key() << " at position " -// << position << endreq; +// << position << endmsg; if ( position != 0 ){ // SG key doesn't contain HLTAutoKey if (iterator.key()!=m_sgKeyFavourite) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator, false); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") AODCaloCluster retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") AODCaloCluster retrieved" << endmsg; } } } @@ -108,12 +108,12 @@ namespace JiveXML { for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){ StatusCode sc = evtStore()->retrieve( ccc, (*keyIter) ); if (!sc.isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endmsg; DataMap data = getData(ccc, false); if ( FormatTool->AddToEvent(dataTypeName(), (*keyIter), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endmsg; } } } @@ -131,7 +131,7 @@ namespace JiveXML { */ const DataMap AODCaloClusterRetriever::getData(const CaloClusterContainer* ccc, bool calibFlag) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endmsg; DataMap m_DataMap; @@ -192,7 +192,7 @@ namespace JiveXML { labelVec.push_back( label ); if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "label is " << label << endreq; + msg(MSG::DEBUG) << "label is " << label << endmsg; } // now the standard variables @@ -214,7 +214,7 @@ namespace JiveXML { // if (msgLvl(MSG::DEBUG)) { // msg(MSG::DEBUG) << dataTypeName() << " cluster basic=" << (*itr)->getBasicEnergy()/CLHEP::GeV << " ,e=" << (*itr)->e()/CLHEP::GeV << ", et="; // msg(MSG::DEBUG) << (*itr)->et()/CLHEP::GeV << ", eta=" << (*itr)->eta() << ", phi=" << (*itr)->phi() << ", sinTheta=" << -// (*itr)->sinTh() << ",calc=" << ((*itr)->getBasicEnergy()/CLHEP::GeV)*((*itr)->sinTh()) << endreq; +// (*itr)->sinTh() << ",calc=" << ((*itr)->getBasicEnergy()/CLHEP::GeV)*((*itr)->sinTh()) << endmsg; // } } @@ -231,7 +231,7 @@ namespace JiveXML { //Be verbose if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << dataTypeName() << " (AOD, no cells), collection: " << dataTypeName(); - msg(MSG::DEBUG) << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx index 18e66ebb4a5..2ab4102d290 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx @@ -38,29 +38,29 @@ namespace JiveXML { */ StatusCode AODJetRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<JetCollection> iterator, end; const JetCollection* jets; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endmsg; StatusCode sc = evtStore()->retrieve(jets, m_sgKeyFavourite); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ DataMap data = getData(jets); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKeyFavourite+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") AODJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") AODJet retrieved" << endmsg; } } if ( m_otherKeys.empty() ) { //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return false; } @@ -70,15 +70,15 @@ namespace JiveXML { if ( m_doWriteHLT ){ position = 99; } // override SG key find // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " AODJet: HLTAutoKey in " << iterator.key() << " at position " -// << position << endreq; +// << position << endmsg; if ( position != 0 ){ // SG key doesn't contain HLTAutoKey if (iterator.key()!=m_sgKeyFavourite) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key()+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") AODJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") AODJet retrieved" << endmsg; } } } @@ -90,12 +90,12 @@ namespace JiveXML { if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG StatusCode sc = evtStore()->retrieve( jets, (*keyIter) ); if (!sc.isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endmsg; DataMap data = getData(jets); if ( FormatTool->AddToEvent(dataTypeName(), (*keyIter)+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endmsg; } } } @@ -113,7 +113,7 @@ namespace JiveXML { */ const DataMap AODJetRetriever::getData(const JetCollection* jets) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endmsg; DataMap m_DataMap; @@ -291,7 +291,7 @@ namespace JiveXML { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << dataTypeName() << " (AOD, no cells), collection: " << dataTypeName(); - msg(MSG::DEBUG) << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx index 1c90b6a0b64..5607d84fb32 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx @@ -39,29 +39,29 @@ namespace JiveXML { */ StatusCode BJetRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<JetCollection> iterator, end; const JetCollection* jets; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKeyFavourite << ")" << endmsg; StatusCode sc = evtStore()->retrieve(jets, m_sgKeyFavourite); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ DataMap data = getData(jets); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKeyFavourite+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKeyFavourite << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") BJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKeyFavourite << ") BJet retrieved" << endmsg; } } if ( m_otherKeys.empty() ) { //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return false; } @@ -71,15 +71,15 @@ namespace JiveXML { if ( m_doWriteHLT ){ position = 99; } // override SG key find // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " BJet: HLTAutoKey in " << iterator.key() << " at position " -// << position << endreq; +// << position << endmsg; if ( position != 0 ){ // SG key doesn't contain HLTAutoKey if (iterator.key()!=m_sgKeyFavourite) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key()+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") BJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") BJet retrieved" << endmsg; } } } @@ -91,12 +91,12 @@ namespace JiveXML { if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG StatusCode sc = evtStore()->retrieve( jets, (*keyIter) ); if (!sc.isFailure()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve selected " << dataTypeName() << " (" << (*keyIter) << ")" << endmsg; DataMap data = getData(jets); if ( FormatTool->AddToEvent(dataTypeName(), (*keyIter)+"_AOD", &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << (*keyIter) << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << (*keyIter) << ") retrieved" << endmsg; } } } @@ -115,7 +115,7 @@ namespace JiveXML { */ const DataMap BJetRetriever::getData(const JetCollection* jets) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endmsg; DataMap m_DataMap; @@ -139,7 +139,7 @@ namespace JiveXML { std::string myLabel ="none"; if ( jets->size() == 0 ){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "JetCollection for BJets is empty" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "JetCollection for BJets is empty" << endmsg; }else{ JetCollection::const_iterator itr = jets->begin(); for (; itr != jets->end(); ++itr) { @@ -201,7 +201,7 @@ namespace JiveXML { if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << dataTypeName() << " BJets (AOD, no cells), collection: " << dataTypeName(); msg(MSG::DEBUG) << " retrieved with " << phi.size() << " entries, weight cut set to: " - << m_weightCut << endreq; + << m_weightCut << endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/CompositeParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/CompositeParticleRetriever.cxx index 22752eddfc9..1c43aa973de 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/CompositeParticleRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/CompositeParticleRetriever.cxx @@ -39,39 +39,39 @@ namespace JiveXML { */ StatusCode CompositeParticleRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<CompositeParticleContainer> iterator, end; const CompositeParticleContainer* compPart; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endmsg; StatusCode sc = evtStore()->retrieve(compPart, m_sgKey); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ DataMap data = getData(compPart); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKey, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") CompositeParticle retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") CompositeParticle retrieved" << endmsg; } } //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return StatusCode::WARNING; } for (; iterator!=end; iterator++) { if (iterator.key()!=m_sgKey) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") CompositeParticle retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") CompositeParticle retrieved" << endmsg; } } } @@ -86,7 +86,7 @@ namespace JiveXML { */ const DataMap CompositeParticleRetriever::getData(const CompositeParticleContainer* cpcont) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endmsg; DataMap m_DataMap; @@ -172,7 +172,7 @@ namespace JiveXML { // m_DataMap["motherID"] = motherID; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx index 1f847e7624b..c1fcf31a5e1 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx @@ -38,39 +38,39 @@ namespace JiveXML { */ StatusCode ElectronRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<ElectronContainer> iterator, end; const ElectronContainer* electrons; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endmsg; StatusCode sc = evtStore()->retrieve(electrons, m_sgKey); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ DataMap data = getData(electrons); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKey, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Electron retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Electron retrieved" << endmsg; } } //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return StatusCode::WARNING; } for (; iterator!=end; iterator++) { if (iterator.key()!=m_sgKey) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Electron retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Electron retrieved" << endmsg; } } } @@ -85,7 +85,7 @@ namespace JiveXML { */ const DataMap ElectronRetriever::getData(const ElectronContainer* elCont) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endmsg; DataMap m_DataMap; @@ -241,7 +241,7 @@ namespace JiveXML { std::string clusterKey = clusterLink.dataID(); // Storegate key of int clusterIndex = clusterLink.index(); // index into the contianer // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << counter << " CaloCluster " << clusterKey << " ," -// << " Index " << clusterIndex << " " << endreq; +// << " Index " << clusterIndex << " " << endmsg; clusterKeyVec.push_back(DataType( clusterKey )); clusterIndexVec.push_back(DataType( clusterIndex )); @@ -255,7 +255,7 @@ namespace JiveXML { std::string trackKey = trackLink.dataID(); // Storegate key of int trackIndex = trackLink.index(); // index into the contianer // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << counter << " TrackParticle " << trackKey << " ," - // << " Index " << trackIndex << " " << endreq; + // << " Index " << trackIndex << " " << endmsg; trackKeyVec.push_back(DataType( trackKey )); trackIndexVec.push_back(DataType( trackIndex)); @@ -321,7 +321,7 @@ namespace JiveXML { m_DataMap["trackIndex"] = trackIndexVec; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/MuonRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/MuonRetriever.cxx index cb814a82b58..b221ab22498 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/MuonRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/MuonRetriever.cxx @@ -38,28 +38,28 @@ namespace JiveXML { */ StatusCode MuonRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<Analysis::MuonContainer> iterator, end; const Analysis::MuonContainer* muCont; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endmsg; StatusCode sc = evtStore()->retrieve(muCont, m_sgKey); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ DataMap data = getData(muCont); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKey, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Muon retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Muon retrieved" << endmsg; } } //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return StatusCode::WARNING; } @@ -69,12 +69,12 @@ namespace JiveXML { (iterator.key() != "CaloESDMuonCollection" )) { //// was: // if (iterator.key()!=m_sgKey) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Muon retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Muon retrieved" << endmsg; } } } @@ -89,7 +89,7 @@ namespace JiveXML { */ const DataMap MuonRetriever::getData(const Analysis::MuonContainer* muoncont) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endmsg; DataMap m_DataMap; @@ -159,7 +159,7 @@ namespace JiveXML { " Muon: matchChi2OverDoF: " << (*muonItr)->matchChi2OverDoF() << ", matchChi2: " << (*muonItr)->matchChi2() << ", fitChi2: " << (*muonItr)->fitChi2() << - ", isCombined: " << (int)(*muonItr)->isCombinedMuon() << endreq; + ", isCombined: " << (int)(*muonItr)->isCombinedMuon() << endmsg; // parameters for associations: // stricly speaking, these should be ElementLinkVectors (see TauJet association) @@ -219,7 +219,7 @@ namespace JiveXML { m_DataMap["trackIndex"] = trackIndexVec; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/PhotonRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/PhotonRetriever.cxx index 78a2c99a7ed..f2d92458204 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/PhotonRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/PhotonRetriever.cxx @@ -35,39 +35,39 @@ namespace JiveXML { */ StatusCode PhotonRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<PhotonContainer> iterator, end; const PhotonContainer* photons; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endmsg; StatusCode sc = evtStore()->retrieve(photons, m_sgKey); if (sc.isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ DataMap data = getData(photons); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKey, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Photon retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") Photon retrieved" << endmsg; } } //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return StatusCode::WARNING; } for (; iterator!=end; iterator++) { if (iterator.key()!=m_sgKey) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Photon retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") Photon retrieved" << endmsg; } } } @@ -82,7 +82,7 @@ namespace JiveXML { */ const DataMap PhotonRetriever::getData(const PhotonContainer* photcont) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "retrieve()" << endmsg; DataMap m_DataMap; @@ -161,7 +161,7 @@ namespace JiveXML { pz.push_back( DataType((*photonItr)->pz()/CLHEP::GeV ) ); m_MCdataType = (*photonItr)->dataType(); - // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Which MC datatype, fast or full ? " << m_dataType() << " (" << m_sgKey << ")" << endreq; + // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Which MC datatype, fast or full ? " << m_dataType() << " (" << m_sgKey << ")" << endmsg; if (m_MCdataType != 3){ // full simulation isEM.push_back( DataType((**photonItr).isem()) ); @@ -181,7 +181,7 @@ namespace JiveXML { const EMShower* m_EMShower = (*photonItr)->detail<EMShower>("egDetailAOD"); if (m_EMShower) { //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "found photon shower, example wtots=" - // << m_EMShower->parameter(egammaParameters::wtots1) << endreq; + // << m_EMShower->parameter(egammaParameters::wtots1) << endmsg; f1Vec.push_back( DataType( m_EMShower->parameter(egammaParameters::f1) )); etConeVec.push_back(DataType( m_EMShower->parameter(egammaParameters::etcone20))); fracs1Vec.push_back(DataType( m_EMShower->parameter(egammaParameters::fracs1))); @@ -232,7 +232,7 @@ namespace JiveXML { m_DataMap["label"] = label; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TauJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TauJetRetriever.cxx index 5ce84c8173e..581a15c60f9 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TauJetRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TauJetRetriever.cxx @@ -44,52 +44,52 @@ namespace JiveXML { */ StatusCode TauJetRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in retrieveAll()" << endmsg; const DataHandle<Analysis::TauJetContainer> iterator, end; const Analysis::TauJetContainer* tauCont; //obtain the default collection first - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve " << dataTypeName() << " (" << m_sgKey << ")" << endmsg; StatusCode sc = evtStore()->retrieve(tauCont, m_sgKey); if (sc.isFailure()) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ if ( tauCont->size() > 0){ // check that collection is not empty DataMap data = getData(tauCont); if ( FormatTool->AddToEvent(dataTypeName(), m_sgKey, &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << m_sgKey << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") TauJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << m_sgKey << ") TauJet retrieved" << endmsg; } } } //obtain all other collections from StoreGate if (( evtStore()->retrieve(iterator, end)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve iterator for Jet collection" << endmsg; // return StatusCode::WARNING; } for (; iterator!=end; iterator++) { m_fastSimSGFlag = false; //reset - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Trying TauJets from: " << iterator.key() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Trying TauJets from: " << iterator.key() << endmsg; std::string::size_type position = iterator.key().find("HLT",0); // special case. Normally: HLTAutokey // some Atlfast collections wrongly assign 'Full' to DataType: std::string::size_type positionFast = iterator.key().find("Atlfast",0); if ( positionFast == 0){ m_fastSimSGFlag = true; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " SG key Atlfast collection: Fast Sim " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " SG key Atlfast collection: Fast Sim " << endmsg; }; if ( m_doWriteHLT ){ position = 99; } // override SG key find if ( position != 0 ){ // SG key doesn't contain HLTAutoKey if ( iterator.key()!=m_sgKey) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Trying to retrieve all " << dataTypeName() << " (" << iterator.key() << ")" << endmsg; DataMap data = getData(iterator); if ( FormatTool->AddToEvent(dataTypeName(), iterator.key(), &data).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Collection " << iterator.key() << " not found in SG " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") TauJet retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " (" << iterator.key() << ") TauJet retrieved" << endmsg; } } } @@ -105,7 +105,7 @@ namespace JiveXML { */ const DataMap TauJetRetriever::getData(const Analysis::TauJetContainer* taucont) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in getData()" << endmsg; DataMap m_DataMap; @@ -154,11 +154,11 @@ namespace JiveXML { } if(m_checkDataType){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TauJet Datatype: Full Sim " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TauJet Datatype: Full Sim " << endmsg; }else{ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TauJet Datatype: Fast Sim " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TauJet Datatype: Fast Sim " << endmsg; } - // if ( m_fastSimSGFlag ){ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " fastSimSGFlag set ! " << endreq; } + // if ( m_fastSimSGFlag ){ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " fastSimSGFlag set ! " << endmsg; } unsigned int countTrackLinks = 0; unsigned int numTauJets = 0; @@ -166,7 +166,7 @@ namespace JiveXML { std::string trackKeyString = "trackKey"; // default: n/a or fast sim std::string trackIndexString = "trackIndex"; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Number of TauJets: " << taucont->size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Number of TauJets: " << taucont->size() << endmsg; if (m_checkDataType && !m_fastSimSGFlag){ // full sim for (; taujetItr != taujetItrE; ++taujetItr) { // first, just count trackKey for multiple const ElementLinkVector<Rec::TrackParticleContainer> myTrackLinkVector = (*taujetItr)->trackLinkVector(); @@ -183,7 +183,7 @@ namespace JiveXML { } // full sim if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " trackKeyString: " << trackKeyString << - " trackIndexString: " << trackIndexString << endreq; + " trackIndexString: " << trackIndexString << endmsg; std::string labelStr = "none"; std::string isTauStr = "none"; @@ -230,7 +230,7 @@ namespace JiveXML { if ((*taujetItr)->tauID()->isTau(TauJetParameters::TauCutTight)){ isTauStr = "TauCutTight"; labelStr += "_TauCutTight"; } if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TauJet # " << (++id) - << ", label:" << labelStr << endreq; + << ", label:" << labelStr << endmsg; isTauString.push_back (isTauStr); label.push_back( labelStr ); // obsolete, only for backwards compatibility @@ -275,7 +275,7 @@ namespace JiveXML { int trackIndex = trackParticleLink.index(); if ( trackParticleLink.isValid()){ // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " TrackParticle " << trackKey << " ," - // << " Index " << trackIndex << " " << endreq; + // << " Index " << trackIndex << " " << endmsg; trackKeyVec.push_back(DataType( trackKey )); trackIndexVec.push_back(DataType( trackIndex)); @@ -339,7 +339,7 @@ namespace JiveXML { m_DataMap["trackLinkCount"] = trackLinkCountVec; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endreq; + msg(MSG::DEBUG) << dataTypeName() << " retrieved with " << phi.size() << " entries"<< endmsg; } //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx index f6ea528ab01..12bbdd5739a 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx @@ -101,7 +101,7 @@ namespace JiveXML { StatusCode TrackParticleRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving AOD TrackParticle" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving AOD TrackParticle" << endmsg; //Generate a list of requested track collections typedef std::pair< Rec::TrackParticleContainer , std::string > tracksNamePair; @@ -111,7 +111,7 @@ namespace JiveXML { const Rec::TrackParticleContainer* tracks = NULL ; if (evtStore()->retrieve(tracks, m_PriorityTrackCollection).isFailure()){ if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve requested priority track collection " - << m_PriorityTrackCollection << endreq; + << m_PriorityTrackCollection << endmsg; } else { //Add this to the list of requested collections requestedTrackColls.push_back(tracksNamePair(*tracks,m_PriorityTrackCollection)); @@ -124,7 +124,7 @@ namespace JiveXML { for ( ; CollNameItr != m_OtherTrackCollections.end(); ++CollNameItr){ const Rec::TrackParticleContainer* tracks = NULL ; if (evtStore()->retrieve(tracks, (*CollNameItr)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve requested track collection " << (*CollNameItr) << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve requested track collection " << (*CollNameItr) << endmsg; continue ; } @@ -146,7 +146,7 @@ namespace JiveXML { //Get an iterator over all other track collections const DataHandle<Rec::TrackParticleContainer> trackCollIter, trackCollEnd; if ((evtStore()->retrieve(trackCollIter, trackCollEnd)).isFailure()){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve track collection iterator" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Unable to retrieve track collection iterator" << endmsg; return StatusCode::SUCCESS; } @@ -158,20 +158,20 @@ namespace JiveXML { //Check if this is an HLT-AutoKey collection if ((trackCollIter.key().find("HLT",0) != std::string::npos) && (!m_doWriteHLT)){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring HLT-AutoKey collection " << trackCollIter.key() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring HLT-AutoKey collection " << trackCollIter.key() << endmsg; continue ; } // Veto AtlfastTrackParticles as they have different parameter access method. // Retrieving them will lead to runtime crash currently. jpt 04Aug07 if ( (trackCollIter.key() =="AtlfastTrackParticles")) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Always ignoring collection " << trackCollIter.key() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Always ignoring collection " << trackCollIter.key() << endmsg; continue ; } //Next try to retrieve the actual collection if (evtStore()->retrieve(tracks,trackCollIter.key()).isFailure()){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve collection " << trackCollIter.key() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Unable to retrieve collection " << trackCollIter.key() << endmsg; continue ; } @@ -199,9 +199,9 @@ namespace JiveXML { //Some sanity checks if ( tpc->size() == 0){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring empty track collection " << collectionName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Ignoring empty track collection " << collectionName << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving data for track collection " << collectionName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving data for track collection " << collectionName << endmsg; } // Make a list of track-wise entries and reserve enough space @@ -248,8 +248,8 @@ namespace JiveXML { "_BLayerHits"+DataType( nBLayerHits ).toString() + "_TRTHits"+DataType( nTRTHits ).toString() ; if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Author: " << (*tpcItr)->info().trackFitter() << " Pixel hits: " << nPixelHits << ", SCT hits: " << nSCTHits << " BLayer hits: " << nBLayerHits - << ", TRT hits: " << nTRTHits << ", pT[GeV]= " << (*tpcItr)->perigee()->pT()/1000. << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Label: " << labelStr << endreq; + << ", TRT hits: " << nTRTHits << ", pT[GeV]= " << (*tpcItr)->perigee()->pT()/1000. << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Label: " << labelStr << endmsg; } if (((*tpcItr)->perigee()->parameters())[Trk::qOverP]==0) { @@ -359,7 +359,7 @@ namespace JiveXML { return StatusCode::RECOVERABLE; //Be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " collection " << collectionName << " retrieved with " << id.size() << " entries"<< endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << " collection " << collectionName << " retrieved with " << id.size() << " entries"<< endmsg; } //loop over track collections //All collections retrieved okay diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrigEMClusterRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrigEMClusterRetriever.cxx index ff7f5afffa4..1f73ec49f54 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrigEMClusterRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrigEMClusterRetriever.cxx @@ -33,12 +33,12 @@ namespace JiveXML { if ( evtStore()->retrieve(tec,m_sgKey).isFailure() ) { if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "No TrigEMCluster found in SG at " - << m_sgKey << endreq; + << m_sgKey << endmsg; return StatusCode::SUCCESS; } int noClu = tec->size(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieving TrigEMCluster with size " << noClu << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieving TrigEMCluster with size " << noClu << endmsg; DataVect et; et.reserve(noClu); DataVect phi; phi.reserve(noClu); @@ -72,7 +72,7 @@ namespace JiveXML { myDataMap[tagCells] = cells; myDataMap["numCells"] = numCells; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< phi.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< phi.size() << endmsg; //forward data to formating tool return FormatTool->AddToEvent(dataTypeName(), m_sgKey, &myDataMap); diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx index d131b4ef64a..166b5d82a0c 100755 --- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx +++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx @@ -37,17 +37,17 @@ namespace JiveXML { if ( !evtStore()->contains<TruthParticleContainer>(m_sgKey)){ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "No TruthParticle found in SG at " - << m_sgKey << endreq; + << m_sgKey << endmsg; return StatusCode::SUCCESS; } if ( evtStore()->retrieve(truthCont,m_sgKey).isFailure() ) { if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TruthParticle retrieval from SG failed " - << m_sgKey << endreq; + << m_sgKey << endmsg; return StatusCode::SUCCESS; } int nTruth = truthCont->size(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieving TruthParticles with size " << nTruth << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Retrieving TruthParticles with size " << nTruth << endmsg; //code from: PhysicsAnalysis/HiggsPhys/HiggsToFourLeptons/src/H4lElectronPerformanceTool.cxx @@ -115,12 +115,12 @@ namespace JiveXML { // jump to next particle (ignore) if PdgId is same as mother if (m_skimTruth){ // some skimming criteria for simpler display of Truth if ( !initialProcessFlag && !protectedParticleFlag ){ - // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Particle rejected: not initial process " << endreq; + // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Particle rejected: not initial process " << endmsg; continue; } } if ( samePdgIdFlag ){ - // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Particle rejected: Same PdgId " << endreq; + // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Particle rejected: Same PdgId " << endmsg; continue; } @@ -130,7 +130,7 @@ namespace JiveXML { dataType.push_back( DataType( (*mcpartItr)->dataType() )); // if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " TruthParticle No:" << countTruth << " pt:" -// << (*mcpartItr)->et()/CLHEP::GeV << endreq; +// << (*mcpartItr)->et()/CLHEP::GeV << endmsg; pdgId.push_back( DataType( m_pdgId )); @@ -285,11 +285,11 @@ namespace JiveXML { } // end of hasMotherPdgId } // end of MotherParticle loop countTruth++; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TruthParticles label: " << DataType( truthLabels ).toString() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TruthParticles label: " << DataType( truthLabels ).toString() << endmsg; label.push_back( DataType( truthLabels ).toString() ); typeLabelStr.push_back( DataType( typeLabel ).toString() ); - // log << MSG::DEBUG << "TruthParticles status: " << statusList << endreq; + // log << MSG::DEBUG << "TruthParticles status: " << statusList << endmsg; } // end of TruthParticle Loop DataMap myDataMap; myDataMap["pt"] = pt; @@ -301,7 +301,7 @@ namespace JiveXML { myDataMap["pdgId"] = pdgId; myDataMap["dataType"] = dataType; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< phi.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< phi.size() << endmsg; //forward data to formating tool return FormatTool->AddToEvent(dataTypeName(), m_sgKey, &myDataMap); diff --git a/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/src/RawInfoSummaryForTagCnv.cxx b/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/src/RawInfoSummaryForTagCnv.cxx index ac7e46c5ce7..72b8cf2707f 100755 --- a/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/src/RawInfoSummaryForTagCnv.cxx +++ b/PhysicsAnalysis/EventTag/EventTagAthenaPOOL/src/RawInfoSummaryForTagCnv.cxx @@ -18,7 +18,7 @@ TRANS* RawInfoSummaryForTagCnv::createTransient() static pool::Guid p1_guid( "4CBBDF6D-4A58-42A9-9B26-534676C52F4C" ); MsgStream mlog(messageService(), "RawInfoSummaryForTagCnv" ); - mlog << MSG::DEBUG << "createTransient()" << endreq; + mlog << MSG::DEBUG << "createTransient()" << endmsg; if( compareClassGuid( p1_guid ) ) { // using auto_ptr ensures deletion of the persistent object @@ -34,6 +34,6 @@ TRANS* RawInfoSummaryForTagCnv::createTransient() PERS* RawInfoSummaryForTagCnv::createPersistent(TRANS* transObj) { MsgStream mlog(messageService(), "RawInfoSummaryForTagCnv" ); - mlog << MSG::DEBUG << "createPersistent()" << endreq; + mlog << MSG::DEBUG << "createPersistent()" << endmsg; return m_TPConverter.createPersistent( transObj, mlog ); } diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BJetBuilder.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BJetBuilder.cxx index 4ff69cb0323..3c449196dc9 100755 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BJetBuilder.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BJetBuilder.cxx @@ -224,7 +224,7 @@ namespace Analysis { if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "#BTAG# Jet " << ijet << " Eta= " << p4.pseudoRapidity() << " Phi= " << p4.phi() << " Et= " << p4.et() - << " passed: " << pass << endreq; + << " passed: " << pass << endmsg; /** All jets are passed through the taggers (if requested). */ if ( ( pass || m_tagJetIfNotSelected ) ) { @@ -291,7 +291,7 @@ namespace Analysis { << nmuo << " muons, " << nmuo2<< " second muons, " << nele << " electrons and " - << npho << " potential softE photons." << endreq; + << npho << " potential softE photons." << endmsg; msg(MSG::VERBOSE) << "#BTAG# -> TAGRESULT for JET " << ijet << " : " << " label= " << label << " IP2D= " << jetToTag.getFlavourTagWeight("IP2D") @@ -299,7 +299,7 @@ namespace Analysis { << " JetProb= " << jetToTag.getFlavourTagWeight("JetProb") << " SV0= " << jetToTag.getFlavourTagWeight("SV0") << " TC2= " << jetToTag.getFlavourTagWeight("TrackCounting2D") - << endreq; + << endmsg; ijet++; @@ -330,8 +330,8 @@ namespace Analysis { << "b:" << m_nbbjettagged << ", " << "c:" << m_nbcjettagged << ", " << "tau:" << m_nbtjettagged << ", " - << "light:" << nbl << ") " << endreq; - else msg(MSG::INFO) << endreq; + << "light:" << nbl << ") " << endmsg; + else msg(MSG::INFO) << endmsg; std::string ConstitSumm = m_isMC ? "#BTAG# b-tagging summary for b-jet constituents: " : "#BTAG# b-tagging summary for jet constituents: "; @@ -341,44 +341,44 @@ namespace Analysis { << " <#mu>=" << (nalljet>0 ? m_ncmu/(float)nalljet : 0) << " <#mu2>="<< (nalljet>0 ? m_ncmu2/(float)nalljet : 0) << " <#el>=" << (nalljet>0 ? m_ncel/(float)nalljet : 0) - << endreq; + << endmsg; msg(MSG::INFO) << "#BTAG# b-tagging summary for TrackCounting: " << "<w_all>=" << (m_nbjettagged>0 ? m_watrkc/(float)m_nbjettagged : 0); if (m_isMC) msg(MSG::INFO) << " <w_b>=" << (m_nbbjettagged>0 ? m_wbtrkc/(float)m_nbbjettagged : 0) << " <w_u>=" << (nbl>0 ? m_wutrkc/(float)nbl : 0) - << endreq; - else msg(MSG::INFO) << endreq; + << endmsg; + else msg(MSG::INFO) << endmsg; msg(MSG::INFO) << "#BTAG# b-tagging summary for JetProb: " << "<w_all>=" << (m_nbjettagged>0 ? m_wajetp/(float)m_nbjettagged : 0); if (m_isMC) msg(MSG::INFO) << " <w_b>=" << (m_nbbjettagged>0 ? m_wbjetp/(float)m_nbbjettagged : 0) << " <w_u>=" << (nbl>0 ? m_wujetp/(float)nbl : 0) - << endreq; - else msg(MSG::INFO) << endreq; + << endmsg; + else msg(MSG::INFO) << endmsg; msg(MSG::INFO) << "#BTAG# b-tagging summary for SV0: " << "<w_all>=" << (m_nbjettagged>0 ? m_wasv0/(float)m_nbjettagged : 0); if (m_isMC) msg(MSG::INFO) << " <w_b>=" << (m_nbbjettagged>0 ? m_wbsv0/(float)m_nbbjettagged : 0) << " <w_u>=" << (nbl>0 ? m_wusv0/(float)nbl : 0) - << endreq; - else msg(MSG::INFO) << endreq; + << endmsg; + else msg(MSG::INFO) << endmsg; /* msg(MSG::INFO) << "#BTAG# b-tagging summary for IP2D: " << "<w_all>=" << (m_nbjettagged>0 ? m_waip2d/(float)m_nbjettagged : 0); if (m_isMC) msg(MSG::INFO) << " <w_b>=" << (m_nbbjettagged>0 ? m_wbip2d/(float)m_nbbjettagged : 0) << " <w_u>=" << (nbl>0 ? m_wuip2d/(float)nbl : 0) - << endreq; - else msg(MSG::INFO) << endreq; + << endmsg; + else msg(MSG::INFO) << endmsg; */ msg(MSG::INFO) << "#BTAG# b-tagging summary for IP3D+SV1: " << "<w_all>=" << (m_nbjettagged>0 ? m_wacmb/(float)m_nbjettagged : 0); if (m_isMC) msg(MSG::INFO) << " <w_b>=" << (m_nbbjettagged>0 ? m_wbcmb/(float)m_nbbjettagged : 0) << " <w_u>=" << (nbl>0 ? m_wucmb/(float)nbl : 0) - << endreq; - else msg(MSG::INFO) << endreq; + << endmsg; + else msg(MSG::INFO) << endmsg; } return StatusCode::SUCCESS; diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTrackAssociation.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTrackAssociation.cxx index e22f76a469b..8612bd86c6f 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTrackAssociation.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagTrackAssociation.cxx @@ -86,14 +86,14 @@ namespace Analysis { // if(2*m_ElectronToJetAssociatorList.size() != m_ElectronContainerNameList.size() + m_PhotonContainerNameList.size()){ // because use the same tool for electrons and photons // msg( MSG::FATAL ) << "Size mismatch between electron/photon assoc tools(" // <<m_ElectronToJetAssociatorList.size()<<") and names( " - // <<m_ElectronContainerNameList.size()<< "+" << m_PhotonContainerNameList.size()<< ")" << endreq; + // <<m_ElectronContainerNameList.size()<< "+" << m_PhotonContainerNameList.size()<< ")" << endmsg; // return StatusCode::FAILURE; // } // if(m_ElectronToJetAssociatorList.retrieve().isFailure() ) { - // msg( MSG::FATAL ) << "Failed to retrieve tools " << m_ElectronToJetAssociatorList << endreq; + // msg( MSG::FATAL ) << "Failed to retrieve tools " << m_ElectronToJetAssociatorList << endmsg; // return StatusCode::FAILURE; // } else { - // msg( MSG::INFO ) << "Retrieved tools " << m_ElectronToJetAssociatorList << endreq; + // msg( MSG::INFO ) << "Retrieved tools " << m_ElectronToJetAssociatorList << endmsg; // } diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/CalibrationBroker.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/CalibrationBroker.cxx index 013008892dd..bc2e8723ebc 100755 --- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/CalibrationBroker.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/CalibrationBroker.cxx @@ -192,7 +192,7 @@ namespace Analysis { for(uint i=0;i<m_channels.size();i++) { if( msgLvl(MSG::DEBUG) )msg(MSG::DEBUG)<< " " << m_channels[i]; } - if( msgLvl(MSG::DEBUG) )msg(MSG::DEBUG)<<endreq; + if( msgLvl(MSG::DEBUG) )msg(MSG::DEBUG)<<endmsg; for(uint i=0;i<m_folders.size();i++) { ATH_MSG_DEBUG("#BTAG# folder " << m_folders[i] << " contains " << m_histos[i].size() << " histograms:" ); @@ -211,7 +211,7 @@ namespace Analysis { } else { if( msgLvl(MSG::VERBOSE) )msg(MSG::VERBOSE)<< " NOT YET DEFINED"; } - if( msgLvl(MSG::VERBOSE) )msg(MSG::VERBOSE)<< endreq; + if( msgLvl(MSG::VERBOSE) )msg(MSG::VERBOSE)<< endmsg; } } } diff --git a/PhysicsAnalysis/TauID/TauTrackEvent/src/TruthTau.cxx b/PhysicsAnalysis/TauID/TauTrackEvent/src/TruthTau.cxx index c662c81f755..3f56afbccc9 100644 --- a/PhysicsAnalysis/TauID/TauTrackEvent/src/TruthTau.cxx +++ b/PhysicsAnalysis/TauID/TauTrackEvent/src/TruthTau.cxx @@ -147,13 +147,13 @@ bool TauID::TruthTau::chargedProductHadHadronicInteraction(unsigned int index) c // MsgStream& operator << ( MsgStream& sl, const TauID::TauSeed& seed) // { // std::string name("TauSeed: "); -// sl <<name<<"\t of type : "<<seed.dumpType()<<endreq; +// sl <<name<<"\t of type : "<<seed.dumpType()<<endmsg; // return sl; // } // // std::ostream& operator << ( std::ostream& sl, const TauID::TauSeed& seed) // { // std::string name("TauSeed: "); -// sl <<name<<"\t of type : "<<seed.dumpType()<<endreq; +// sl <<name<<"\t of type : "<<seed.dumpType()<<endmsg; // return sl; // } diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx index 7227f1adfcc..5afa6fe7cc5 100755 --- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx +++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx @@ -57,7 +57,7 @@ McAodSymLinkTests::McAodSymLinkTests( const std::string& name, /////////////// McAodSymLinkTests::~McAodSymLinkTests() { - m_msg << MSG::DEBUG << "Calling destructor" << endreq; + m_msg << MSG::DEBUG << "Calling destructor" << endmsg; } // Athena Algorithm's Hooks @@ -66,13 +66,13 @@ StatusCode McAodSymLinkTests::initialize() { m_msg << MSG::INFO << "Initializing " << name() << "..." - << endreq; + << endmsg; // Get pointer to StoreGateSvc and cache it : if ( !m_storeGate.retrieve().isSuccess() ) { m_msg << MSG::ERROR << "Unable to retrieve pointer to StoreGateSvc" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -83,7 +83,7 @@ StatusCode McAodSymLinkTests::finalize() { m_msg << MSG::INFO << "Finalizing " << name() << "..." - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -91,7 +91,7 @@ StatusCode McAodSymLinkTests::finalize() StatusCode McAodSymLinkTests::execute() { m_msg << MSG::DEBUG << "Executing " << name() << "..." - << endreq; + << endmsg; const TruthParticleContainer * mcParts = 0; if ( !m_storeGate->retrieve( mcParts, @@ -101,7 +101,7 @@ StatusCode McAodSymLinkTests::execute() << "Could not retrieve a TruthParticleContainer at [" << m_truthParticlesName.value() << "] !!" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -113,7 +113,7 @@ StatusCode McAodSymLinkTests::execute() << "Could not retrieve an IParticleContainer at [" << m_truthParticlesName.value() << "] !!" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -125,7 +125,7 @@ StatusCode McAodSymLinkTests::execute() << "Could not retrieve an INavigable4MomentumCollection at [" << m_truthParticlesName.value() << "] !!" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -137,10 +137,10 @@ StatusCode McAodSymLinkTests::execute() mcPartsSize == inavSize && ipartsSize == inavSize ) ) { m_msg << MSG::ERROR - << "Symlinked containers do not have the same size !!" << endreq - << " TruthParticleContainer : " << mcPartsSize << endreq - << " IParticleContainer : " << ipartsSize << endreq - << " INavigable4MomentumCollection : " << inavSize << endreq; + << "Symlinked containers do not have the same size !!" << endmsg + << " TruthParticleContainer : " << mcPartsSize << endmsg + << " IParticleContainer : " << ipartsSize << endmsg + << " INavigable4MomentumCollection : " << inavSize << endmsg; return StatusCode::FAILURE; } @@ -154,11 +154,11 @@ StatusCode McAodSymLinkTests::execute() (tp_ene - in_ene) < eps && (ip_ene - in_ene) < eps ) ) { m_msg << MSG::ERROR - << "symlink FAILS at index [" << i << "]: " << endreq - << " TruthParticle::e(): " << tp_ene << endreq - << " IParticle::e(): " << ip_ene << endreq - << " INav4Mom::e(): " << in_ene << endreq - << " epsilon<double>: " << eps << endreq; + << "symlink FAILS at index [" << i << "]: " << endmsg + << " TruthParticle::e(): " << tp_ene << endmsg + << " IParticle::e(): " << ip_ene << endmsg + << " INav4Mom::e(): " << in_ene << endmsg + << " epsilon<double>: " << eps << endmsg; allGood = false; } } @@ -167,7 +167,7 @@ StatusCode McAodSymLinkTests::execute() } // this string is needed for the unit-test - m_msg << MSG::INFO << "McAodSymLink tests OK" << endreq; + m_msg << MSG::INFO << "McAodSymLink tests OK" << endmsg; return StatusCode::SUCCESS; } diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx index b897c4909c9..7a176ec0391 100755 --- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx +++ b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/EtaPhiBinsCnv.cxx @@ -45,7 +45,7 @@ EtaPhiBinsCnv::createPersistent( EtaPhiBins* transCont ) EtaPhiBinsCnv_p1 cnv; EtaPhiBins_PERS *persObj = cnv.createPersistent( transCont, msg ); - msg << MSG::DEBUG << "::createPersistent [Success]" << endreq; + msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg; return persObj; } diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx index 1e2e43aef66..b92956a3e56 100644 --- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx +++ b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HIPixelTrackletsCollectionCnv.cxx @@ -26,12 +26,12 @@ StatusCode HIPixelTrackletsCollectionCnv::initialize() { StatusCode sc = HIPixelTrackletsCollectionCnvBase::initialize(); if( sc.isFailure() ) { - m_log << MSG::FATAL << "Could not initialize HIPixelTrackletsCollectionCnvBase" << endreq; + m_log << MSG::FATAL << "Could not initialize HIPixelTrackletsCollectionCnvBase" << endmsg; return sc; } m_log.setLevel( m_msgSvc->outputLevel() ); - m_log << MSG::INFO << "HIPixelTrackletsCollectionCnv::initialize()." << endreq; + m_log << MSG::INFO << "HIPixelTrackletsCollectionCnv::initialize()." << endmsg; // return StatusCode::SUCCESS; diff --git a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx index bb291405667..20070ffd3b7 100644 --- a/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx +++ b/Reconstruction/HeavyIonRec/HIRecAthenaPool/src/HITRTInfoCnv.cxx @@ -22,7 +22,7 @@ HITRTInfoCnv::createPersistent( HITRTInfo* transCont ) HITRTInfoCnv_p1 cnv; HITRTInfo_PERS *persObj = cnv.createPersistent( transCont, *m_msg ); - // msg << MSG::DEBUG << "::createPersistent [Success]" << endreq; + // msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg; return persObj; } diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx index 1cdf207e9d3..a20c88dc815 100755 --- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx +++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/EtaPhiBinsCnv_p1.cxx @@ -40,7 +40,7 @@ void EtaPhiBinsCnv_p1::persToTrans( const EtaPhiBins_p1* pers, MsgStream& msg ) { msg << MSG::DEBUG << "Loading EtaPhiBins from persistent state..." - << endreq; + << endmsg; trans->m_EtaMin = pers->m_EtaMin; trans->m_EtaMax = pers->m_EtaMax; @@ -55,7 +55,7 @@ void EtaPhiBinsCnv_p1::persToTrans( const EtaPhiBins_p1* pers, TH2F* h2 = (TH2F*) b.ReadObject(gROOT->GetClass("TH2F")); trans->m_H2 = *h2; //trans->m_H2.Print(); - msg << MSG::DEBUG << "H2 reading didn't crash!" << endreq; + msg << MSG::DEBUG << "H2 reading didn't crash!" << endmsg; return; } @@ -64,7 +64,7 @@ void EtaPhiBinsCnv_p1::transToPers( const EtaPhiBins* trans, MsgStream& msg ) { msg << MSG::DEBUG << "Creating persistent state of EtaPhiBins..." - << endreq; + << endmsg; pers->m_EtaMin = trans->m_EtaMin; pers->m_EtaMax = trans->m_EtaMax; @@ -72,37 +72,37 @@ void EtaPhiBinsCnv_p1::transToPers( const EtaPhiBins* trans, pers->m_NPhiBins = trans->m_NPhiBins; - msg << MSG::DEBUG << "Printing H2" << endreq; + msg << MSG::DEBUG << "Printing H2" << endmsg; //trans->m_H2.Print(); - msg << MSG::DEBUG << "Make TBuffer" << endreq; + msg << MSG::DEBUG << "Make TBuffer" << endmsg; #if ROOT_VERSION_CODE < ROOT_VERSION(5,15,1) TBuffer b(TBuffer::kWrite); #else TBufferFile b(TBuffer::kWrite); #endif - msg << MSG::DEBUG << "Writing H2 into TBuffer" << endreq; + msg << MSG::DEBUG << "Writing H2 into TBuffer" << endmsg; b.WriteObject(&trans->m_H2); char* buf = b.Buffer(); int len = b.Length(); - msg << MSG::DEBUG << "Clearing vector" << endreq; + msg << MSG::DEBUG << "Clearing vector" << endmsg; pers->m_h2vec.clear(); - msg << MSG::DEBUG << "Reserving m_h2vec to length " << len << endreq; + msg << MSG::DEBUG << "Reserving m_h2vec to length " << len << endmsg; pers->m_h2vec.reserve(len); - msg << MSG::DEBUG << "m_h2vec size = " << pers->m_h2vec.size() << endreq; + msg << MSG::DEBUG << "m_h2vec size = " << pers->m_h2vec.size() << endmsg; - msg << MSG::DEBUG << "Pushing back " << b.Length() << " bytes to m_h2vec" << endreq; + msg << MSG::DEBUG << "Pushing back " << b.Length() << " bytes to m_h2vec" << endmsg; for (int i = 0;i<len;i++) { unsigned char ib = buf[i]; - msg << MSG::DEBUG << "push back i = " << i << "cont = " << ib << endreq; + msg << MSG::DEBUG << "push back i = " << i << "cont = " << ib << endmsg; pers->m_h2vec.push_back(ib); } - msg << MSG::DEBUG << "H2 writing didn't crash!" << endreq; + msg << MSG::DEBUG << "H2 writing didn't crash!" << endmsg; return; } diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx index 4a16119ad55..a05cd69c2b9 100644 --- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx +++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HIPixelTrackletsCnv_p1.cxx @@ -26,24 +26,24 @@ void HIPixelTrackletsCnv_p1::persToTrans(const HIPixelTracklets_p1 *persObj, HIP } void HIPixelTrackletsCnv_p1::transToPers(const HIPixelTracklets *transObj, HIPixelTracklets_p1 *persObj, MsgStream &log) { - log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:starting." << endreq; + log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:starting." << endmsg; persObj->m_eta = transObj->m_eta; - log << MSG::INFO << "eta value finished." << endreq; + log << MSG::INFO << "eta value finished." << endmsg; persObj->m_phi = transObj->m_phi; persObj->m_pt = transObj->m_pt; persObj->m_etaS = transObj->m_etaS; persObj->m_phiS = transObj->m_phiS; - log << MSG::INFO << "phiS value finished." << endreq; + log << MSG::INFO << "phiS value finished." << endmsg; //HepGeom::Point3D<double> pointx(transObj->m_vrt.x(),transObj->m_vrt.y(),transObj->m_vrt.z()); //persObj->m_vrt = HepGeom::Point3D<double>(transObj->m_vrt.x(),transObj->m_vrt.y(),transObj->m_vrt.z()); //m_hepPoint3DCnv->transToPers(&(transObj->m_vrt),&(persObj->m_vrt),log ); //persObj->m_vrt = toPersistent(&m_hepPoint3DCnv,&(transObj->m_vrt),log); - //log << MSG::INFO << "vrt: " << persObj->m_vrt.x() << endreq; -// log << MSG::INFO << "vertex value finished." << endreq; -// //log << MSG::INFO << "energy Loss: " << (transObj->m_clusters)[0]->energyLoss() << endreq; -// //log << MSG::INFO << "m_clusterVectorCnv: " << m_clusterVectorCnv << endreq; + //log << MSG::INFO << "vrt: " << persObj->m_vrt.x() << endmsg; +// log << MSG::INFO << "vertex value finished." << endmsg; +// //log << MSG::INFO << "energy Loss: " << (transObj->m_clusters)[0]->energyLoss() << endmsg; +// //log << MSG::INFO << "m_clusterVectorCnv: " << m_clusterVectorCnv << endmsg; // m_clusterVectorCnv.transToPers( &(transObj->m_clusters), &(persObj->m_clusters), log); -// log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:ending." << endreq; +// log << MSG::INFO << "HIPixelTrackletsCnv_p1:transToPers:ending." << endmsg; } diff --git a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx index b3daccef8e5..3a351febf27 100644 --- a/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx +++ b/Reconstruction/HeavyIonRec/HIRecTPCnv/src/HITRTInfoCnv_p1.cxx @@ -9,12 +9,12 @@ void HITRTInfoCnv_p1::persToTrans( const HITRTInfo_p1* pers, MsgStream& msg ) { if (msg.level() <= MSG::DEBUG) - msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[start]" << endreq; + msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[start]" << endmsg; trans->m_OccupancyPerPart.reserve(pers->infos.size()); for( unsigned int i(0); i<pers->infos.size(); ++i ) trans->m_OccupancyPerPart.push_back( pers->infos[i] ); if (msg.level() <= MSG::DEBUG) - msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[end]" << endreq; + msg << MSG::DEBUG << "Loading HITRTInfo from persistent state.[end]" << endmsg; return; } @@ -23,16 +23,16 @@ void HITRTInfoCnv_p1::transToPers( const HITRTInfo* trans, MsgStream& msg ) { if (msg.level() <= MSG::DEBUG) - msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[start]" << endreq; + msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[start]" << endmsg; pers->infos.reserve(trans->m_OccupancyPerPart.size()); for( unsigned int i(0); i<trans->m_OccupancyPerPart.size(); ++i ) { pers->infos.push_back( trans->m_OccupancyPerPart[i] ); if (msg.level() <= MSG::DEBUG) - msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[" << i << "] : " << trans->m_OccupancyPerPart[i] << endreq; + msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[" << i << "] : " << trans->m_OccupancyPerPart[i] << endmsg; } if (msg.level() <= MSG::DEBUG) - msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[end]" << endreq; + msg << MSG::DEBUG << "Creating persistent state of HITRTInfo.[end]" << endmsg; return; } diff --git a/Reconstruction/Jet/JetSimTools/Root/JetTruthParticleSelectorTool.cxx b/Reconstruction/Jet/JetSimTools/Root/JetTruthParticleSelectorTool.cxx index f9006d05ea0..98b325c1bce 100644 --- a/Reconstruction/Jet/JetSimTools/Root/JetTruthParticleSelectorTool.cxx +++ b/Reconstruction/Jet/JetSimTools/Root/JetTruthParticleSelectorTool.cxx @@ -326,17 +326,17 @@ JetTruthParticleSelectorTool::finalize() { if (m_listPDGofStables) { - msg(MSG::INFO) << "Counts of PDGs of all stable particles :" << endreq; - msg(MSG::INFO) << "========================================" << endreq; - msg(MSG::INFO) << "| PDG | # particles |" << endreq; + msg(MSG::INFO) << "Counts of PDGs of all stable particles :" << endmsg; + msg(MSG::INFO) << "========================================" << endmsg; + msg(MSG::INFO) << "| PDG | # particles |" << endmsg; for ( PDGList::iterator it = m_pdgList.begin(); it != m_pdgList.end(); it++ ) { msg(MSG::INFO) << "|" << std::setw(10) << it->first << " |" << std::setw(10) << it->second << " |" - << endreq; + << endmsg; } - msg(MSG::INFO) << "| PDG | <p> | rms | <pt> | rms | <eta> | rms |" << endreq; + msg(MSG::INFO) << "| PDG | <p> | rms | <pt> | rms | <eta> | rms |" << endmsg; for ( PDGList::iterator it = m_pdgList.begin(); it != m_pdgList.end(); it++ ) { int n=it->second; @@ -357,9 +357,9 @@ JetTruthParticleSelectorTool::finalize() << std::setw(15) << pt2 << " |" << std::setw(15) << eta << " |" << std::setw(15) << eta2 << " |" - << endreq; + << endmsg; } - msg(MSG::INFO) << "| PDG | <phi> | rms | <m> | rms |" << endreq; + msg(MSG::INFO) << "| PDG | <phi> | rms | <m> | rms |" << endmsg; for ( PDGList::iterator it = m_pdgList.begin(); it != m_pdgList.end(); it++ ) { int n=it->second; @@ -377,7 +377,7 @@ JetTruthParticleSelectorTool::finalize() << std::setw(15) << phi2 << " |" << std::setw(15) << m << " |" << std::setw(15) << m2 << " |" - << endreq; + << endmsg; } } return StatusCode::SUCCESS; diff --git a/Reconstruction/Jet/JetUtils/Root/JetCaloVariables.cxx b/Reconstruction/Jet/JetUtils/Root/JetCaloVariables.cxx index aa5979ecf8f..3380ea8807e 100644 --- a/Reconstruction/Jet/JetUtils/Root/JetCaloVariables.cxx +++ b/Reconstruction/Jet/JetUtils/Root/JetCaloVariables.cxx @@ -67,12 +67,12 @@ // // Find the path to inputFile // std::string fname = PathResolver::find_file("cos_LLR_pdf.root", "DATAPATH"); // if(fname==""){ -// mLog << MSG::ERROR << "Could not find input file " << fname << endreq; +// mLog << MSG::ERROR << "Could not find input file " << fname << endmsg; // return StatusCode::FAILURE; // } // filePDF = new TFile(fname.c_str()); -// mLog << MSG::INFO << "The input file is " << fname.c_str() << endreq; +// mLog << MSG::INFO << "The input file is " << fname.c_str() << endmsg; // if(filePDF->IsOpen()){ // if(JetContainerName.compare("Cone4H1TopoJets")==0){ // cosmicPdf_EMFraction.push_back((TH1D*)filePDF->Get("cone4topo_JetEMf_bin0_s_pdf_more")); @@ -118,21 +118,21 @@ // dijetPdf_RconeANDRatio.push_back((TH2D*)filePDF->Get("antikt4topo_Rcone_Ratio_bin3_b_pdf_more")); // } // }else{ -// mLog << MSG::ERROR << "Could not open file " << fname << endreq; +// mLog << MSG::ERROR << "Could not open file " << fname << endmsg; // return StatusCode::FAILURE; // } // ///////////////////////////////////////////////////////////////////////// // //for(int i=0; i<int(cosmicPdf_EMFraction.size()); i++) -// //mLog << MSG::INFO <<cosmicPdf_EMFraction[i]->GetName()<<":"<<cosmicPdf_EMFraction[i]->GetSumOfWeights()<<endreq; +// //mLog << MSG::INFO <<cosmicPdf_EMFraction[i]->GetName()<<":"<<cosmicPdf_EMFraction[i]->GetSumOfWeights()<<endmsg; // //for(int i=0; i<int(cosmicPdf_RconeANDRatio.size()); i++) -// //mLog << MSG::INFO <<cosmicPdf_RconeANDRatio[i]->GetName()<<":"<<cosmicPdf_RconeANDRatio[i]->GetSumOfWeights()<<endreq; +// //mLog << MSG::INFO <<cosmicPdf_RconeANDRatio[i]->GetName()<<":"<<cosmicPdf_RconeANDRatio[i]->GetSumOfWeights()<<endmsg; // //for(int i=0; i<int(dijetPdf_EMFraction.size()); i++) -// //mLog << MSG::INFO <<dijetPdf_EMFraction[i]->GetName()<<":"<<dijetPdf_EMFraction[i]->GetSumOfWeights()<<endreq; +// //mLog << MSG::INFO <<dijetPdf_EMFraction[i]->GetName()<<":"<<dijetPdf_EMFraction[i]->GetSumOfWeights()<<endmsg; // //for(int i=0; i<int(dijetPdf_RconeANDRatio.size()); i++) -// //mLog << MSG::INFO <<dijetPdf_RconeANDRatio[i]->GetName()<<":"<<dijetPdf_RconeANDRatio[i]->GetSumOfWeights()<<endreq; +// //mLog << MSG::INFO <<dijetPdf_RconeANDRatio[i]->GetName()<<":"<<dijetPdf_RconeANDRatio[i]->GetSumOfWeights()<<endmsg; // return StatusCode::SUCCESS; // } @@ -216,7 +216,7 @@ // // //--- to get pdf --- // // if(filePDF==NULL){ // // StatusCode sc = getpdf(); -// // if(sc.isFailure()) mLog << MSG::WARNING << "Some problems with getpdf()! " << endreq; +// // if(sc.isFailure()) mLog << MSG::WARNING << "Some problems with getpdf()! " << endmsg; // // } // // //--- to get emfraction and em_pt --- @@ -227,7 +227,7 @@ // // double em_eta=jet->eta(); // // emscale_h.resetSignalState(); //Set it back to the original state -// // //mLog << MSG::DEBUG << "compute_LLREmFraction: em_pt = " <<em_pt<< endreq; +// // //mLog << MSG::DEBUG << "compute_LLREmFraction: em_pt = " <<em_pt<< endmsg; // // if(em_pt/1000.<20. || fabs(em_eta)>2.5) return -20.; @@ -236,7 +236,7 @@ // // while(ptbin_pdf[iptbin]<em_pt/1000.&&iptbin<int(ptbin_pdf.size())){ // // iptbin++; // // } -// // //mLog << MSG::INFO << "compute_LLREmFraction iptbin = " <<iptbin<< endreq; +// // //mLog << MSG::INFO << "compute_LLREmFraction iptbin = " <<iptbin<< endmsg; // // TH1* hist_cos=cosmicPdf_EMFraction[iptbin]; // // TH1* hist_dij=dijetPdf_EMFraction[iptbin]; @@ -269,7 +269,7 @@ // // //--- to get pdf --- // // if(filePDF==NULL){ // // StatusCode sc = getpdf(); -// // if(sc.isFailure()) mLog << MSG::WARNING << "Some problems with getpdf()! " << endreq; +// // if(sc.isFailure()) mLog << MSG::WARNING << "Some problems with getpdf()! " << endmsg; // // } // // //--- to get rcone, ratio_leadingcells and em_pt --- @@ -280,7 +280,7 @@ // // double em_pt=jet->pt(); // // double em_eta=jet->eta(); // // emscale_h.resetSignalState(); //Set it back to the original state -// // //mLog << MSG::DEBUG << "compute_LLRRconeANDRatio: em_pt = " <<em_pt<< endreq; +// // //mLog << MSG::DEBUG << "compute_LLRRconeANDRatio: em_pt = " <<em_pt<< endmsg; // // if(em_pt/1000.<20. || fabs(em_eta)>2.5) return -20.; @@ -290,7 +290,7 @@ // // iptbin++; // // } -// // //mLog << MSG::INFO << "compute_LLRLeading iptbin = " <<iptbin<< endreq; +// // //mLog << MSG::INFO << "compute_LLRLeading iptbin = " <<iptbin<< endmsg; // // TH2* hist_cos=cosmicPdf_RconeANDRatio[iptbin]; // // TH2* hist_dij=dijetPdf_RconeANDRatio[iptbin]; // // double xmax=hist_cos->GetXaxis()->GetXmax(); @@ -312,7 +312,7 @@ // // double sig=hist_cos->Interpolate(rconetmp,ratiotmp); // // double bkg=hist_dij->Interpolate(rconetmp,ratiotmp); -// // //mLog << MSG::INFO <<"LLRLeading = "<<log(sig/bkg)<< endreq; +// // //mLog << MSG::INFO <<"LLRLeading = "<<log(sig/bkg)<< endmsg; // // if(sig!=0&&bkg!=0){ // // return log(sig/bkg); diff --git a/Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx b/Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx index 99cfcffac3e..d9f268b5778 100644 --- a/Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx +++ b/Reconstruction/PanTau/PanTauAlgs/Root/TauFeature.cxx @@ -131,19 +131,19 @@ std::ostream& operator<< ( std::ostream& out, PanTau::TauFeature2 MsgStream& PanTau::TauFeature2::dump( MsgStream& out, MSG::Level debugLevel = MSG::VERBOSE ) const { std::string name("TauFeature2: "); - out << debugLevel << name << endreq; + out << debugLevel << name << endmsg; FeatureMapConstIter iter = m_featureMap.begin(); FeatureMapConstIter iterEnd = m_featureMap.end(); for ( ; iter!=iterEnd; iter++) { - out << debugLevel << (*iter).first << " : \t" << (*iter).second <<endreq; + out << debugLevel << (*iter).first << " : \t" << (*iter).second <<endmsg; } std::string nameVec("TauVecFeature: "); - out << debugLevel << nameVec << endreq; + out << debugLevel << nameVec << endmsg; VectorFeatureMapConstIter iterVec = m_vecFeatureMap.begin(); VectorFeatureMapConstIter iterEndVec = m_vecFeatureMap.end(); for ( ; iterVec!=iterEndVec; iterVec++) { - out << debugLevel << (*iterVec).first << " : \t" << (*iterVec).second.size() << " entries" <<endreq; + out << debugLevel << (*iterVec).first << " : \t" << (*iterVec).second.size() << " entries" <<endmsg; } return out; } diff --git a/Reconstruction/PanTau/PanTauEvent/src/TauFeature.cxx b/Reconstruction/PanTau/PanTauEvent/src/TauFeature.cxx index 7a46140d01d..388ee643623 100644 --- a/Reconstruction/PanTau/PanTauEvent/src/TauFeature.cxx +++ b/Reconstruction/PanTau/PanTauEvent/src/TauFeature.cxx @@ -35,7 +35,7 @@ if(m_featureMap.end() == iter) { // not found isValid=false; - m_log << "Could not find key called '" << ItsName << "' in feature map. Either the spelling is wrong or the feature does not exist. Returning -999999." << endreq; + m_log << "Could not find key called '" << ItsName << "' in feature map. Either the spelling is wrong or the feature does not exist. Returning -999999." << endmsg; return -999999.; } // entry found, return value @@ -129,19 +129,19 @@ void PanTau::TauFeature::addFeaturesFromMap(std::map<std::string, double> otherM MsgStream& PanTau::TauFeature::dump( MsgStream& out, MSG::Level debugLevel = MSG::VERBOSE ) const { std::string name("TauFeature: "); - out << debugLevel << name << endreq; + out << debugLevel << name << endmsg; FeatureMapConstIter iter = m_featureMap.begin(); FeatureMapConstIter iterEnd = m_featureMap.end(); for ( ; iter!=iterEnd; iter++) { - out << debugLevel << (*iter).first << " : \t" << (*iter).second <<endreq; + out << debugLevel << (*iter).first << " : \t" << (*iter).second <<endmsg; } std::string nameVec("TauVecFeature: "); - out << debugLevel << nameVec << endreq; + out << debugLevel << nameVec << endmsg; VectorFeatureMapConstIter iterVec = m_vecFeatureMap.begin(); VectorFeatureMapConstIter iterEndVec = m_vecFeatureMap.end(); for ( ; iterVec!=iterEndVec; iterVec++) { - out << debugLevel << (*iterVec).first << " : \t" << (*iterVec).second.size() << " entries" <<endreq; + out << debugLevel << (*iterVec).first << " : \t" << (*iterVec).second.size() << " entries" <<endmsg; } return out; } diff --git a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx index cae878846d5..35b14133d51 100755 --- a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx +++ b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx @@ -22,7 +22,7 @@ RecoTimingObjCnv::createPersistent( RecoTimingObj* transCont ) RecoTimingObjCnv_p1 cnv; RecoTimingObj_PERS *persObj = cnv.createPersistent( transCont, *m_msg ); - // msg << MSG::DEBUG << "::createPersistent [Success]" << endreq; + // msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg; return persObj; } diff --git a/Simulation/FastShower/FastCaloSim/src/obsolete/CBNTAA_DetailedCellInfo.cxx b/Simulation/FastShower/FastCaloSim/src/obsolete/CBNTAA_DetailedCellInfo.cxx index d44869d18fa..437b4a66343 100644 --- a/Simulation/FastShower/FastCaloSim/src/obsolete/CBNTAA_DetailedCellInfo.cxx +++ b/Simulation/FastShower/FastCaloSim/src/obsolete/CBNTAA_DetailedCellInfo.cxx @@ -99,8 +99,8 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() MsgStream log(messageService(), name()); - log << MSG::INFO << " in CBNT_DetailedCellInfo_initialize" << endreq; - log << MSG::INFO << " reading CaloCellContainer " << m_cellsName << endreq ; + log << MSG::INFO << " in CBNT_DetailedCellInfo_initialize" << endmsg; + log << MSG::INFO << " reading CaloCellContainer " << m_cellsName << endmsg ; @@ -114,7 +114,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() if ( sc == StatusCode::FAILURE ) { - log<<MSG::ERROR << " could not add item to col wise ntuple" << endreq; + log<<MSG::ERROR << " could not add item to col wise ntuple" << endmsg; return StatusCode::FAILURE; } @@ -165,7 +165,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() if (sc.isFailure()) { mLog << MSG::ERROR << "Unable to retrieve pointer to StoreGateSvc" - << endreq; + << endmsg; return sc; }*/ @@ -173,7 +173,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() sc = service("StoreGateSvc", m_storeGate); if ( sc == StatusCode::FAILURE ) { - log<<MSG::ERROR << " could not access SotreGate " << endreq; + log<<MSG::ERROR << " could not access SotreGate " << endmsg; return StatusCode::FAILURE; } // Bad Channel Tool not used so far 15.04.2008 @@ -181,7 +181,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() /* if (m_saveQInfo) { sc=m_pb_tool.retrieve(); if (sc.isFailure()) { - log << MSG::ERROR << "Could not retrieve bad channel tool " << m_pb_tool << endreq; + log << MSG::ERROR << "Could not retrieve bad channel tool " << m_pb_tool << endmsg; m_saveQInfo=false; return sc; } @@ -192,11 +192,11 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() //check calo number specified m_caloSelection = false ; if (m_caloNums.size()==0) { - log << MSG::INFO << " No calorimeter selection " << endreq; + log << MSG::INFO << " No calorimeter selection " << endmsg; //return StatusCode::SUCCESS; } else if (m_caloNums.size()>nSubCalo ) { log << MSG::ERROR << " More than " - << nSubCalo << " calo specified. Must be wrong. Stop." << endreq; + << nSubCalo << " calo specified. Must be wrong. Stop." << endmsg; return StatusCode::FAILURE; } else { m_caloSelection = true ; @@ -204,12 +204,12 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() for (unsigned int index=0; index < m_caloNums.size() ; ++index) { if (m_caloNums[index]>=nSubCalo ) { log << MSG::ERROR << "Invalid calo specification:" - << m_caloNums[index] << "Stop." << endreq ; + << m_caloNums[index] << "Stop." << endmsg ; return StatusCode::FAILURE; } else { - log << MSG::INFO << " Select calorimeter " << m_caloNums[index] << endreq ; + log << MSG::INFO << " Select calorimeter " << m_caloNums[index] << endmsg ; } } @@ -221,7 +221,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() m_caloDDM = CaloDetDescrManager::instance() ; if(m_cellsoutfile!="") { - log << MSG::INFO << "Creating cell output file "<< m_cellsoutfile << endreq ; + log << MSG::INFO << "Creating cell output file "<< m_cellsoutfile << endmsg ; std::ofstream outfile(m_cellsoutfile.c_str()); @@ -238,7 +238,7 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() outfile.close(); } else { - log << MSG::INFO << "skip creating cell output file"<< endreq ; + log << MSG::INFO << "skip creating cell output file"<< endmsg ; } //_______________________________________________________________________ // end Cell information @@ -247,11 +247,11 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() sc=m_FastShowerCellBuilderTool.retrieve(); if (sc.isFailure()) { log << MSG::ERROR << "Failed to retrieve FastShowerCellBuilderTool: " - << m_FastShowerCellBuilderTool << endreq; + << m_FastShowerCellBuilderTool << endmsg; return sc; } else { log << MSG::DEBUG << "Successfully retrieve FastShowerCellBuilderTool: " - << m_FastShowerCellBuilderTool << endreq; + << m_FastShowerCellBuilderTool << endmsg; } m_gentesIO = new GenAccessIO(); @@ -259,13 +259,13 @@ CBNTAA_DetailedCellInfo::CBNT_initialize() IPartPropSvc* p_PartPropSvc; sc=service("PartPropSvc",p_PartPropSvc); if (sc.isFailure() || 0 == p_PartPropSvc) { - log<<MSG::ERROR << "could not find PartPropService"<<endreq; + log<<MSG::ERROR << "could not find PartPropService"<<endmsg; return StatusCode::FAILURE; } m_particleDataTable = (HepPDT::ParticleDataTable*) p_PartPropSvc->PDT(); if(m_particleDataTable == 0){ - log<<MSG::ERROR << "PDG table not found"<<endreq; + log<<MSG::ERROR << "PDG table not found"<<endmsg; return StatusCode::FAILURE; } @@ -287,7 +287,7 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() { MsgStream log( messageService(), name() ); - log << MSG::INFO << " in CBNTAA_DetailedCellInfo_execute" << endreq; + log << MSG::INFO << " in CBNTAA_DetailedCellInfo_execute" << endmsg; // typedef CaloCellContainer CONTAINER; @@ -297,7 +297,7 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() StatusCode sc=m_storeGate->retrieve(cellcoll,"AllCalo"); if (sc.isFailure()) { log << MSG::ERROR - << "" << endreq; + << "" << endmsg; return sc; } const DataHandle<CaloCalibrationHitContainer> clbc; @@ -309,7 +309,7 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() for (iter=m_CalibrationContainerNames.begin();iter!=m_CalibrationContainerNames.end();iter++) { sc = m_storeGate->retrieve(clbc,*iter); if (sc.isFailure()) { - log << MSG::ERROR << "Cannot retrieve calibration container" << endreq; + log << MSG::ERROR << "Cannot retrieve calibration container" << endmsg; } else { v_clbc.push_back(clbc); } @@ -318,7 +318,7 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() for (iter=m_CalibrationContainerInactiveNames.begin();iter!=m_CalibrationContainerInactiveNames.end();iter++) { sc = m_storeGate->retrieve(clbc,*iter); if (sc.isFailure()) { - log << MSG::ERROR << "Cannot retrieve calibration container (Inactive)" << endreq; + log << MSG::ERROR << "Cannot retrieve calibration container (Inactive)" << endmsg; } else { v_clbcInactive.push_back(clbc); } @@ -359,9 +359,9 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() //if(cell->energy()>0){ - /* log << MSG::INFO << " cellenergie: " << cell->energy() <<" Layer " << cell->caloDDE()->getSampling() <<endreq; - log << MSG::INFO << " eta " << cell->eta() << " phi " << cell->phi() << endreq ; - log << MSG::INFO << "--------------------------------------------" << endreq; */ + /* log << MSG::INFO << " cellenergie: " << cell->energy() <<" Layer " << cell->caloDDE()->getSampling() <<endmsg; + log << MSG::INFO << " eta " << cell->eta() << " phi " << cell->phi() << endmsg ; + log << MSG::INFO << "--------------------------------------------" << endmsg; */ //} // added on 23. april use the calibaration hits info @@ -377,11 +377,11 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() { // CalibrationHit which correspond to cell in ClusterContainer has been found CaloCalibrationHit *calibration_hit=*first_calib_cell; -// log << MSG::INFO << calibration_hit->energyEM()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyNonEM()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyInvisible()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyEscaped()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyTotal()<< endreq ; +// log << MSG::INFO << calibration_hit->energyEM()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyNonEM()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyInvisible()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyEscaped()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyTotal()<< endmsg ; CalEM += calibration_hit->energyEM(); CalNONEM += calibration_hit->energyNonEM(); @@ -403,11 +403,11 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() { // CalibrationHit which correspond to cell in ClusterContainer has been found CaloCalibrationHit *calibration_hit=*first_calib_cell; -// log << MSG::INFO << calibration_hit->energyEM()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyNonEM()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyInvisible()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyEscaped()<< endreq ; -// log << MSG::INFO <<calibration_hit->energyTotal()<< endreq ; +// log << MSG::INFO << calibration_hit->energyEM()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyNonEM()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyInvisible()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyEscaped()<< endmsg ; +// log << MSG::INFO <<calibration_hit->energyTotal()<< endmsg ; CalEMInactive += calibration_hit->energyEM(); CalNONEMInactive += calibration_hit->energyNonEM(); @@ -420,37 +420,37 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() -// log << MSG::INFO << "cell=" << (int)cell<< endreq ; -// log << MSG::INFO << "m_eCells=" << (int)m_eCells<< endreq ; -// log << MSG::INFO << "m_eCells" << cell->energy()<< endreq ; +// log << MSG::INFO << "cell=" << (int)cell<< endmsg ; +// log << MSG::INFO << "m_eCells=" << (int)m_eCells<< endmsg ; +// log << MSG::INFO << "m_eCells" << cell->energy()<< endmsg ; m_eCells->push_back( cell->energy()); -// log << MSG::INFO << "m_etaCells" << endreq ; +// log << MSG::INFO << "m_etaCells" << endmsg ; m_etaCells->push_back(cell->eta()); -// log << MSG::INFO << "m_phiCells" << endreq ; +// log << MSG::INFO << "m_phiCells" << endmsg ; m_phiCells->push_back(cell->phi()) ; -// log << MSG::INFO << "Layer" << endreq ; +// log << MSG::INFO << "Layer" << endmsg ; Layer->push_back(cell->caloDDE()->getSampling()); -// log << MSG::INFO << "CellID" << endreq ; +// log << MSG::INFO << "CellID" << endmsg ; CellID->push_back(cell->ID().get_identifier32().get_compact()); -// log << MSG::INFO << "EM_energy" << endreq ; +// log << MSG::INFO << "EM_energy" << endmsg ; EM_energy->push_back(CalEM); -// log << MSG::INFO << "NonEM_energy" << endreq ; +// log << MSG::INFO << "NonEM_energy" << endmsg ; NonEM_energy->push_back(CalNONEM); -// log << MSG::INFO << "Invisible_energy" << endreq ; +// log << MSG::INFO << "Invisible_energy" << endmsg ; Invisible_energy->push_back(CalInv); -// log << MSG::INFO << "Escaped_energy" << endreq ; +// log << MSG::INFO << "Escaped_energy" << endmsg ; Escaped_energy->push_back(CalEsc); EMInactive_energy->push_back(CalEMInactive); -// log << MSG::INFO << "NonEM_energy" << endreq ; +// log << MSG::INFO << "NonEM_energy" << endmsg ; NonEMInactive_energy->push_back(CalNONEMInactive); -// log << MSG::INFO << "Invisible_energy" << endreq ; +// log << MSG::INFO << "Invisible_energy" << endmsg ; InvisibleInactive_energy->push_back(CalInvInactive); -// log << MSG::INFO << "Escaped_energy" << endreq ; +// log << MSG::INFO << "Escaped_energy" << endmsg ; EscapedInactive_energy->push_back(CalEscInactive); } // end of loop over all cells @@ -463,33 +463,33 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() MCparticleCollection particles; - log <<MSG::INFO<<"Start getting particles"<<endreq; + log <<MSG::INFO<<"Start getting particles"<<endmsg; sc = m_gentesIO->getMC(particles, &ifs, m_mcLocation ); if ( sc.isFailure() ) { - log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endreq; + log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endmsg; return StatusCode::FAILURE; } - log << MSG::INFO <<"start finding partilces n="<<particles.size()<< endreq; + log << MSG::INFO <<"start finding partilces n="<<particles.size()<< endmsg; MCparticleCollectionCIter ip; for(ip=particles.begin();ip<particles.end();++ip){ - log << MSG::INFO << "entering the for loop" << endreq; + log << MSG::INFO << "entering the for loop" << endmsg; const HepMC::GenParticle* par=*ip; double charge = 0; HepPDT::ParticleData* ap = m_particleDataTable->particle( abs( par->pdg_id() ) ); if(!ap){ - log<<MSG::WARNING<<" id="<<par->pdg_id()<<" stat="<<par->status()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<" : particle info not found"<<endreq; + log<<MSG::WARNING<<" id="<<par->pdg_id()<<" stat="<<par->status()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<" : particle info not found"<<endmsg; //return StatusCode::SUCCESS; } else { charge = ap->charge(); if(par->pdg_id()<0) charge = -charge; } - log << MSG::INFO <<" id="<<par->pdg_id()<<" stat="<<par->status()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<" charge="<<charge<< endreq; + log << MSG::INFO <<" id="<<par->pdg_id()<<" stat="<<par->status()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<" charge="<<charge<< endmsg; HepMC::GenVertex* pvtx = par->production_vertex(); // double eta=(*par)->particle()->momentum().eta(); @@ -503,7 +503,7 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() Trk::Perigee candidatePerigee(pos,mom,charge,pos); FastShowerCellBuilderTool* the_FastShowerCellBuilderTool=dynamic_cast<FastShowerCellBuilderTool*>(&(*m_FastShowerCellBuilderTool)); - log<<MSG::INFO<<"============= Getting Calo Surface ================="<<endreq; + log<<MSG::INFO<<"============= Getting Calo Surface ================="<<endmsg; const Trk::TrackParameters* params_on_surface=the_FastShowerCellBuilderTool->get_calo_surface(candidatePerigee,charge); if(!params_on_surface) { return StatusCode::FAILURE; @@ -513,14 +513,14 @@ StatusCode CBNTAA_DetailedCellInfo::CBNT_execute() surface.SetPtEtaPhi(1,the_FastShowerCellBuilderTool->get_eta_calo_surf(),the_FastShowerCellBuilderTool->get_phi_calo_surf()); surface.SetMag(the_FastShowerCellBuilderTool->get_d_calo_surf()); - log<<MSG::INFO<< "eta_calo_surf: "<< the_FastShowerCellBuilderTool->get_eta_calo_surf() << "phi_calo_surf(): "<< the_FastShowerCellBuilderTool->get_phi_calo_surf() << endreq; + log<<MSG::INFO<< "eta_calo_surf: "<< the_FastShowerCellBuilderTool->get_eta_calo_surf() << "phi_calo_surf(): "<< the_FastShowerCellBuilderTool->get_phi_calo_surf() << endmsg; dcalosurf=the_FastShowerCellBuilderTool->get_d_calo_surf(); etacalosurf=the_FastShowerCellBuilderTool->get_eta_calo_surf(); phicalosurf=the_FastShowerCellBuilderTool->get_phi_calo_surf(); for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) { - log<<MSG::INFO<<"============= Getting Calo position for sample "<<sample<<endreq; + log<<MSG::INFO<<"============= Getting Calo position for sample "<<sample<<endmsg; lok->push_back(the_FastShowerCellBuilderTool->get_calo_etaphi(params_on_surface,(CaloCell_ID_FCS::CaloSample)sample)); ldcalolayercenter->push_back(the_FastShowerCellBuilderTool->get_d_calo_surf(sample)); letacalolayercenter->push_back(the_FastShowerCellBuilderTool->get_eta_calo_surf(sample)); @@ -554,7 +554,7 @@ return StatusCode::SUCCESS; StatusCode CBNTAA_DetailedCellInfo::CBNT_clear() { MsgStream log( messageService(), name() ); - log << MSG::INFO << " in CBNT_DetailedCellInfo_clear" << endreq; + log << MSG::INFO << " in CBNT_DetailedCellInfo_clear" << endmsg; m_nhit=0 ; m_eCell=0 ; diff --git a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx index 8328e050ab2..c4765104027 100644 --- a/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx +++ b/Simulation/FastShower/FastCaloSimHit/src/FastHitConv.cxx @@ -114,7 +114,7 @@ StatusCode FastHitConv::initEvent() { //MsgStream log(msgSvc(), name()); - //log << MSG::DEBUG << "initEvent()" << endreq; + //log << MSG::DEBUG << "initEvent()" << endmsg; ATH_MSG_DEBUG("initEvent()"); if(!m_embHitContainer.isValid() ) { m_embHitContainer = CxxUtils::make_unique<LArHitContainer>(m_embHitContainer.name());} if(!m_emecHitContainer.isValid()) { m_emecHitContainer = CxxUtils::make_unique<LArHitContainer>(m_emecHitContainer.name());} diff --git a/Simulation/G4Atlas/G4AtlasTests/src/CaloCalibrationHitsTestTool.cxx b/Simulation/G4Atlas/G4AtlasTests/src/CaloCalibrationHitsTestTool.cxx index 73c54e99117..321d221a829 100644 --- a/Simulation/G4Atlas/G4AtlasTests/src/CaloCalibrationHitsTestTool.cxx +++ b/Simulation/G4Atlas/G4AtlasTests/src/CaloCalibrationHitsTestTool.cxx @@ -38,7 +38,7 @@ StatusCode CaloCalibrationHitsTestTool::initialize(){ m_path+="Calib/Tile/"; m_hitcollkey="TileCalibration"+m_calibHitType.substr(4)+"HitCnt"; } else{ - ATH_MSG(ERROR) << " unknown key " <<m_calibHitType<<endreq; + ATH_MSG(ERROR) << " unknown key " <<m_calibHitType<<endmsg; return StatusCode::FAILURE; } @@ -79,7 +79,7 @@ StatusCode CaloCalibrationHitsTestTool::processEvent(){ const CaloDetDescrElement* ddElement = geoHit.getDetDescrElement(); if (!ddElement) { - ATH_MSG(WARNING) << " could not retrieve DetElement in CaloCalibrationHitsTestTool/" <<m_calibHitType<<endreq; + ATH_MSG(WARNING) << " could not retrieve DetElement in CaloCalibrationHitsTestTool/" <<m_calibHitType<<endmsg; continue; } double eta = ddElement->eta(); diff --git a/Simulation/G4Atlas/G4AtlasTests/src/SimTestHisto.h b/Simulation/G4Atlas/G4AtlasTests/src/SimTestHisto.h index 730ccefb0a0..56ca746ac90 100644 --- a/Simulation/G4Atlas/G4AtlasTests/src/SimTestHisto.h +++ b/Simulation/G4Atlas/G4AtlasTests/src/SimTestHisto.h @@ -48,7 +48,7 @@ public: ISvcLocator* svcLocator = Gaudi::svcLocator(); if (svcLocator->service("THistSvc", hSvc).isFailure()) { MsgStream log(msgSvc(),"SimTestHisto"); - log<<MSG::ERROR<<"Could not get the THistSvc!!!"<<endreq; + log<<MSG::ERROR<<"Could not get the THistSvc!!!"<<endmsg; } } return hSvc; diff --git a/Simulation/G4Atlas/G4AtlasTests/src/TileHitsTestTool.cxx b/Simulation/G4Atlas/G4AtlasTests/src/TileHitsTestTool.cxx index 38a9332615f..3732542989d 100644 --- a/Simulation/G4Atlas/G4AtlasTests/src/TileHitsTestTool.cxx +++ b/Simulation/G4Atlas/G4AtlasTests/src/TileHitsTestTool.cxx @@ -83,7 +83,7 @@ StatusCode TileHitsTestTool::processEvent() { // loop over subhits double energy=0; - // ATH_MSG(INFO) << "TileHit size :" <<(*i_hit).size()<<endreq; + // ATH_MSG(INFO) << "TileHit size :" <<(*i_hit).size()<<endmsg; for (int i=0; i<(*i_hit).size();++i) { energy+=(*i_hit).energy(i); m_tile_energy->Fill((*i_hit).energy(i)); diff --git a/Simulation/G4Extensions/RHadrons/src/SG_StepNtuple.cxx b/Simulation/G4Extensions/RHadrons/src/SG_StepNtuple.cxx index a0a9f8b1da7..389a26432f0 100644 --- a/Simulation/G4Extensions/RHadrons/src/SG_StepNtuple.cxx +++ b/Simulation/G4Extensions/RHadrons/src/SG_StepNtuple.cxx @@ -136,7 +136,7 @@ StatusCode SG_StepNtuple::initialize(){ ntdir(ntupleSvc(),"/NTUPLES/FILE1/StepNtuple"); if ( !ntdir ) ntdir = ntupleSvc()->createDirectory(file1,"StepNtuple"); - //if ( !ntdir ) log << MSG::ERROR << " failed to get ntuple directory" << endreq; + //if ( !ntdir ) log << MSG::ERROR << " failed to get ntuple directory" << endmsg; NTuplePtr nt(ntupleSvc(), "/NTUPLES/FILE1/StepNtuple/10"); if ( !nt ) { // Check if already booked nt = ntupleSvc()->book (ntdir.ptr(), 10,CLID_ColumnWiseTuple, "GEANT4 Step NTuple"); diff --git a/Simulation/G4SimCnv/G4SimTPCnv/src/TrackRecordCnv_p1.cxx b/Simulation/G4SimCnv/G4SimTPCnv/src/TrackRecordCnv_p1.cxx index 61c6f708d52..970cd05941c 100755 --- a/Simulation/G4SimCnv/G4SimTPCnv/src/TrackRecordCnv_p1.cxx +++ b/Simulation/G4SimCnv/G4SimTPCnv/src/TrackRecordCnv_p1.cxx @@ -16,7 +16,7 @@ void TrackRecordCnv_p1::persToTrans(const TrackRecord_p1* persObj, TrackRecord* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrackRecordCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrackRecordCnv_p1::persToTrans called " << endmsg; transObj->PDG_code = persObj->PDG_code(); transObj->Energy = (double) persObj->energy(); @@ -32,14 +32,14 @@ TrackRecordCnv_p1::persToTrans(const TrackRecord_p1* persObj, TrackRecord* trans << transObj->Momentum.x() << ", " << transObj->Momentum.y() << ", " << transObj->Momentum.z() << ", " << transObj->Position.x() << ", " << transObj->Position.y() << ", " << transObj->Position.z() << ", " << transObj->Time << ", " << transObj->barCode << ", " << transObj->volName - << endreq; + << endmsg; } void TrackRecordCnv_p1::transToPers(const TrackRecord* transObj, TrackRecord_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrackRecordCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrackRecordCnv_p1::transToPers called " << endmsg; persObj->m_PDG_code = transObj->PDG_code; persObj->m_energy = (float) transObj->Energy; persObj->m_momentumX = (float) transObj->Momentum.x(); diff --git a/Simulation/G4Utilities/G4Field/src/G4AtlasFieldSvc.cxx b/Simulation/G4Utilities/G4Field/src/G4AtlasFieldSvc.cxx index 9bbd5957d5b..9c1e5f56e13 100644 --- a/Simulation/G4Utilities/G4Field/src/G4AtlasFieldSvc.cxx +++ b/Simulation/G4Utilities/G4Field/src/G4AtlasFieldSvc.cxx @@ -30,7 +30,7 @@ G4AtlasFieldSvc::G4AtlasFieldSvc(const std::string& n) void G4AtlasFieldSvc::Initialize() { if (!fieldinitialized) { if ( m_magFieldSvc.retrieve().isFailure()) { - // mlog << MSG::FATAL << "Could not find MagFieldAthenaSvc" << endreq ; + // mlog << MSG::FATAL << "Could not find MagFieldAthenaSvc" << endmsg ; std::cout << "Could not find MagFieldAthenaSvc" << std::endl ; return; } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/BremsstrahlungStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/BremsstrahlungStrategy.cxx index 70564f11c65..e40cfa7dd6d 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/BremsstrahlungStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/BremsstrahlungStrategy.cxx @@ -28,12 +28,12 @@ BremsstrahlungStrategy::BremsstrahlungStrategy(const std::string& n) // don't overwrite the values already in the strategy manager if(theTruthManager->GetTruthParameter("BremsPrimaryMinEnergy")==0){ log() << MSG::INFO << "BremsPrimaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("BremsPrimaryMinEnergy", prim_thr); } if(theTruthManager->GetTruthParameter("BremsSecondaryMinEnergy")==0){ log() << MSG::INFO << "BremsSecondaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("BremsSecondaryMinEnergy", seco_thr); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/CaloCatchAllStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/CaloCatchAllStrategy.cxx index 7d9b7355065..64d113b9e80 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/CaloCatchAllStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/CaloCatchAllStrategy.cxx @@ -22,17 +22,17 @@ CaloCatchAllStrategy::CaloCatchAllStrategy(const std::string& n) { if(theTruthManager->GetTruthParameter("CaloMuBremsPrimaryMinEnergy")==0){ log() << MSG::INFO << "CaloMuBremsPrimaryMinEnergy: " - << "setting default value of 1GeV" << endreq; + << "setting default value of 1GeV" << endmsg; theTruthManager->SetTruthParameter("CaloMuBremsPrimaryMinEnergy", 1000.); } if(theTruthManager->GetTruthParameter("CaloMuBremsSecondaryMinEnergy")==0){ log() << MSG::INFO << "CaloMuBremsSecondaryMinEnergy: " - << "setting default value of 500MeV" << endreq; + << "setting default value of 500MeV" << endmsg; theTruthManager->SetTruthParameter("CaloMuBremsSecondaryMinEnergy", 500.); } if(theTruthManager->GetTruthParameter("CaloDecayPrimaryMinEnergy")==0){ log() << MSG::INFO << "CaloDecayPrimaryMinEnergy: " - << "setting default value of 1GeV" << endreq; + << "setting default value of 1GeV" << endmsg; theTruthManager->SetTruthParameter("CaloDecayPrimaryMinEnergy", 1000.); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/ComptonStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/ComptonStrategy.cxx index 8f9b2bb7d05..d5df4799903 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/ComptonStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/ComptonStrategy.cxx @@ -28,12 +28,12 @@ ComptonStrategy::ComptonStrategy(const std::string& n) // don't overwrite the values already in the strategy manager if(theTruthManager->GetTruthParameter("ComptonPrimaryMinEnergy")==0){ log() << MSG::INFO << "ComptonPrimaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("ComptonPrimaryMinEnergy", prim_thr); } if(theTruthManager->GetTruthParameter("ComptonSecondaryMinEnergy")==0){ log() << MSG::INFO << "ComptonSecondaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("ComptonSecondaryMinEnergy", seco_thr); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/ConversionStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/ConversionStrategy.cxx index 00d944511b3..de7f01a9df5 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/ConversionStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/ConversionStrategy.cxx @@ -22,12 +22,12 @@ ConversionStrategy::ConversionStrategy(const std::string& n) double seco_thr = 100*CLHEP::MeV; if(theTruthManager->GetTruthParameter("ConversionPrimaryMinEnergy")==0){ log() << MSG::INFO << "ConversionPrimaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("ConversionPrimaryMinEnergy", prim_thr); } if(theTruthManager->GetTruthParameter("ConversionSecondaryMinEnergy")==0){ log() << MSG::INFO << "ConversionSecondaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("ConversionSecondaryMinEnergy", seco_thr); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/DecayStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/DecayStrategy.cxx index 5307ff3757b..2327865553e 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/DecayStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/DecayStrategy.cxx @@ -23,12 +23,12 @@ DecayStrategy::DecayStrategy(const std::string& n) double seco_thr = 100*CLHEP::MeV; if(theTruthManager->GetTruthParameter("DecayPrimaryMinEnergy")==0){ log() << MSG::INFO << "DecayPrimaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("DecayPrimaryMinEnergy", prim_thr); } if(theTruthManager->GetTruthParameter("DecaySecondaryMinEnergy")==0){ log() << MSG::INFO << "DecaySecondaryMinEnergy: setting default value of 100 MeV" - << endreq; + << endmsg; theTruthManager->SetTruthParameter("DecaySecondaryMinEnergy", seco_thr); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/HadronicInteractionStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/HadronicInteractionStrategy.cxx index c975cfa8f66..66738345ab8 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/HadronicInteractionStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/HadronicInteractionStrategy.cxx @@ -27,13 +27,13 @@ HadronicInteractionStrategy::HadronicInteractionStrategy(const std::string& n) double prim_thr = 100*CLHEP::MeV; if(theTruthManager->GetTruthParameter("HadronicPrimaryMinEnergy")==0){ log() << MSG::INFO << "HadronicPrimaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("HadronicPrimaryMinEnergy", prim_thr); } double seco_thr = 100*CLHEP::MeV; if(theTruthManager->GetTruthParameter("HadronicSecondaryMinEnergy")==0){ log() << MSG::INFO << "HadronicSecondaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("HadronicSecondaryMinEnergy", seco_thr); } } diff --git a/Simulation/G4Utilities/G4TruthStrategies/src/IonizationStrategy.cxx b/Simulation/G4Utilities/G4TruthStrategies/src/IonizationStrategy.cxx index d352fa4c021..a6e1955545b 100644 --- a/Simulation/G4Utilities/G4TruthStrategies/src/IonizationStrategy.cxx +++ b/Simulation/G4Utilities/G4TruthStrategies/src/IonizationStrategy.cxx @@ -28,12 +28,12 @@ IonizationStrategy::IonizationStrategy(const std::string& n) double seco_thr = 100*CLHEP::MeV; if(theTruthManager->GetTruthParameter("IonizationPrimaryMinEnergy")==0){ log() << MSG::INFO << "IonizationPrimaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("IonizationPrimaryMinEnergy",prim_thr); } if(theTruthManager->GetTruthParameter("IonizationSecondaryMinEnergy")==0){ log() << MSG::INFO << "IonizationSecondaryMinEnergy: " - << "setting default value of 100 MeV" << endreq; + << "setting default value of 100 MeV" << endmsg; theTruthManager->SetTruthParameter("IonizationSecondaryMinEnergy",seco_thr); } } diff --git a/Simulation/G4Utilities/Geo2G4/src/Geo2G4SolidFactory.cxx b/Simulation/G4Utilities/Geo2G4/src/Geo2G4SolidFactory.cxx index eb98618d0cc..2fe9c7394ba 100644 --- a/Simulation/G4Utilities/Geo2G4/src/Geo2G4SolidFactory.cxx +++ b/Simulation/G4Utilities/Geo2G4/src/Geo2G4SolidFactory.cxx @@ -140,9 +140,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoBox* theBox = dynamic_cast<const GeoBox*> (geoShape); if (0==theBox) throw std::runtime_error("TypeID did not match cast for box"); if (n.empty()) n="G4Box"; - if (theBox->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an x side of " << theBox->getXHalfLength() <<" - using std::abs." << endreq;} - if (theBox->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an y side of " << theBox->getYHalfLength() <<" - using std::abs." << endreq;} - if (theBox->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an z side of " << theBox->getZHalfLength() <<" - using std::abs." << endreq;} + if (theBox->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an x side of " << theBox->getXHalfLength() <<" - using std::abs." << endmsg;} + if (theBox->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an y side of " << theBox->getYHalfLength() <<" - using std::abs." << endmsg;} + if (theBox->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Box " << n << " has an z side of " << theBox->getZHalfLength() <<" - using std::abs." << endmsg;} theSolid = new G4Box(n, std::abs(theBox->getXHalfLength()), std::abs(theBox->getYHalfLength()), @@ -156,9 +156,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoTube* theTube = dynamic_cast<const GeoTube*> (geoShape); if (0==theTube) throw std::runtime_error("TypeID did not match cast for tube"); if (n.empty()) n="G4Tube"; - if (theTube->getRMax()<=0.){ msg(MSG::WARNING) << "Tube " << n << " has a max radius of " << theTube->getRMax() <<" - using std::abs." << endreq;} - if (theTube->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Tube " << n << " has a z half length of " << theTube->getZHalfLength() << " - using std::abs." << endreq;} - if (theTube->getRMax()<theTube->getRMin()){ msg(MSG::WARNING) << "Tube " << n << " has a max radius of " << theTube->getRMax() << " and a min radius of " << theTube->getRMin() << endreq;} + if (theTube->getRMax()<=0.){ msg(MSG::WARNING) << "Tube " << n << " has a max radius of " << theTube->getRMax() <<" - using std::abs." << endmsg;} + if (theTube->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Tube " << n << " has a z half length of " << theTube->getZHalfLength() << " - using std::abs." << endmsg;} + if (theTube->getRMax()<theTube->getRMin()){ msg(MSG::WARNING) << "Tube " << n << " has a max radius of " << theTube->getRMax() << " and a min radius of " << theTube->getRMin() << endmsg;} theSolid = new G4Tubs(n, theTube->getRMin(), std::abs(theTube->getRMax()), @@ -173,11 +173,11 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoTubs* theTubs = dynamic_cast<const GeoTubs*> (geoShape); if (0==theTubs) throw std::runtime_error("TypeID did not match cast for tubs"); if (n.empty()) n="G4Tubs"; - if (theTubs->getRMin()<0.){ msg(MSG::WARNING) << "Tubs " << n << " has a min radius of " << theTubs->getRMax() << endreq;} - if (theTubs->getRMax()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a max radius of " << theTubs->getRMax() <<" - using std::abs." << endreq;} - if (theTubs->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a half length of " << theTubs->getZHalfLength() <<" - using std::abs." << endreq;} - if (theTubs->getRMax()<theTubs->getRMin()){ msg(MSG::WARNING) << "Tubs " << n << " has a max radius of " << theTubs->getRMax() << " and a min radius of " << theTubs->getRMin() << endreq;} - if (theTubs->getDPhi()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a dPhi of " << theTubs->getDPhi() << endreq;} + if (theTubs->getRMin()<0.){ msg(MSG::WARNING) << "Tubs " << n << " has a min radius of " << theTubs->getRMax() << endmsg;} + if (theTubs->getRMax()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a max radius of " << theTubs->getRMax() <<" - using std::abs." << endmsg;} + if (theTubs->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a half length of " << theTubs->getZHalfLength() <<" - using std::abs." << endmsg;} + if (theTubs->getRMax()<theTubs->getRMin()){ msg(MSG::WARNING) << "Tubs " << n << " has a max radius of " << theTubs->getRMax() << " and a min radius of " << theTubs->getRMin() << endmsg;} + if (theTubs->getDPhi()<=0.){ msg(MSG::WARNING) << "Tubs " << n << " has a dPhi of " << theTubs->getDPhi() << endmsg;} theSolid = new G4Tubs(n, theTubs->getRMin(), std::abs(theTubs->getRMax()), @@ -193,15 +193,15 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoTrd* theTrd = dynamic_cast<const GeoTrd*> (geoShape); if (0==theTrd) throw std::runtime_error("TypeID did not match cast for trd"); if (n.empty()) n="G4Trd"; - if (theTrd->getXHalfLength1()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a x half length 1 of " << theTrd->getXHalfLength1() << " - using std::abs." << endreq;} - if (theTrd->getXHalfLength2()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a x half length 2 of " << theTrd->getXHalfLength2() << " - using std::abs." << endreq;} - if (theTrd->getYHalfLength1()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a y half length 1 of " << theTrd->getYHalfLength1() << " - using std::abs." << endreq;} - if (theTrd->getYHalfLength2()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a y half length 2 of " << theTrd->getYHalfLength2() << " - using std::abs." << endreq;} - if (theTrd->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Trd " << n << " has a z half length of " << theTrd->getZHalfLength() << " - using std::abs." << endreq;} + if (theTrd->getXHalfLength1()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a x half length 1 of " << theTrd->getXHalfLength1() << " - using std::abs." << endmsg;} + if (theTrd->getXHalfLength2()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a x half length 2 of " << theTrd->getXHalfLength2() << " - using std::abs." << endmsg;} + if (theTrd->getYHalfLength1()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a y half length 1 of " << theTrd->getYHalfLength1() << " - using std::abs." << endmsg;} + if (theTrd->getYHalfLength2()<0.){ msg(MSG::WARNING) << "Trd " << n << " has a y half length 2 of " << theTrd->getYHalfLength2() << " - using std::abs." << endmsg;} + if (theTrd->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Trd " << n << " has a z half length of " << theTrd->getZHalfLength() << " - using std::abs." << endmsg;} if (theTrd->getXHalfLength1()<=0. && theTrd->getXHalfLength2()<=0.){ msg(MSG::WARNING) << "Trd " << n << " has an x half length 1 of " << theTrd->getXHalfLength1() - << " and an x half length 2 of " << theTrd->getXHalfLength2() << " - using std::abs." << endreq;} + << " and an x half length 2 of " << theTrd->getXHalfLength2() << " - using std::abs." << endmsg;} if (theTrd->getYHalfLength1()<=0. && theTrd->getYHalfLength2()<=0.){ msg(MSG::WARNING) << "Trd " << n << " has a y half length 1 of " << theTrd->getYHalfLength1() - << " and a y half length 2 of " << theTrd->getYHalfLength2() << " - using std::abs." << endreq;} + << " and a y half length 2 of " << theTrd->getYHalfLength2() << " - using std::abs." << endmsg;} theSolid = new G4Trd(n, std::abs(theTrd->getXHalfLength1()), std::abs(theTrd->getXHalfLength2()), @@ -226,9 +226,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) zPlane[index] = thePcon->getZPlane(index); rInner[index] = thePcon->getRMinPlane(index); rOuter[index] = thePcon->getRMaxPlane(index); - if (rInner[index]<0.){ msg(MSG::WARNING) << "PCon " << n << " has an inner radius of " << rInner[index] << " for slice " << index << " of " << nPlanes << endreq;} + if (rInner[index]<0.){ msg(MSG::WARNING) << "PCon " << n << " has an inner radius of " << rInner[index] << " for slice " << index << " of " << nPlanes << endmsg;} if (rOuter[index]<=0.){ - msg(MSG::WARNING) << "PCon " << n << " has an outer radius of " << rOuter[index] << " for slice " << index << " of " << nPlanes << " - using std::abs." << endreq; + msg(MSG::WARNING) << "PCon " << n << " has an outer radius of " << rOuter[index] << " for slice " << index << " of " << nPlanes << " - using std::abs." << endmsg; rOuter[index] = std::abs(rOuter[index]); } } @@ -249,13 +249,13 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoCons* theCons = dynamic_cast<const GeoCons*>(geoShape); if (0==theCons) throw std::runtime_error("TypeID did not match cast for cons"); if (n.empty()) n="G4Cons"; - if (theCons->getRMax1()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a max radius 1 of " << theCons->getRMax1() << " - will use std::abs." << endreq;} - if (theCons->getRMax2()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a max radius 2 of " << theCons->getRMax2() << " - will use std::abs." << endreq;} - if (theCons->getRMin1()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a min radius 1 of " << theCons->getRMin1() << endreq;} - if (theCons->getRMin2()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a min radius 2 of " << theCons->getRMin2() << endreq;} - if (theCons->getDZ()<=0){ msg(MSG::WARNING) << "Cons " << n << " has a DZ of " << theCons->getDZ() << " - will use std::abs." << endreq;} + if (theCons->getRMax1()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a max radius 1 of " << theCons->getRMax1() << " - will use std::abs." << endmsg;} + if (theCons->getRMax2()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a max radius 2 of " << theCons->getRMax2() << " - will use std::abs." << endmsg;} + if (theCons->getRMin1()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a min radius 1 of " << theCons->getRMin1() << endmsg;} + if (theCons->getRMin2()<0.){ msg(MSG::WARNING) << "Cons " << n << " has a min radius 2 of " << theCons->getRMin2() << endmsg;} + if (theCons->getDZ()<=0){ msg(MSG::WARNING) << "Cons " << n << " has a DZ of " << theCons->getDZ() << " - will use std::abs." << endmsg;} if (theCons->getRMax1()<=0. && theCons->getRMax2()<=0.){ msg(MSG::WARNING) << "Cons " << n << " has a max radius 1 of " << theCons->getRMax1() - << " and a max radius 2 of " << theCons->getRMax2() << " - will use std::abs." << endreq;} + << " and a max radius 2 of " << theCons->getRMax2() << " - will use std::abs." << endmsg;} theSolid = new G4Cons(n, theCons->getRMin1(), std::abs(theCons->getRMax1()), @@ -273,9 +273,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoPara* thePara = dynamic_cast<const GeoPara*>(geoShape); if (0==thePara) throw std::runtime_error("TypeID did not match cast for para"); if (n.empty()) n="G4Para"; - if (thePara->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an x side of " << thePara->getXHalfLength() <<" - using std::abs." << endreq;} - if (thePara->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an y side of " << thePara->getYHalfLength() <<" - using std::abs." << endreq;} - if (thePara->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an z side of " << thePara->getZHalfLength() <<" - using std::abs." << endreq;} + if (thePara->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an x side of " << thePara->getXHalfLength() <<" - using std::abs." << endmsg;} + if (thePara->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an y side of " << thePara->getYHalfLength() <<" - using std::abs." << endmsg;} + if (thePara->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Para " << n << " has an z side of " << thePara->getZHalfLength() <<" - using std::abs." << endmsg;} theSolid = new G4Para(n, std::abs(thePara->getXHalfLength()), std::abs(thePara->getYHalfLength()), @@ -302,9 +302,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) zPlane[index] = thePgon->getZPlane(index); rInner[index] = thePgon->getRMinPlane(index)*cos(alpha); rOuter[index] = thePgon->getRMaxPlane(index)*cos(alpha); - if (rInner[index]<0.){ msg(MSG::WARNING) << "Pgon " << n << " has an inner radius of " << rInner[index] << " for slice " << index << " of " << nPlanes << endreq;} + if (rInner[index]<0.){ msg(MSG::WARNING) << "Pgon " << n << " has an inner radius of " << rInner[index] << " for slice " << index << " of " << nPlanes << endmsg;} if (rOuter[index]<=0.){ - msg(MSG::WARNING) << "Pgon " << n << " has an outer radius of " << rOuter[index] << " for slice " << index << " of " << nPlanes << " - using std::abs." << endreq; + msg(MSG::WARNING) << "Pgon " << n << " has an outer radius of " << rOuter[index] << " for slice " << index << " of " << nPlanes << " - using std::abs." << endmsg; rOuter[index] = std::abs(rOuter[index]); } } @@ -326,7 +326,7 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoTrap* theTrap = dynamic_cast<const GeoTrap*>(geoShape); if (0==theTrap) throw std::runtime_error("TypeID did not match cast for trap"); if (n.empty()) n="G4Trap"; - if (theTrap->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Trap " << n << " has an z side of " << theTrap->getZHalfLength() <<" - using std::abs." << endreq;} + if (theTrap->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Trap " << n << " has an z side of " << theTrap->getZHalfLength() <<" - using std::abs." << endmsg;} theSolid = new G4Trap(n, std::abs(theTrap->getZHalfLength()), theTrap->getTheta(), @@ -399,9 +399,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) if (0==theEltube) throw std::runtime_error("TypeID did not match cast for elliptical tube"); if (n.empty()) n="G4EllipticalTube"; - if (theEltube->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an x side of " << theEltube->getXHalfLength() <<" - using std::abs." << endreq;} - if (theEltube->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an y side of " << theEltube->getYHalfLength() <<" - using std::abs." << endreq;} - if (theEltube->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an z side of " << theEltube->getZHalfLength() <<" - using std::abs." << endreq;} + if (theEltube->getXHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an x side of " << theEltube->getXHalfLength() <<" - using std::abs." << endmsg;} + if (theEltube->getYHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an y side of " << theEltube->getYHalfLength() <<" - using std::abs." << endmsg;} + if (theEltube->getZHalfLength()<=0.){ msg(MSG::WARNING) << "Eltube " << n << " has an z side of " << theEltube->getZHalfLength() <<" - using std::abs." << endmsg;} G4EllipticalTube* g4Eltube = new G4EllipticalTube(n ,std::abs(theEltube->getXHalfLength()) ,std::abs(theEltube->getYHalfLength()) @@ -430,7 +430,7 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) const GeoGenericTrap* theGenTrap = dynamic_cast<const GeoGenericTrap*>(geoShape); if (0==theGenTrap) throw std::runtime_error("TypeID did not match cast for generic trap"); if (n.empty()) n="G4GenericTrap"; - if (theGenTrap->getZHalfLength()<=0.){ msg(MSG::WARNING) << "GenTrap " << n << " has an z side of " << theGenTrap->getZHalfLength() <<" - using std::abs." << endreq;} + if (theGenTrap->getZHalfLength()<=0.){ msg(MSG::WARNING) << "GenTrap " << n << " has an z side of " << theGenTrap->getZHalfLength() <<" - using std::abs." << endmsg;} G4GenericTrap* g4GenTrap = new G4GenericTrap(n ,std::abs(theGenTrap->getZHalfLength()) ,theGenTrap->getVertices()); @@ -557,9 +557,9 @@ G4VSolid *Geo2G4SolidFactory::Build(const GeoShape* geoShape, std::string name) // else { - msg(MSG::FATAL) << "Sorry this solid is not yet implemented... " <<endreq; - msg(MSG::FATAL) << geoShape->type() << endreq; - msg(MSG::FATAL) << "You will have a core dump..." << endreq; + msg(MSG::FATAL) << "Sorry this solid is not yet implemented... " <<endmsg; + msg(MSG::FATAL) << geoShape->type() << endmsg; + msg(MSG::FATAL) << "You will have a core dump..." << endmsg; return 0; } @@ -576,7 +576,7 @@ G4VSolid* Geo2G4SolidFactory::createLArWheelSolid(const std::string& name, const LArWheelSolidDDProxy * theLWS_p = new LArWheelSolidDDProxy(theLWS); // ownership is passed to detStore if ( detStore()->record(theLWS_p, name).isFailure() ) { - msg(MSG::WARNING) << "Can't store proxy for LArWheelSolid to the DetectorStore" <<endreq; + msg(MSG::WARNING) << "Can't store proxy for LArWheelSolid to the DetectorStore" <<endmsg; delete theLWS_p; } return theLWS; diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/src/PlanarClusterOnTrack.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/src/PlanarClusterOnTrack.cxx index e017e85dd39..f33520fb7e5 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/src/PlanarClusterOnTrack.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/src/PlanarClusterOnTrack.cxx @@ -87,7 +87,7 @@ namespace iFatras { MsgStream& PlanarClusterOnTrack::dump( MsgStream& sl ) const { - sl << "PlanarClusterOnTrack {" << endreq; + sl << "PlanarClusterOnTrack {" << endmsg; Trk::RIO_OnTrack::dump(sl); sl << "Global position (x,y,z) = ("; @@ -95,11 +95,11 @@ namespace iFatras { { sl <<this->globalPosition().x()<<", " <<this->globalPosition().y()<<", " - <<this->globalPosition().z()<<")"<<endreq; + <<this->globalPosition().z()<<")"<<endmsg; } else { - sl<<"NULL!), "<<endreq; + sl<<"NULL!), "<<endmsg; } - sl<<"}"<<endreq; + sl<<"}"<<endmsg; return sl; } diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_PRD_AssociationTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_PRD_AssociationTool.cxx index 3c813753c05..d9274495e44 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_PRD_AssociationTool.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_PRD_AssociationTool.cxx @@ -40,7 +40,7 @@ StatusCode iFatras::ISF_PRD_AssociationTool::addPRDs( const Trk::Track& track ) TrackPrepRawDataMap::const_iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec!=m_trackPrepRawDataMap.end()) { - msg(MSG::ERROR)<<"track already found in cache, should not happen"<<endreq; + msg(MSG::ERROR)<<"track already found in cache, should not happen"<<endmsg; return StatusCode::FAILURE; } @@ -57,7 +57,7 @@ StatusCode iFatras::ISF_PRD_AssociationTool::addPRDs( const Trk::Track& track ) m_trackPrepRawDataMap.insert( std::make_pair(&track, prds) ); if (msgLvl(MSG::DEBUG)) msg()<<"Added PRDs from Track at ("<<&track<<") - map now has size: \t" - <<m_prepRawDataTrackMap.size()<<endreq; + <<m_prepRawDataTrackMap.size()<<endmsg; return StatusCode::SUCCESS; } @@ -78,7 +78,7 @@ StatusCode iFatras::ISF_PRD_AssociationTool::removePRDs( const Trk::Track& track TrackPrepRawDataMap::iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec==m_trackPrepRawDataMap.end()) { - msg(MSG::ERROR)<<"Track not found in cache, this should not happen"<<endreq; + msg(MSG::ERROR)<<"Track not found in cache, this should not happen"<<endmsg; return StatusCode::FAILURE; } @@ -112,7 +112,7 @@ StatusCode iFatras::ISF_PRD_AssociationTool::removePRDs( const Trk::Track& track if (msgLvl(MSG::DEBUG)) msg()<<"Removed PRDs from track (" <<&track<<") \t- map has changed size from \t" - <<oldSize <<" \tto "<<m_prepRawDataTrackMap.size()<<endreq; + <<oldSize <<" \tto "<<m_prepRawDataTrackMap.size()<<endmsg; return StatusCode::SUCCESS; } @@ -135,7 +135,7 @@ Trk::IPRD_AssociationTool::TrackSet iFatras::ISF_PRD_AssociationTool::findConnec connectedTracks.erase(&track); if (msgLvl(MSG::VERBOSE)) msg()<<"Added in connected tracks for track "<<&track - << "\tsize of list is "<<connectedTracks.size()<<endreq; + << "\tsize of list is "<<connectedTracks.size()<<endmsg; return connectedTracks; } @@ -148,12 +148,12 @@ std::vector< const Trk::PrepRawData* > iFatras::ISF_PRD_AssociationTool::getPrds TrackPrepRawDataMap::const_iterator itvec = m_trackPrepRawDataMap.find(&track); if (itvec!=m_trackPrepRawDataMap.end()) { - msg(MSG::VERBOSE)<<"found track in cache, return cached PRD vector for track"<<endreq; + msg(MSG::VERBOSE)<<"found track in cache, return cached PRD vector for track"<<endmsg; return itvec->second; } if (track.measurementsOnTrack()==0) { - msg(MSG::WARNING)<<"Track has no RoTs"<<endreq; + msg(MSG::WARNING)<<"Track has no RoTs"<<endmsg; return PRDs_t(); // return vector optimization } @@ -173,7 +173,7 @@ std::vector< const Trk::PrepRawData* > iFatras::ISF_PRD_AssociationTool::getPrds } if (msgLvl(MSG::DEBUG)) msg()<<" Getting "<<vec.size() - <<" PRDs from track at:"<<&track<<endreq; + <<" PRDs from track at:"<<&track<<endmsg; return vec; } diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx index f46f5b7f070..6fa5c4b9cb8 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx @@ -45,28 +45,28 @@ StatusCode iFatras::ISF_TrackSummaryHelperTool::initialize() { if (m_usePixel) { if (detStore()->retrieve(m_pixelId, "PixelID").isFailure()) { - msg(MSG::ERROR) << "Could not get PixelID helper !" << endreq; + msg(MSG::ERROR) << "Could not get PixelID helper !" << endmsg; return StatusCode::FAILURE; - } else msg(MSG::VERBOSE) << "PixelID helper retrieved successfully!" << endreq; + } else msg(MSG::VERBOSE) << "PixelID helper retrieved successfully!" << endmsg; } if (m_useSCT) { if (detStore()->retrieve(m_sctId, "SCT_ID").isFailure()) { - msg(MSG::ERROR) << "Could not get SCT_ID helper !" << endreq; + msg(MSG::ERROR) << "Could not get SCT_ID helper !" << endmsg; return StatusCode::FAILURE; - } else msg(MSG::VERBOSE) << "PixelID helper retrieved successfully!" << endreq; + } else msg(MSG::VERBOSE) << "PixelID helper retrieved successfully!" << endmsg; } if (m_doSharedHits) { if ( m_assoTool.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_assoTool << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_assoTool << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_assoTool << endmsg; } } - msg(MSG::INFO) << "initialize() successful in " << name() << endreq; + msg(MSG::INFO) << "initialize() successful in " << name() << endmsg; return StatusCode::SUCCESS; } @@ -83,15 +83,15 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track, bool isOutlier = (tsos->type(Trk::TrackStateOnSurface::Outlier)); bool ispatterntrack = (track.info().trackFitter()==Trk::TrackInfo::Unknown); - if (msgLvl(MSG::DEBUG)) msg() << "Starting analyse()" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Starting analyse()" << endmsg; if ( m_usePixel && m_pixelId->is_pixel(id) ) { - if (msgLvl(MSG::DEBUG)) msg() << "Pixel hit found" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Pixel hit found" << endmsg; if (isOutlier && !ispatterntrack ) { // ME: outliers on pattern tracks may be reintegrated by fitter, so count them as hits - if (msgLvl(MSG::DEBUG)) msg() << "Pixel outlier info storing" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Pixel outlier info storing" << endmsg; information[Trk::numberOfPixelOutliers]++; if (m_pixelId->is_blayer(id)){ @@ -105,7 +105,7 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track, } } else { - if (msgLvl(MSG::DEBUG)) msg() << "Pixel info storing" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Pixel info storing" << endmsg; information[Trk::numberOfPixelHits]++; if ((m_pixelId->is_blayer(id))) information[Trk::numberOfBLayerHits]++; // found b layer hit @@ -113,12 +113,12 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track, if (m_pixelId->layer_disk(id)==1 && m_pixelId->is_barrel(id)) information[Trk::numberOfNextToInnermostPixelLayerHits]++; if ( ( m_pixelId->is_barrel(id) ) ) { - if (msgLvl(MSG::DEBUG)) msg() << "Barrel hit" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Barrel hit" << endmsg; int offset = m_pixelId->layer_disk(id); if (!hitPattern.test(offset)) information[Trk::numberOfContribPixelLayers]++; hitPattern.set(offset); // assumes numbered consecutively } else { - if (msgLvl(MSG::DEBUG)) msg() << "Endcap hit" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Endcap hit" << endmsg; int offset = static_cast<int> (Trk::pixelEndCap0); //get int value of first pixel endcap disc offset += m_pixelId->layer_disk(id); if (!hitPattern.test(offset)) information[Trk::numberOfContribPixelLayers]++; @@ -128,18 +128,18 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track, if (m_doSharedHits) { // used in more than one track ? if ( m_assoTool->isShared(*(rot->prepRawData())) ) { - if (msgLvl(MSG::DEBUG)) msg() << "shared Pixel hit found" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "shared Pixel hit found" << endmsg; information[Trk::numberOfPixelSharedHits]++; if ( (m_pixelId->is_blayer(id) ) ) { - if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in b-layer" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in b-layer" << endmsg; information[Trk::numberOfBLayerSharedHits]++; } if ( (m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==0) ) { - if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in innermost layer" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in innermost layer" << endmsg; information[Trk::numberOfInnermostPixelLayerSharedHits]++; } if ( (m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==1) ) { - if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in next to innermost layer" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "--> shared Pixel hit is in next to innermost layer" << endmsg; information[Trk::numberOfNextToInnermostPixelLayerSharedHits]++; } } else ATH_MSG_DEBUG("shared Pixel hit NOT found"); @@ -147,34 +147,34 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track, } } else if (m_useSCT && m_sctId->is_sct(id) ) { - if (msgLvl(MSG::DEBUG)) msg() << "SCT hit found" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SCT hit found" << endmsg; if (isOutlier && !ispatterntrack ) { // ME: outliers on pattern tracks may be reintegrated by fitter, so count them as hits - if (msgLvl(MSG::DEBUG)) msg() << "SCT outlier info storing" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SCT outlier info storing" << endmsg; information[Trk::numberOfSCTOutliers]++; } else { - if (msgLvl(MSG::DEBUG)) msg() << "SCT info storing" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "SCT info storing" << endmsg; information[Trk::numberOfSCTHits]++; if ( (m_sctId->is_barrel(id) ) ) { - if (msgLvl(MSG::DEBUG)) msg() << "Barrel hit" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Barrel hit" << endmsg; int offset = static_cast<int>(Trk::sctBarrel0); hitPattern.set( offset ) ; - if (msgLvl(MSG::DEBUG)) msg() << "offset = " << offset << endreq; - if (msgLvl(MSG::DEBUG)) msg() << "m_sctId->layer_disk(id) = " << m_sctId->layer_disk(id) << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "offset = " << offset << endmsg; + if (msgLvl(MSG::DEBUG)) msg() << "m_sctId->layer_disk(id) = " << m_sctId->layer_disk(id) << endmsg; //hitPattern.set( offset + m_sctId->layer_disk(id) ); // assumes numbered consecutively } else { - if (msgLvl(MSG::DEBUG)) msg() << "Endcap hit" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "Endcap hit" << endmsg; int offset = static_cast<int>(Trk::sctEndCap0); //get int value of first sct endcap disc hitPattern.set( offset ) ; - if (msgLvl(MSG::DEBUG)) msg() << "offset = " << offset << endreq; - if (msgLvl(MSG::DEBUG)) msg() << "m_sctId->layer_disk(id) = " << m_sctId->layer_disk(id) << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "offset = " << offset << endmsg; + if (msgLvl(MSG::DEBUG)) msg() << "m_sctId->layer_disk(id) = " << m_sctId->layer_disk(id) << endmsg; //hitPattern.set( offset + m_sctId->layer_disk(id) ); // assumes numbered consecutively } if (m_doSharedHits) { // used in more than one track ? if ( m_assoTool->isShared(*(rot->prepRawData())) ) { - if (msgLvl(MSG::DEBUG)) msg() << "shared SCT hit found" << endreq; + if (msgLvl(MSG::DEBUG)) msg() << "shared SCT hit found" << endmsg; information[Trk::numberOfSCTSharedHits]++; } else ATH_MSG_DEBUG("shared SCT hit NOT found"); } diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PlanarClusterOnTrackTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PlanarClusterOnTrackTool.cxx index c9556877f41..7d59f40a0cd 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PlanarClusterOnTrackTool.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PlanarClusterOnTrackTool.cxx @@ -44,7 +44,7 @@ namespace iFatras { { StatusCode sc = AthAlgTool::initialize(); - msg(MSG::INFO) << name() << " initialize()" << endreq; + msg(MSG::INFO) << name() << " initialize()" << endmsg; return sc; } diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/src/Geant4SimSvc.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/src/Geant4SimSvc.cxx index 5aa7fdbbf45..bfca45ce5bb 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/src/Geant4SimSvc.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/src/Geant4SimSvc.cxx @@ -117,13 +117,13 @@ StatusCode iGeant4::Geant4SimSvc::finalize() float avgTimePerEvent=(m_nrOfEntries>1) ? m_accumulatedEventTime/(m_nrOfEntries-1.) : runTime; float sigma=( m_nrOfEntries>2) ? std::sqrt((m_accumulatedEventTimeSq/float(m_nrOfEntries-1)- avgTimePerEvent*avgTimePerEvent)/float(m_nrOfEntries-2)) : 0; - ATH_MSG_INFO("*****************************************"<<endreq<< - "** **"<<endreq<< + ATH_MSG_INFO("*****************************************"<<endmsg<< + "** **"<<endmsg<< " End of run - time spent is "<<std::setprecision(4) << - runTime<<endreq<< + runTime<<endmsg<< " Average time per event was "<<std::setprecision(4) << - avgTimePerEvent <<" +- "<< std::setprecision(4) << sigma<<endreq<< - "** **"<<endreq<< + avgTimePerEvent <<" +- "<< std::setprecision(4) << sigma<<endmsg<< + "** **"<<endmsg<< "*****************************************"); } diff --git a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/src/TrkExtrapolator.cxx b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/src/TrkExtrapolator.cxx index a197ef18a55..01aa806a934 100644 --- a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/src/TrkExtrapolator.cxx +++ b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/src/TrkExtrapolator.cxx @@ -133,10 +133,10 @@ bool ISF::TrkExtrapolator::retrieveTrackingGeometry() const MsgStream log(msgSvc(),name()); StatusCode sc = m_trackingGeometrySvc.retrieve(); if ( sc.isFailure() ){ - log << MSG::WARNING << " failed to retrieve geometry Svc " << m_trackingGeometrySvc << endreq; + log << MSG::WARNING << " failed to retrieve geometry Svc " << m_trackingGeometrySvc << endmsg; return false; } - log << MSG::INFO << " geometry Svc " << m_trackingGeometrySvc << " retrieved " << endreq; + log << MSG::INFO << " geometry Svc " << m_trackingGeometrySvc << " retrieved " << endmsg; m_trackingGeometry = m_trackingGeometrySvc->trackingGeometry(); if ( !m_trackingGeometry ) return false; diff --git a/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTest.cxx b/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTest.cxx index a5e8d11d941..4ea059578b2 100644 --- a/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTest.cxx +++ b/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTest.cxx @@ -55,14 +55,14 @@ StatusCode PileUpEventInfoTest::execute() const EventInfo* sevt = (*it).pSubEvt; if (sevt!=NULL) { ATH_MSG_INFO ( "Sub Event Info:" ); - ATH_MSG_INFO ( " Time : " << (*it).time() << endreq - << " Index : " << (*it).index() << endreq - << " Provenance : " << (*it).type() << endreq // This is the provenance stuff: signal, minbias, cavern, etc - << " Run Number : " << sevt->event_ID()->run_number() << endreq - << " Event Number : " << sevt->event_ID()->event_number() << endreq - << " ns Offset : " << sevt->event_ID()->time_stamp_ns_offset() << endreq - << " Lumi Block : " << sevt->event_ID()->lumi_block() << endreq - << " BCID : " << sevt->event_ID()->bunch_crossing_id() << endreq + ATH_MSG_INFO ( " Time : " << (*it).time() << endmsg + << " Index : " << (*it).index() << endmsg + << " Provenance : " << (*it).type() << endmsg // This is the provenance stuff: signal, minbias, cavern, etc + << " Run Number : " << sevt->event_ID()->run_number() << endmsg + << " Event Number : " << sevt->event_ID()->event_number() << endmsg + << " ns Offset : " << sevt->event_ID()->time_stamp_ns_offset() << endmsg + << " Lumi Block : " << sevt->event_ID()->lumi_block() << endmsg + << " BCID : " << sevt->event_ID()->bunch_crossing_id() << endmsg << " User Type : " << sevt->event_type()->user_type() ); // if ((*it).time() == 0) { // NInTimeEvents++; diff --git a/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTestTool.cxx b/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTestTool.cxx index a7e0c4b93da..7707bd6e5b4 100644 --- a/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTestTool.cxx +++ b/Simulation/Tests/DigitizationTests/src/PileUpEventInfoTestTool.cxx @@ -60,14 +60,14 @@ StatusCode PileUpEventInfoTestTool::processEvent() { const EventInfo* sevt = (*it).pSubEvt; if (sevt!=NULL) { ATH_MSG_INFO ( "Sub Event Info:" ); - ATH_MSG_INFO ( " Time : " << (*it).time() << endreq - << " Index : " << (*it).index() << endreq - << " Provenance : " << (*it).type() << endreq // This is the provenance stuff: signal, minbias, cavern, etc - << " Run Number : " << sevt->event_ID()->run_number() << endreq - << " Event Number : " << sevt->event_ID()->event_number() << endreq - << " ns Offset : " << sevt->event_ID()->time_stamp_ns_offset() << endreq - << " Lumi Block : " << sevt->event_ID()->lumi_block() << endreq - << " BCID : " << sevt->event_ID()->bunch_crossing_id() << endreq + ATH_MSG_INFO ( " Time : " << (*it).time() << endmsg + << " Index : " << (*it).index() << endmsg + << " Provenance : " << (*it).type() << endmsg // This is the provenance stuff: signal, minbias, cavern, etc + << " Run Number : " << sevt->event_ID()->run_number() << endmsg + << " Event Number : " << sevt->event_ID()->event_number() << endmsg + << " ns Offset : " << sevt->event_ID()->time_stamp_ns_offset() << endmsg + << " Lumi Block : " << sevt->event_ID()->lumi_block() << endmsg + << " BCID : " << sevt->event_ID()->bunch_crossing_id() << endmsg << " User Type : " << sevt->event_type()->user_type() ); // if ((*it).time() == 0) { // NInTimeEvents++; diff --git a/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/ValidationTests/AtlasCLHEP_RandomGenerators_test.cxx b/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/ValidationTests/AtlasCLHEP_RandomGenerators_test.cxx index 36085da3d16..58f98ae6195 100755 --- a/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/ValidationTests/AtlasCLHEP_RandomGenerators_test.cxx +++ b/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/ValidationTests/AtlasCLHEP_RandomGenerators_test.cxx @@ -65,59 +65,59 @@ namespace AtlasCLHEP_RandomGenerators { // Random number service if ( m_rndmSvc1.retrieve().isFailure() ) { - msg(MSG::ERROR)<< "Could not retrieve " << m_rndmSvc1 << endreq; + msg(MSG::ERROR)<< "Could not retrieve " << m_rndmSvc1 << endmsg; return StatusCode::FAILURE; } if ( m_rndmSvc2.retrieve().isFailure() ) { - msg(MSG::ERROR)<< "Could not retrieve " << m_rndmSvc2 << endreq; + msg(MSG::ERROR)<< "Could not retrieve " << m_rndmSvc2 << endmsg; return StatusCode::FAILURE; } //Get own engine with own seeds: m_randomEngine1 = m_rndmSvc1->GetEngine(m_randomEngineName1); if (!m_randomEngine1) { - msg(MSG::ERROR)<< "Could not get random engine '" << m_randomEngineName1 << "'" << endreq; + msg(MSG::ERROR)<< "Could not get random engine '" << m_randomEngineName1 << "'" << endmsg; return StatusCode::FAILURE; } m_randomEngine2 = m_rndmSvc2->GetEngine(m_randomEngineName2); if (!m_randomEngine2) { - msg(MSG::ERROR)<< "Could not get random engine '" << m_randomEngineName2 << "'" << endreq; + msg(MSG::ERROR)<< "Could not get random engine '" << m_randomEngineName2 << "'" << endmsg; return StatusCode::FAILURE; } if((service("THistSvc", m_histSvc)).isFailure()) { - msg(MSG::ERROR) << "Cannot allocate THistSvc service" << endreq; + msg(MSG::ERROR) << "Cannot allocate THistSvc service" << endmsg; return StatusCode::FAILURE; } m_hflat=new TH1D("RandFlat","RandFlat",1000,0,1); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hflat->GetName(), m_hflat).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hflat->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hflat->GetName() << endmsg; } m_hgauss1=new TH1D("RandGauss","RandGauss",700,-7,7); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hgauss1->GetName(), m_hgauss1).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss1->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss1->GetName() << endmsg; } m_hgauss2=new TH1D("RandGaussQ","RandGaussQ",700,-7,7); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hgauss2->GetName(), m_hgauss2).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss2->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss2->GetName() << endmsg; } m_hgauss3=new TH1D("RandGaussZigurat","RandGaussZigurat",700,-7,7); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hgauss3->GetName(), m_hgauss3).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss3->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hgauss3->GetName() << endmsg; } m_hexp1=new TH1D("RandExponential","RandExponential",900,0,30); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hexp1->GetName(), m_hexp1).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hexp1->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hexp1->GetName() << endmsg; } m_hexp2=new TH1D("RandExpZiggurat","RandExpZiggurat",900,0,30); if(!m_histSvc->regHist(std::string("/PLOTS/") + m_hexp2->GetName(), m_hexp2).isSuccess()) { - msg(MSG::WARNING) << "Could not register histogram "<< m_hexp2->GetName() << endreq; + msg(MSG::WARNING) << "Could not register histogram "<< m_hexp2->GetName() << endmsg; } return StatusCode::SUCCESS; @@ -145,7 +145,7 @@ namespace AtlasCLHEP_RandomGenerators { CLHEP::RandExpZiggurat rexpZ(*m_randomEngine2); */ - msg(MSG::DEBUG)<<"event="<<ievent<<" ntest="<<ntest<<endreq; + msg(MSG::DEBUG)<<"event="<<ievent<<" ntest="<<ntest<<endmsg; m_chrono -> chronoStart("flat"); double sum_flat=0; @@ -156,7 +156,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_flat/=ntest; m_chrono -> chronoStop("flat"); - msg(MSG::DEBUG)<<" avg "<<"flat"<<"="<<sum_flat<<endreq; + msg(MSG::DEBUG)<<" avg "<<"flat"<<"="<<sum_flat<<endmsg; m_chrono -> chronoStart("RandGauss"); double sum_rnd1=0; @@ -167,7 +167,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_rnd1/=ntest; m_chrono -> chronoStop("RandGauss"); - msg(MSG::DEBUG)<<" avg "<<"RandGauss"<<"="<<sum_rnd1<<endreq; + msg(MSG::DEBUG)<<" avg "<<"RandGauss"<<"="<<sum_rnd1<<endmsg; m_chrono -> chronoStart("RandGaussQ"); double sum_rnd2=0; @@ -178,7 +178,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_rnd2/=ntest; m_chrono -> chronoStop("RandGaussQ"); - msg(MSG::DEBUG)<<" avg "<<"RandGaussQ"<<"="<<sum_rnd2<<endreq; + msg(MSG::DEBUG)<<" avg "<<"RandGaussQ"<<"="<<sum_rnd2<<endmsg; m_chrono -> chronoStart("RandGaussZiggurat"); double sum_zig=0; @@ -189,7 +189,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_zig/=ntest; m_chrono -> chronoStop("RandGaussZiggurat"); - msg(MSG::DEBUG)<<" avg "<<"RandGaussZiggurat"<<"="<<sum_zig<<endreq; + msg(MSG::DEBUG)<<" avg "<<"RandGaussZiggurat"<<"="<<sum_zig<<endmsg; m_chrono -> chronoStart("RandExponential"); double sum_exp=0; @@ -200,7 +200,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_exp/=ntest; m_chrono -> chronoStop("RandExponential"); - msg(MSG::DEBUG)<<" avg "<<"RandExponential"<<"="<<sum_exp<<endreq; + msg(MSG::DEBUG)<<" avg "<<"RandExponential"<<"="<<sum_exp<<endmsg; m_chrono -> chronoStart("RandExpZiggurat"); double sum_expZ=0; @@ -211,7 +211,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_expZ/=ntest; m_chrono -> chronoStop("RandExpZiggurat"); - msg(MSG::DEBUG)<<" avg "<<"RandExpZiggurat"<<"="<<sum_expZ<<endreq; + msg(MSG::DEBUG)<<" avg "<<"RandExpZiggurat"<<"="<<sum_expZ<<endmsg; /* @@ -222,7 +222,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_rnd1/=ntest; m_chrono -> chronoStop(m_randomEngineName1); - msg(MSG::DEBUG)<<" avg "<<m_randomEngineName1<<"="<<sum_rnd1<<endreq; + msg(MSG::DEBUG)<<" avg "<<m_randomEngineName1<<"="<<sum_rnd1<<endmsg; m_chrono -> chronoStart(m_randomEngineName2); double sum_rnd2=0; @@ -231,7 +231,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_rnd2/=ntest; m_chrono -> chronoStop(m_randomEngineName2); - msg(MSG::DEBUG)<<" avg "<<m_randomEngineName2<<"="<<sum_rnd2<<endreq; + msg(MSG::DEBUG)<<" avg "<<m_randomEngineName2<<"="<<sum_rnd2<<endmsg; m_chrono -> chronoStart("ranlux64"); m_ranlux64->setSeed(seed,1); @@ -241,7 +241,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_ranlux64/=ntest; m_chrono -> chronoStop("ranlux64"); - msg(MSG::DEBUG)<<" avg ranlux64="<<sum_ranlux64<<endreq; + msg(MSG::DEBUG)<<" avg ranlux64="<<sum_ranlux64<<endmsg; m_chrono -> chronoStart("ranecu"); m_ranecu->setSeed(seed,1); @@ -251,7 +251,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_ranecu/=ntest; m_chrono -> chronoStop("ranecu"); - msg(MSG::DEBUG)<<" avg ranecu="<<sum_ranecu<<endreq; + msg(MSG::DEBUG)<<" avg ranecu="<<sum_ranecu<<endmsg; m_chrono -> chronoStart("mtwist"); m_mtwist->setSeed(seed,1); @@ -261,7 +261,7 @@ namespace AtlasCLHEP_RandomGenerators { } sum_mtwist/=ntest; m_chrono -> chronoStop("mtwist"); - msg(MSG::DEBUG)<<" avg mtwist="<<sum_mtwist<<endreq; + msg(MSG::DEBUG)<<" avg mtwist="<<sum_mtwist<<endmsg; */ diff --git a/Simulation/TruthJiveXML/src/TruthTrackRetriever.cxx b/Simulation/TruthJiveXML/src/TruthTrackRetriever.cxx index c818413af24..0f1f74951d8 100755 --- a/Simulation/TruthJiveXML/src/TruthTrackRetriever.cxx +++ b/Simulation/TruthJiveXML/src/TruthTrackRetriever.cxx @@ -50,16 +50,16 @@ namespace JiveXML { StatusCode TruthTrackRetriever::retrieve(ToolHandle<IFormatTool> &FormatTool) { //be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieving " << dataTypeName() << endmsg; //Retrieve the collection const McEventCollection* McEvtColl = NULL; if ( !evtStore()->contains<McEventCollection>( m_McEvtCollName )){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not find McEventCollection " << m_McEvtCollName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not find McEventCollection " << m_McEvtCollName << endmsg; return StatusCode::SUCCESS; } if( evtStore()->retrieve(McEvtColl, m_McEvtCollName).isFailure() ){ - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not retrieve McEventCollection " << m_McEvtCollName << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Could not retrieve McEventCollection " << m_McEvtCollName << endmsg; return StatusCode::SUCCESS; } @@ -71,7 +71,7 @@ namespace JiveXML { //Show in verbose mode if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Total number of particles in McEventCollection \"" - << m_McEvtCollName << "\" is " << NParticles << endreq; + << m_McEvtCollName << "\" is " << NParticles << endmsg; //Reserve space for the output data DataVect pt; pt.reserve(NParticles); @@ -154,7 +154,7 @@ namespace JiveXML { myDataMap["zEndVertex"] = zEndVertex; //Be verbose - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< pt.size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << dataTypeName() << ": "<< pt.size() << endmsg; //forward data to formating tool return FormatTool->AddToEvent(dataTypeName(), m_McEvtCollName, &myDataMap); diff --git a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx index e772d97ac1a..4ca7dff5931 100755 --- a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx +++ b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx @@ -178,9 +178,9 @@ TBCaloCoordinate::ctb_to_local( double& x_ctb, double& y_ctb, double& z_ctb, z_local = pt_local.z(); //log << MSG::DEBUG << "ctb : " << x_ctb << " " << y_ctb << " " - // << z_ctb << " " << endreq; + // << z_ctb << " " << endmsg; //log << MSG::DEBUG << " ==> local : " << x_local << " " << y_local << " " - // << z_local << " " << endreq; + // << z_local << " " << endmsg; } void @@ -197,9 +197,9 @@ TBCaloCoordinate::local_to_ctb(double& x_local,double& y_local,double& z_local, z_ctb = pt_ctb.z(); //log << MSG::DEBUG << " local : " << x_local << " " << y_local << " " - // << z_local << " " << endreq; + // << z_local << " " << endmsg; //log << MSG::DEBUG << " ==> ctb : " << x_ctb << " " << y_ctb << " " - // << z_ctb << " " << endreq; + // << z_ctb << " " << endmsg; } double @@ -434,7 +434,7 @@ TBCaloCoordinate:: read_MC_position() } //log << MSG::DEBUG << " Enveloppe position is read from Pool, and is : " - // << endreq; + // << endmsg; //print_transform( *m_transform_calo_to_ctb ); *m_transform_ctb_to_calo = m_transform_calo_to_ctb->inverse(); @@ -508,7 +508,7 @@ TBCaloCoordinate:: read_user_position() m_firstevt = 2; - //log << MSG::DEBUG << " x shift = " << m_table_calc_x << endreq; + //log << MSG::DEBUG << " x shift = " << m_table_calc_x << endmsg; //print_transform( *m_transform_calo_to_ctb ); } diff --git a/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx b/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx index 318a21ce4e4..5618c5eb14c 100755 --- a/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx +++ b/TestBeam/TBConditions/TBCondRunPar/src/TBCondRunParTool.cxx @@ -174,7 +174,7 @@ bool TBCondRunParTool::extractCool(const int run) { if (StatusCode::SUCCESS==detStore()->retrieve(atrlist,table)) { // std::ostringstream atrs; // atrlist->print(atrs); - // m_log << "Attribute list contents: " << atrs.str() << endreq; + // m_log << "Attribute list contents: " << atrs.str() << endmsg; long ldata; m_run_number=(*atrlist)["run_number"].data<int>(); m_trigger_type=(*atrlist)["trigger_type"].data<int>(); diff --git a/TestBeam/TBTPCnv/src/TBBPCContCnv_p1.cxx b/TestBeam/TBTPCnv/src/TBBPCContCnv_p1.cxx index 7a3c6492f5a..b142554a179 100644 --- a/TestBeam/TBTPCnv/src/TBBPCContCnv_p1.cxx +++ b/TestBeam/TBTPCnv/src/TBBPCContCnv_p1.cxx @@ -49,7 +49,7 @@ TBBPCContCnv_p1::persToTrans(const TBBPCCont_p1* pers, // fill the container with the scint object trans->push_back(BPC); -// log << MSG::DEBUG << "\033[34m" << "\t- pers->trans: BPC->getYPulse() " << BPC->getYPulse() << "\033[0m" <<endreq; +// log << MSG::DEBUG << "\033[34m" << "\t- pers->trans: BPC->getYPulse() " << BPC->getYPulse() << "\033[0m" <<endmsg; } } diff --git a/TestBeam/TBTPCnv/src/TBTailCatcherCnv_p1.cxx b/TestBeam/TBTPCnv/src/TBTailCatcherCnv_p1.cxx index 9dbb967a14b..da99c78c0ee 100644 --- a/TestBeam/TBTPCnv/src/TBTailCatcherCnv_p1.cxx +++ b/TestBeam/TBTPCnv/src/TBTailCatcherCnv_p1.cxx @@ -42,7 +42,7 @@ TBTailCatcherCnv_p1::persToTrans(const TBTailCatcher_p1* pers, // fill the container with the scint object trans->addScintillator(scint); -// log << MSG::DEBUG << "\033[34m" << "\t- pers->trans: scint->isOverflow() " << scint->isOverflow() << "\033[0m" <<endreq; +// log << MSG::DEBUG << "\033[34m" << "\t- pers->trans: scint->isOverflow() " << scint->isOverflow() << "\033[0m" <<endmsg; } unsigned int nSignals=pers->m_signals.size(); diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/src/TileGeoG4LookupBuilder.cc b/TileCalorimeter/TileG4/TileGeoG4SD/src/TileGeoG4LookupBuilder.cc index 71da8588fba..3242d99fbf3 100755 --- a/TileCalorimeter/TileG4/TileGeoG4SD/src/TileGeoG4LookupBuilder.cc +++ b/TileCalorimeter/TileG4/TileGeoG4SD/src/TileGeoG4LookupBuilder.cc @@ -255,7 +255,7 @@ void TileGeoG4LookupBuilder::CreateGeoG4Cells() { if (cell->detector > 1) { // ID for negative side cell_id = m_tileID->cell_id(std::min(cell->detector, 3), -(int)copysign(1.1, mtower), 0, abs(mtower) - 1, cell->sample - 1); - // (*m_log)<< MSG::DEBUG << " cell_id2="<<m_tileID->to_string(cell_id,-2)<<endreq; + // (*m_log)<< MSG::DEBUG << " cell_id2="<<m_tileID->to_string(cell_id,-2)<<endmsg; cellDim = m_theManager->get_cell_dim(cell_id); // Zmin2 and Zmax2 in ext.barrel - cell Z coordinates of EBC (negative ext.barrel) cell->zMin2 = cellDim->getZMin(0); @@ -281,7 +281,7 @@ void TileGeoG4LookupBuilder::CreateGeoG4Cells() { } // (*m_log)<< MSG::DEBUG <<" Zmin="<<_cell->zMin<<" Zmax="<<_cell->zMax - // <<" Zmin2="<<_cell->zMin2<<" Zmax2="<<_cell->zMax2<<endreq; + // <<" Zmin2="<<_cell->zMin2<<" Zmax2="<<_cell->zMax2<<endmsg; for (i = 0; i <= (cell->lastRow - cell->firstRow); i++) cell->nrOfTilesInRow.push_back(static_cast<int>(m_dbManager->TICLntilesrow(i))); diff --git a/TileCalorimeter/TileMonitoring/src/TileCellMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileCellMonTool.cxx index df410e98469..56d5bf3d8f1 100644 --- a/TileCalorimeter/TileMonitoring/src/TileCellMonTool.cxx +++ b/TileCalorimeter/TileMonitoring/src/TileCellMonTool.cxx @@ -879,7 +879,7 @@ StatusCode TileCellMonTool::fillHistograms() { if (msgLvl(MSG::VERBOSE)) { //tile_cell->print(); - //log << MSG::VERBOSE << "HWIdentifier: " << tile_cell->adc_HWID() << endreq; + //log << MSG::VERBOSE << "HWIdentifier: " << tile_cell->adc_HWID() << endmsg; msg(MSG::VERBOSE) << "Identifier: " << id << " " << m_tileID->to_string(id,-2) << endmsg; msg(MSG::VERBOSE) << " region: " << m_tileID->region(id) diff --git a/TileCalorimeter/TileMonitoring/src/TileDigitsMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileDigitsMonTool.cxx index f6082c71410..53358a82a64 100644 --- a/TileCalorimeter/TileMonitoring/src/TileDigitsMonTool.cxx +++ b/TileCalorimeter/TileMonitoring/src/TileDigitsMonTool.cxx @@ -392,7 +392,7 @@ StatusCode TileDigitsMonTool::fillHists() int headsize = headerVec.size(); //if (headsize > 16 ) { - // log << MSG::ERROR << "legth of BCID vector " << headsize << " - greater than 16 !" << endreq; + // log << MSG::ERROR << "legth of BCID vector " << headsize << " - greater than 16 !" << endmsg; // headsize = 16; //} diff --git a/TileCalorimeter/TileMonitoring/src/TileRawChannelMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileRawChannelMonTool.cxx index 5df79bd2225..eef12feaf03 100644 --- a/TileCalorimeter/TileMonitoring/src/TileRawChannelMonTool.cxx +++ b/TileCalorimeter/TileMonitoring/src/TileRawChannelMonTool.cxx @@ -1343,7 +1343,7 @@ StatusCode TileRawChannelMonTool::finalDsp(int ros, int drawer) } } // close loops over chans, gain - // log << MSG::WARNING << "LUCA Calling drawDsp" << endreq; + // log << MSG::WARNING << "LUCA Calling drawDsp" << endmsg; drawDsp(ros, drawer, moduleName); } //close if there are histograms for this Module @@ -2040,7 +2040,7 @@ void TileRawChannelMonTool::LaserFancyPlotting(int ros, int drawer, int maxgain, // if (bin!=0) // log<<MSG::DEBUG<<"["<<ros<<"]["<<drawer+1<<"]["<<adc<<"]["<< bin <<"] : mean=" - // << mean <<", var="<< rms*rms<<"\tVar/mean(corrected)="<< (rms*rms/mean) - Kapa*mean <<endreq; + // << mean <<", var="<< rms*rms<<"\tVar/mean(corrected)="<< (rms*rms/mean) - Kapa*mean <<endmsg; if (mean > 10e-3) { pmtGain_even[adc]->SetBinContent(ch + 1, (rms * rms / mean) - Kapa * mean); pmtGain_even[adc]->SetBinError(ch + 1, (rms * rms / mean) * sqrt((2 * drms / rms) * (2 * drms / rms) + (dmean / mean) * (dmean / mean))); @@ -2055,7 +2055,7 @@ void TileRawChannelMonTool::LaserFancyPlotting(int ros, int drawer, int maxgain, final_odd[adc]->SetBinError(ch + 1, m_finalHist1[ros][drawer][adc][0][0]->GetBinError(ch + 1) + 0.001); // log<<MSG::DEBUG<<"["<<ros<<"]["<<drawer+1<<"]["<<adc<<"]["<< bin <<"] : mean=" - // << mean <<", var="<< rms*rms<<"\tVar/mean(corrected)="<< (rms*rms/mean) - Kapa*mean <<endreq; + // << mean <<", var="<< rms*rms<<"\tVar/mean(corrected)="<< (rms*rms/mean) - Kapa*mean <<endmsg; if (mean > 10e-3) { pmtGain_odd[adc]->SetBinContent(ch + 1, (rms * rms / mean) - Kapa * mean); pmtGain_odd[adc]->SetBinError(ch + 1, (rms * rms / mean) * sqrt((2 * drms / rms) * (2 * drms / rms) + (dmean / mean) * (dmean / mean))); diff --git a/TileCalorimeter/TileSimUtils/src/TileSimInfoLoader.cxx b/TileCalorimeter/TileSimUtils/src/TileSimInfoLoader.cxx index 1b45e89630e..87ca2229946 100755 --- a/TileCalorimeter/TileSimUtils/src/TileSimInfoLoader.cxx +++ b/TileCalorimeter/TileSimUtils/src/TileSimInfoLoader.cxx @@ -87,7 +87,7 @@ StatusCode TileSimInfoLoader::initialize() { ATH_MSG_INFO ( (std::string)(*m_tileSimInfo) ); - //log << MSG::INFO << "Locking TileG4SimOptions in StoreGate" << endreq; + //log << MSG::INFO << "Locking TileG4SimOptions in StoreGate" << endmsg; //StatusCode sc = m_storeGate->setConst(m_tileSimInfo); return StatusCode::SUCCESS; diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.cxx index 929ae2973a6..af683e05f70 100755 --- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.cxx +++ b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.cxx @@ -61,8 +61,8 @@ StatusCode HelloAlg::initialize() { // Part 2: Print out the property values ATH_MSG_INFO - ( " MyInt = " << m_myInt << endreq - << " MyBool = " << (int)m_myBool << endreq + ( " MyInt = " << m_myInt << endmsg + << " MyBool = " << (int)m_myBool << endmsg << " MyDouble = " << m_myDouble); for (unsigned int i=0; i<m_myStringVec.size(); i++) { @@ -85,13 +85,13 @@ StatusCode HelloAlg::initialize() { msg(MSG::INFO) << " MyMatrix[" << i << "] = [ "; std::copy( m_myMatrix[i].begin(), m_myMatrix[i].end(), std::ostream_iterator<double>(msg().stream(), " ") ); - msg() << "]" << endreq; + msg() << "]" << endmsg; } ATH_MSG_INFO (" " << m_myPrivateHelloTool.propertyName() << " = " << m_myPrivateHelloTool.type() - << endreq + << endmsg << " " << m_myPublicHelloTool.propertyName() << " = " << m_myPublicHelloTool.type()); diff --git a/Tools/Scripts/share/newpkg b/Tools/Scripts/share/newpkg index ea52e73fc42..61bf479b2d0 100755 --- a/Tools/Scripts/share/newpkg +++ b/Tools/Scripts/share/newpkg @@ -79,7 +79,7 @@ StatusCode ${ALG}::initialize(){ // Part 1: Get the messaging service, print where you are MsgStream log(msgSvc(), name()); -log << MSG::INFO << "initialize()" << endreq; +log << MSG::INFO << "initialize()" << endmsg; return StatusCode::SUCCESS; } @@ -90,10 +90,10 @@ StatusCode ${ALG}::execute() { // Part 1: Get the messaging service, print where you are MsgStream log(msgSvc(), name()); -log << MSG::INFO << "execute()" << endreq; +log << MSG::INFO << "execute()" << endmsg; // Part 2: Print out the different levels of messages -log << MSG::INFO << "Your new package and algorithm are successfully installed" << endreq; +log << MSG::INFO << "Your new package and algorithm are successfully installed" << endmsg; return StatusCode::SUCCESS; } @@ -104,7 +104,7 @@ StatusCode ${ALG}::finalize() { // Part 1: Get the messaging service, print where you are MsgStream log(msgSvc(), name()); -log << MSG::INFO << "finalize()" << endreq; +log << MSG::INFO << "finalize()" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/TrackSlimmer.cxx b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/TrackSlimmer.cxx index 09dcb84f749..6cc831dd2f1 100755 --- a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/TrackSlimmer.cxx +++ b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/TrackSlimmer.cxx @@ -129,8 +129,8 @@ StatusCode Trk::TrackSlimmer::execute() slimmedTracks->push_back(slimmed); } } - //m_log<<MSG::INFO<<"Original Track"<<(**it)<<endreq; - //m_log<<MSG::INFO<<"Slimmed Track"<<(*slimmed)<<endreq; + //m_log<<MSG::INFO<<"Original Track"<<(**it)<<endmsg; + //m_log<<MSG::INFO<<"Slimmed Track"<<(*slimmed)<<endmsg; } else { if (params!=0 && params->size()>0) numTracksFailingPtCut++; } diff --git a/Tracking/TrkEvent/VxJetVertex/src/RecVertexPositions.cxx b/Tracking/TrkEvent/VxJetVertex/src/RecVertexPositions.cxx index 26564ef7bc1..151c534edc1 100644 --- a/Tracking/TrkEvent/VxJetVertex/src/RecVertexPositions.cxx +++ b/Tracking/TrkEvent/VxJetVertex/src/RecVertexPositions.cxx @@ -109,7 +109,7 @@ namespace Trk { << "yv " << m_position(jet_yv) << "+/-" << sqrt(m_positionError(jet_yv,jet_yv)) <<", " << "zv " << m_position(jet_zv) << "+/-" << sqrt(m_positionError(jet_zv,jet_zv)) <<", " << "phi " << m_position(jet_phi) << "+/-" << sqrt(m_positionError(jet_phi,jet_phi)) <<", " - << "theta " << m_position(jet_theta) << "+/-" << sqrt(m_positionError(jet_theta,jet_theta)) << endreq; + << "theta " << m_position(jet_theta) << "+/-" << sqrt(m_positionError(jet_theta,jet_theta)) << endmsg; if (!m_useWeightTimesPosition) { for (int i=5;i<m_position.rows();i++) { sl << "dist" << i << " " << m_position(i) << "+/-" << sqrt(m_positionError(i,i))<<" , "; @@ -119,10 +119,10 @@ namespace Trk { sl << "dist corrected" << i << " " << (m_positionError*m_position).eval()(i) << "+/-" << sqrt(m_positionError(i,i))<<" , "; } } - sl << endreq; + sl << endmsg; sl << m_positionError << std::endl; - sl << " ndf: " << m_fitQuality.doubleNumberDoF() << "\t chi2: " << m_fitQuality.chiSquared() << endreq; + sl << " ndf: " << m_fitQuality.doubleNumberDoF() << "\t chi2: " << m_fitQuality.chiSquared() << endmsg; return sl; } diff --git a/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx b/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx index 3cae3a2ee8a..ee25843b1b1 100644 --- a/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx +++ b/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx @@ -62,9 +62,9 @@ namespace Trk { << "yv " << m_position[jet_yv] << ", " << "zv " << m_position[jet_zv] << ", " << "phi " << m_position[jet_phi] << ", " - << "theta " << m_position[jet_theta] << endreq; + << "theta " << m_position[jet_theta] << endmsg; for (int i=5;i<m_position.rows();i++) { - sl << "dist" << i << " " << m_position[i] << " ." << endreq; + sl << "dist" << i << " " << m_position[i] << " ." << endmsg; } return sl; } diff --git a/Tracking/TrkEvent/VxJetVertex/src/VxJetFitterDebugInfo.cxx b/Tracking/TrkEvent/VxJetVertex/src/VxJetFitterDebugInfo.cxx index fa2ac0c8486..cbbcbb0a5b5 100644 --- a/Tracking/TrkEvent/VxJetVertex/src/VxJetFitterDebugInfo.cxx +++ b/Tracking/TrkEvent/VxJetVertex/src/VxJetFitterDebugInfo.cxx @@ -12,8 +12,8 @@ namespace Trk { MsgStream& VxJetFitterDebugInfo::dump(MsgStream& sl) const { sl << "VxJetFitterDebugInfo: numFitIterations " << m_numFitIterations << - " numSignFlipFitIterations " << m_numSignFlipFitIterations<<endreq; - //" numSignFlip " << m_numSignFlips << endreq; + " numSignFlipFitIterations " << m_numSignFlipFitIterations<<endmsg; + //" numSignFlip " << m_numSignFlips << endmsg; return sl; } diff --git a/Tracking/TrkFitter/TrkFitterUtils/src/TrackFitInputPreparator.cxx b/Tracking/TrkFitter/TrkFitterUtils/src/TrackFitInputPreparator.cxx index 8f541354d2b..dcda7d277d3 100755 --- a/Tracking/TrkFitter/TrkFitterUtils/src/TrackFitInputPreparator.cxx +++ b/Tracking/TrkFitter/TrkFitterUtils/src/TrackFitInputPreparator.cxx @@ -92,7 +92,7 @@ StatusCode Trk::TrackFitInputPreparator::copyToTrajectory worstCaseSorting ? stable_sort( sortedHitSet.begin(), sortedHitSet.end(), MB_IndexCompFunc ): sort( sortedHitSet.begin(), sortedHitSet.end(), MB_IndexCompFunc ); - /* std::cout << "input track was not sorted. Now the sequence is :"<<endreq; + /* std::cout << "input track was not sorted. Now the sequence is :"<<endmsg; MB_IndexVector::iterator itLog = sortedHitSet.begin(); for ( ; itLog!=sortedHitSet.end(); ++itLog) std::cout <<" " << (*itLog).second; std::cout <<std::endl; */ @@ -589,8 +589,8 @@ void Trk::TrackFitInputPreparator::insertStateIntoTrajectory(Trajectory& traject trajectory.back().checkinMaterialEffects(new Trk::ProtoMaterialEffects(meot)); trajectory.back().isOutlier(TrackState::Scatterer); // Identifier id = tsos->surface().associatedDetectorElementIdentifier(); - // msg ( MSG::INFO ) << "added material TSoS:" << id << " " << &(tsos->surface()) << " " << m_idHelper->print_to_string(id) << " " << tsos->dumpType() << endreq; - // msg ( MSG::INFO ) << " trk pos=" <<tsos->trackParameters()->position() << " mom=" << tsos->trackParameters()->momentum() << " rho=" << tsos->trackParameters()->position().perp() << endreq; + // msg ( MSG::INFO ) << "added material TSoS:" << id << " " << &(tsos->surface()) << " " << m_idHelper->print_to_string(id) << " " << tsos->dumpType() << endmsg; + // msg ( MSG::INFO ) << " trk pos=" <<tsos->trackParameters()->position() << " mom=" << tsos->trackParameters()->momentum() << " rho=" << tsos->trackParameters()->position().perp() << endmsg; } // end if meot } delete tsos; diff --git a/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h b/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h index 1029898180f..83c923d540a 100644 --- a/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h +++ b/Tracking/TrkFitter/TrkKalmanFitter/doc/packagedoc.h @@ -209,7 +209,7 @@ retrieve the tool: <pre> if (m_trackFitter.retrieve().isFailure()) { m_log << MSG::ERROR << "can not retrieve the track fitter tool " - << m_trackFitter.typeAndName() << endreq; + << m_trackFitter.typeAndName() << endmsg; return StatusCode::FAILURE; } </pre></td></tr></table> diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h index 1c04a74f9c1..22b71318f03 100755 --- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h +++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FastVertexFitter.h @@ -69,7 +69,7 @@ namespace Trk /** Interface for TrackParameters and NeutralParameters with starting point */ xAOD::Vertex * fit(const std::vector<const TrackParameters*> & perigeeList, const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/, - const Amg::Vector3D& startingPoint) {msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const Amg::Vector3D&) ignoring neutrals" << endreq; return fit(perigeeList, startingPoint);}; + const Amg::Vector3D& startingPoint) {msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const Amg::Vector3D&) ignoring neutrals" << endmsg; return fit(perigeeList, startingPoint);}; /** Interface for ParametersBase with vertex constraint */ /** the position of the constraint is ALWAYS the starting point */ @@ -79,14 +79,14 @@ namespace Trk /** Interface for TrackParameters and NeutralParameters with RecVertex starting point */ xAOD::Vertex * fit(const std::vector<const TrackParameters*> & perigeeList, const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/, - const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const xAOD::Vertex&) ignoring neutrals" << endreq; return fit(perigeeList, constraint);}; + const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const xAOD::Vertex&) ignoring neutrals" << endmsg; return fit(perigeeList, constraint);}; /** * Fit interface with no starting point or constraint. (0,0,0) will be assumed. */ virtual xAOD::Vertex * fit(const std::vector<const Trk::TrackParameters*>& perigeeList); - xAOD::Vertex * fit(const std::vector<const TrackParameters*>& perigeeList,const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&) ignoring neutrals" << endreq; return fit(perigeeList);}; + xAOD::Vertex * fit(const std::vector<const TrackParameters*>& perigeeList,const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&) ignoring neutrals" << endmsg; return fit(perigeeList);}; virtual xAOD::Vertex * fit(const std::vector<const Trk::Track*>& vectorTrk); @@ -97,7 +97,7 @@ namespace Trk /** *Interface for xAOD::TrackParticle and NeutralParticle with starting point */ xAOD::Vertex * fit(const std::vector<const xAOD::TrackParticle*>& vectorTrk, const std::vector<const xAOD::NeutralParticle*>& /*vectorNeut*/, - const Amg::Vector3D& startingPoint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const Amg::Vector3D&) ignoring neutrals" << endreq; return fit(vectorTrk, startingPoint);}; + const Amg::Vector3D& startingPoint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const Amg::Vector3D&) ignoring neutrals" << endmsg; return fit(vectorTrk, startingPoint);}; /** * Interface for xAOD::TrackParticle with vertex constraint * the position of the constraint is ALWAYS the starting point */ @@ -107,7 +107,7 @@ namespace Trk * the position of the constraint is ALWAYS the starting point */ xAOD::Vertex * fit(const std::vector<const xAOD::TrackParticle*>& vectorTrk, const std::vector<const xAOD::NeutralParticle*>& /*vectorNeut*/, - const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const xAOD::Vertex&) ignoring neutrals" << endreq; return fit(vectorTrk, constraint);}; + const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FastVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const xAOD::Vertex&) ignoring neutrals" << endmsg; return fit(vectorTrk, constraint);}; private: unsigned int m_maxIterations; diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h index d7d749581d0..8e3d3678a73 100755 --- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h +++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/TrkVertexBilloirTools/FullVertexFitter.h @@ -70,7 +70,7 @@ namespace Trk /** Interface for TrackParameters and NeutralParameters with starting point */ xAOD::Vertex * fit(const std::vector<const TrackParameters*> & perigeeList, const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/, - const Amg::Vector3D& startingPoint) {msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const Amg::Vector3D&) ignoring neutrals" << endreq; return fit(perigeeList, startingPoint);}; + const Amg::Vector3D& startingPoint) {msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const Amg::Vector3D&) ignoring neutrals" << endmsg; return fit(perigeeList, startingPoint);}; /** Interface for ParametersBase with vertex constraint */ /** the position of the constraint is ALWAYS the starting point */ @@ -80,14 +80,14 @@ namespace Trk /** Interface for TrackParameters and NeutralParameters with RecVertex starting point */ xAOD::Vertex * fit(const std::vector<const TrackParameters*> & perigeeList, const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/, - const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const xAOD::Vertex&) ignoring neutrals" << endreq; return fit(perigeeList, constraint);}; + const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&,const xAOD::Vertex&) ignoring neutrals" << endmsg; return fit(perigeeList, constraint);}; /** * Fit interface with no starting point or constraint. (0,0,0) will be assumed. */ virtual xAOD::Vertex * fit(const std::vector<const Trk::TrackParameters*>& perigeeList); - xAOD::Vertex * fit(const std::vector<const TrackParameters*>& perigeeList,const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&) ignoring neutrals" << endreq; return fit(perigeeList);}; + xAOD::Vertex * fit(const std::vector<const TrackParameters*>& perigeeList,const std::vector<const Trk::NeutralParameters*> & /*neutralPerigeeList*/){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParameters*>&,const std::vector<const Trk::NeutralParameters*>&) ignoring neutrals" << endmsg; return fit(perigeeList);}; virtual xAOD::Vertex * fit(const std::vector<const Trk::Track*>& vectorTrk); @@ -98,7 +98,7 @@ namespace Trk /** *Interface for xAOD::TrackParticle and NeutralParticle with starting point */ xAOD::Vertex * fit(const std::vector<const xAOD::TrackParticle*>& vectorTrk, const std::vector<const xAOD::NeutralParticle*>& /*vectorNeut*/, - const Amg::Vector3D& startingPoint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const Amg::Vector3D&) ignoring neutrals" << endreq; return fit(vectorTrk, startingPoint);}; + const Amg::Vector3D& startingPoint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const Amg::Vector3D&) ignoring neutrals" << endmsg; return fit(vectorTrk, startingPoint);}; /** * Interface for xAOD::TrackParticle with vertex constraint * the position of the constraint is ALWAYS the starting point */ @@ -108,7 +108,7 @@ namespace Trk * the position of the constraint is ALWAYS the starting point */ xAOD::Vertex * fit(const std::vector<const xAOD::TrackParticle*>& vectorTrk, const std::vector<const xAOD::NeutralParticle*>& /*vectorNeut*/, - const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const xAOD::Vertex&) ignoring neutrals" << endreq; return fit(vectorTrk, constraint);}; + const xAOD::Vertex& constraint){msg(MSG::WARNING) << "FullVertexFitter::fit(fit(const std::vector<const TrackParticle*>&,const std::vector<const Trk::NeutralParticle*>&,const xAOD::Vertex&) ignoring neutrals" << endmsg; return fit(vectorTrk, constraint);}; private: unsigned int m_maxIterations; diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx index 630c604eee5..03a9277f340 100755 --- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FastVertexFitter.cxx @@ -60,41 +60,41 @@ namespace Trk if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } if ( m_linFactory.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_linFactory << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_linFactory << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg; } //XAOD Converter if ( m_xaodConverter.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_xaodConverter << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_xaodConverter << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_xaodConverter << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_xaodConverter << endmsg; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode FastVertexFitter::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -270,7 +270,7 @@ namespace Trk { // msg(MSG::VERBOSE) << "Start of iteration " << niter << ", starting point (" // << linPoint [0] << ", " << linPoint [1] << ", " << linPoint [2] - // << ") and " << originalPerigees.size() << " tracks." << endreq; + // << ") and " << originalPerigees.size() << " tracks." << endmsg; billoirTracks.clear(); chi2Old = chi2New; @@ -299,24 +299,24 @@ namespace Trk locXpVec[1] = locXpVec[1] - linPoint[1]; locXpVec[2] = locXpVec[2] - linPoint[2]; - // msg(MSG::VERBOSE) << "Track: " << count << endreq; + // msg(MSG::VERBOSE) << "Track: " << count << endmsg; // count++; // const Trk::MeasuredPerigee* tmpPerigee = dynamic_cast<const Trk::MeasuredPerigee*>(*iter); //AmgVector(5) expParameters = linTrack->expectedParametersAtPCA(); - // msg(MSG::VERBOSE) << "locXp: " << locXpVec[0] << "\t" << locXpVec[1] << "\t" << locXpVec[2] << endreq; + // msg(MSG::VERBOSE) << "locXp: " << locXpVec[0] << "\t" << locXpVec[1] << "\t" << locXpVec[2] << endmsg; // first get the cov 2x2 sub matrix and then invert (don't get the 2x2 sub matrix of the 5x5 already inverted cov matrix) AmgMatrix(2,2) billoirCovMat = linTrack->expectedCovarianceAtPCA().block<2,2>(0,0); - // msg(MSG::VERBOSE) << "CovMatrix: " << billoirCovMat[0][0] << "\t" << billoirCovMat[0][1] << endreq; - // msg(MSG::VERBOSE) << " " << billoirCovMat[1][0] << "\t" << billoirCovMat[1][1] << endreq; + // msg(MSG::VERBOSE) << "CovMatrix: " << billoirCovMat[0][0] << "\t" << billoirCovMat[0][1] << endmsg; + // msg(MSG::VERBOSE) << " " << billoirCovMat[1][0] << "\t" << billoirCovMat[1][1] << endmsg; AmgMatrix(2,2) billoirWeightMat = billoirCovMat.inverse().eval(); - // msg(MSG::VERBOSE) << "WeightMatrix: " << billoirWeightMat[0][0] << "\t" << billoirWeightMat[0][1] << endreq; - // msg(MSG::VERBOSE) << " " << billoirWeightMat[1][0] << "\t" << billoirWeightMat[1][1] << endreq; + // msg(MSG::VERBOSE) << "WeightMatrix: " << billoirWeightMat[0][0] << "\t" << billoirWeightMat[0][1] << endmsg; + // msg(MSG::VERBOSE) << " " << billoirWeightMat[1][0] << "\t" << billoirWeightMat[1][1] << endmsg; // D matrix for d0 and z0 D = linTrack->positionJacobian().block<2,3>(0,0); - // msg(MSG::VERBOSE) << "DMatrix: " << D[0][0] << "\t" << D[0][1] << endreq; - // msg(MSG::VERBOSE) << " " << D[1][0] << "\t" << D[1][1] << endreq; + // msg(MSG::VERBOSE) << "DMatrix: " << D[0][0] << "\t" << D[0][1] << endmsg; + // msg(MSG::VERBOSE) << " " << D[1][0] << "\t" << D[1][1] << endmsg; // Calculate DtWD and DtWD*x and sum them BilloirTrack locBilloirTrack; @@ -390,9 +390,9 @@ namespace Trk tmpPos[0] += delta_V[0]; tmpPos[1] += delta_V[1]; tmpPos[2] += delta_V[2]; linPoint = tmpPos; - // msg(MSG::VERBOSE) << "Vertex of Iteration " << niter << " with chi2: " << chi2New << "\t old chi2: " << chi2 << endreq; - // msg(MSG::VERBOSE) << "deltaV: (" << delta_V[0] << ", " << delta_V[1] << ", " << delta_V[2] << ")" << endreq; - // msg(MSG::VERBOSE) << linPoint << endreq; + // msg(MSG::VERBOSE) << "Vertex of Iteration " << niter << " with chi2: " << chi2New << "\t old chi2: " << chi2 << endmsg; + // msg(MSG::VERBOSE) << "deltaV: (" << delta_V[0] << ", " << delta_V[1] << ", " << delta_V[2] << ")" << endmsg; + // msg(MSG::VERBOSE) << linPoint << endmsg; if ( chi2New < chi2 ) { @@ -478,7 +478,7 @@ namespace Trk { if(vectorTrk.size() == 0) { - msg(MSG::INFO)<<"Empty vector of tracks passed"<<endreq; + msg(MSG::INFO)<<"Empty vector of tracks passed"<<endmsg; return 0; } @@ -490,7 +490,7 @@ namespace Trk const Trk::TrackParameters * tmpMeasPer = &((*i)->perigeeParameters()); if(tmpMeasPer!=0) measuredPerigees.push_back(tmpMeasPer); - else msg(MSG::INFO)<<"Failed to dynamic_cast this track parameters to perigee"<<endreq; //TODO: Failed to implicit cast the perigee parameters to track parameters? + else msg(MSG::INFO)<<"Failed to dynamic_cast this track parameters to perigee"<<endmsg; //TODO: Failed to implicit cast the perigee parameters to track parameters? } diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx index bfd97bf14a1..273d49ec34d 100755 --- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx @@ -89,40 +89,40 @@ namespace Trk { if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL)<< "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::FATAL)<< "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } if ( m_linFactory.retrieve().isFailure() ) { - msg(MSG::FATAL)<< "Failed to retrieve tool " << m_linFactory << endreq; + msg(MSG::FATAL)<< "Failed to retrieve tool " << m_linFactory << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg; } //XAOD Converter if ( m_xaodConverter.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_xaodConverter << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_xaodConverter << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_xaodConverter << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_xaodConverter << endmsg; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode FullVertexFitter::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -455,8 +455,8 @@ namespace Trk { // protect while loop if (msgLvl(MSG::WARNING)) { - msg(MSG::WARNING) << " Track direction angles have numerical problems, stop perigee parameter update." << endreq; - msg(MSG::WARNING) << " Phi value: "<<mom_at_Origin[iRP] ( 0 ) <<endreq; + msg(MSG::WARNING) << " Track direction angles have numerical problems, stop perigee parameter update." << endmsg; + msg(MSG::WARNING) << " Phi value: "<<mom_at_Origin[iRP] ( 0 ) <<endmsg; } return 0; } @@ -465,8 +465,8 @@ namespace Trk { // protect while loop if (msgLvl(MSG::WARNING)) { - msg(MSG::WARNING) << " Track direction angles have numerical problems, stop perigee parameter update." << endreq; - msg(MSG::WARNING) << " Theta value: "<<mom_at_Origin[iRP] ( 1 ) <<endreq; + msg(MSG::WARNING) << " Track direction angles have numerical problems, stop perigee parameter update." << endmsg; + msg(MSG::WARNING) << " Theta value: "<<mom_at_Origin[iRP] ( 1 ) <<endmsg; } return 0; } @@ -628,7 +628,7 @@ namespace Trk { if(vectorTrk.size() == 0) { - msg(MSG::INFO)<<"Empty vector of tracks passed"<<endreq; + msg(MSG::INFO)<<"Empty vector of tracks passed"<<endmsg; return 0; } @@ -640,7 +640,7 @@ namespace Trk const Trk::TrackParameters * tmpMeasPer = &((*i)->perigeeParameters()); if(tmpMeasPer!=0) measuredPerigees.push_back(tmpMeasPer); - else msg(MSG::INFO)<<"Failed to dynamic_cast this track parameters to perigee"<<endreq; //TODO: Failed to implicit cast the perigee parameters to track parameters? + else msg(MSG::INFO)<<"Failed to dynamic_cast this track parameters to perigee"<<endmsg; //TODO: Failed to implicit cast the perigee parameters to track parameters? } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx index c696acb96d0..7e434ba22b1 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx @@ -30,13 +30,13 @@ namespace Trk StatusCode Chi2TrackCompatibilityEstimator::initialize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode Chi2TrackCompatibilityEstimator::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -130,7 +130,7 @@ namespace Trk return _compatibility(myNeutralAtaPlane, vertex); } - msg(MSG::WARNING) << " No compatibility plane attached to the VxTrackAtVertex. Compatibility couldn't be found... 0 compatibility returned." << endreq; + msg(MSG::WARNING) << " No compatibility plane attached to the VxTrackAtVertex. Compatibility couldn't be found... 0 compatibility returned." << endmsg; return 100; } } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DetAnnealingMaker.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DetAnnealingMaker.cxx index e0cd0da5a4f..f044cf391e0 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DetAnnealingMaker.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DetAnnealingMaker.cxx @@ -35,13 +35,13 @@ namespace Trk StatusCode DetAnnealingMaker::initialize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode DetAnnealingMaker::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -49,7 +49,7 @@ namespace Trk { m_PtrToActualTemperature=0; m_isequilibrium=false; - msg(MSG::DEBUG) << "Annealing resetted" << endreq; + msg(MSG::DEBUG) << "Annealing resetted" << endmsg; } void DetAnnealingMaker::anneal() { diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DummyAnnealingMaker.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DummyAnnealingMaker.cxx index 4684afec697..231589d4d5e 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DummyAnnealingMaker.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/DummyAnnealingMaker.cxx @@ -21,13 +21,13 @@ namespace Trk StatusCode DummyAnnealingMaker::initialize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode DummyAnnealingMaker::finalize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx index 88c389b8387..5f0fa11fa2d 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx @@ -45,11 +45,11 @@ namespace Trk } if (m_magFieldSvc.retrieve().isFailure() ) { - msg(MSG::FATAL)<<"Could not find magnetic field service." << endreq; + msg(MSG::FATAL)<<"Could not find magnetic field service." << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx index 9452bd7e071..965fd19d2d8 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx @@ -49,22 +49,22 @@ namespace Trk StatusCode ImpactPoint3dEstimator::initialize() { if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } if (m_magFieldSvc.retrieve().isFailure() ) { - msg(MSG::FATAL)<<"Could not find magnetic field service." << endreq; + msg(MSG::FATAL)<<"Could not find magnetic field service." << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode ImpactPoint3dEstimator::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -108,7 +108,7 @@ namespace Trk Amg::Transform3D* thePlane = new Amg::Transform3D(DeltaRcorrected, YDir, momentumUnit, *theVertex); #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - std::cout << "the translation is, directly from Transform3d: " << thePlane.getTranslation() << endreq; + std::cout << "the translation is, directly from Transform3d: " << thePlane.getTranslation() << endmsg; #endif return new PlaneSurface(thePlane); @@ -145,12 +145,12 @@ namespace Trk const Trk::Perigee* thePerigee=dynamic_cast<const Trk::Perigee*>(trackPerigee); if (thePerigee==0) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " ImpactPoint3dEstimator didn't get a Perigee* as ParametersBase*: cast not possible. Need to EXTRAPOLATE..." << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " ImpactPoint3dEstimator didn't get a Perigee* as ParametersBase*: cast not possible. Need to EXTRAPOLATE..." << endmsg; /* run-1 code had not been adapted for Neutral parameters: const TrackParameters* ch_params = dynamic_cast<const TrackParameters*>(trackPerigee); if (ch_params == 0) { - msg(MSG::ERROR) << " Cannot cast to charged track parameters. Neutrals are not supported... " << endreq; + msg(MSG::ERROR) << " Cannot cast to charged track parameters. Neutrals are not supported... " << endmsg; return 0; }*/ @@ -160,7 +160,7 @@ namespace Trk if (thePerigee == NULL) return 0; } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<< " Now running ImpactPoint3dEstimator::Estimate3dIP" << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE)<< " Now running ImpactPoint3dEstimator::Estimate3dIP" << endmsg; double phi0=thePerigee->parameters()[Trk::phi0]; double cosphi0=-sin(phi0); double sinphi0=cos(phi0); @@ -206,7 +206,7 @@ namespace Trk do { #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - msg(MSG::VERBOSE)<< "Cycle number: " << ncycle << " old phi: " << phiactual << endreq; + msg(MSG::VERBOSE)<< "Cycle number: " << ncycle << " old phi: " << phiactual << endmsg; #endif // distance=std::sqrt(std::pow(x0-xc+Rt*cosphiactual,2)+ // std::pow(y0-yc+Rt*sinphiactual,2)+ @@ -215,7 +215,7 @@ namespace Trk derivative=(x0-xc)*(-Rt*sinphiactual)+(y0-yc)*Rt*cosphiactual+(z0-zc-Rt*phiactual*cottheta)*(-Rt*cottheta); secderivative=Rt*(-(x0-xc)*cosphiactual-(y0-yc)*sinphiactual+Rt*cottheta*cottheta); #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - msg(MSG::VERBOSE)<< "derivative is: " << derivative << " sec derivative is: " << secderivative << endreq; + msg(MSG::VERBOSE)<< "derivative is: " << derivative << " sec derivative is: " << secderivative << endmsg; #endif deltaphi=-derivative/secderivative; @@ -229,13 +229,13 @@ namespace Trk sinphiactual=cos(phiactual); #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - msg(MSG::VERBOSE)<< "derivative is: " << derivative << " sec derivative is: " << secderivative << endreq; + msg(MSG::VERBOSE)<< "derivative is: " << derivative << " sec derivative is: " << secderivative << endmsg; std::cout << std::setprecision(25) << std::sqrt(std::pow(x0-xc+Rt*cosphiactual,2)+ std::pow(y0-yc+Rt*sinphiactual,2)+ std::pow(z0-zc-Rt*cottheta*phiactual,2)) << std::endl; msg(MSG::VERBOSE)<< "actual distance is: " << std::sqrt(std::pow(x0-xc+Rt*cosphiactual,2)+ std::pow(y0-yc+Rt*sinphiactual,2)+ - std::pow(z0-zc-Rt*cottheta*phiactual,2)) << endreq; + std::pow(z0-zc-Rt*cottheta*phiactual,2)) << endmsg; #endif if (secderivative<0) throw error::ImpactPoint3dEstimatorProblem("Second derivative is negative"); @@ -245,7 +245,7 @@ namespace Trk ncycle+=1; if (ncycle>m_maxiterations||fabs(deltaphi)<m_precision) { #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - msg(MSG::VERBOSE)<< "found minimum at: " << phiactual << endreq; + msg(MSG::VERBOSE)<< "found minimum at: " << phiactual << endmsg; #endif isok=true; } @@ -269,8 +269,8 @@ namespace Trk if ((DeltaR-DeltaRcorrected).mag()>1e-4) { - msg(MSG::WARNING) << " DeltaR and MomentumDir are not orthogonal " << endreq; - msg(MSG::DEBUG)<< std::setprecision(10) << " DeltaR-DeltaRcorrected: " << (DeltaR-DeltaRcorrected).mag() << endreq; + msg(MSG::WARNING) << " DeltaR and MomentumDir are not orthogonal " << endmsg; + msg(MSG::DEBUG)<< std::setprecision(10) << " DeltaR-DeltaRcorrected: " << (DeltaR-DeltaRcorrected).mag() << endmsg; } Amg::Vector3D YDir=MomentumDir.cross(DeltaRcorrected); @@ -283,23 +283,23 @@ namespace Trk msg(MSG::VERBOSE)<< "final minimal distance is: " << std::sqrt(std::pow(x0-xc+Rt*cosphiactual,2)+ std::pow(y0-yc+Rt*sinphiactual,2)+ - std::pow(z0-zc-Rt*cottheta*phiactual,2)) << endreq; + std::pow(z0-zc-Rt*cottheta*phiactual,2)) << endmsg; } if(msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "POCA in 3D is: " << *m_vertex << endreq; + msg(MSG::DEBUG) << "POCA in 3D is: " << *m_vertex << endmsg; } //store the plane... if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE)<< "plane to which to extrapolate X " << DeltaRcorrected << " Y " << YDir << " Z " << MomentumDir << endreq; + msg(MSG::VERBOSE)<< "plane to which to extrapolate X " << DeltaRcorrected << " Y " << YDir << " Z " << MomentumDir << endmsg; Amg::Transform3D* thePlane = new Amg::Transform3D(DeltaRcorrected, YDir, MomentumDir, *theVertex); #ifdef IMPACTPOINT3DESTIMATOR_DEBUG - std::cout << "the translation is, directly from Transform3d: " << thePlane.getTranslation() << endreq; + std::cout << "the translation is, directly from Transform3d: " << thePlane.getTranslation() << endmsg; #endif return new PlaneSurface(thePlane); @@ -335,7 +335,7 @@ namespace Trk Trk::AtaPlane * ImpactPoint3dEstimator::IP3dAtaPlane(VxTrackAtVertex & vtxTrack,const Amg::Vector3D & vertex) const { if (!vtxTrack.initialPerigee() && vtxTrack.initialNeutralPerigee()) - msg(MSG::WARNING) << "Calling ImpactPoint3dEstimator::IP3dAtaPlane cannot return NeutralAtaPlane" << endreq; + msg(MSG::WARNING) << "Calling ImpactPoint3dEstimator::IP3dAtaPlane cannot return NeutralAtaPlane" << endmsg; const PlaneSurface* theSurfaceAtIP(0); @@ -345,15 +345,15 @@ namespace Trk } catch (error::ImpactPoint3dEstimatorProblem err) { - msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance between track and vertex seed: " << err.p << endreq; + msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance between track and vertex seed: " << err.p << endmsg; return 0; } if(!theSurfaceAtIP) msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance and returned 0 " -<< endreq; +<< endmsg; #ifdef ImpactPoint3dAtaPlaneFactory_DEBUG - msg(MSG::VERBOSE) << "Original perigee was: " << *(vtxTrack.initialPerigee()) << endreq; - msg(MSG::VERBOSE) << "The resulting surface is: " << *theSurfaceAtIP << endreq; + msg(MSG::VERBOSE) << "Original perigee was: " << *(vtxTrack.initialPerigee()) << endmsg; + msg(MSG::VERBOSE) << "The resulting surface is: " << *theSurfaceAtIP << endmsg; #endif Trk::AtaPlane* res = const_cast<Trk::AtaPlane *>(dynamic_cast<const Trk::AtaPlane *> @@ -373,15 +373,15 @@ namespace Trk } catch (error::ImpactPoint3dEstimatorProblem err) { - msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance between track and vertex seed: " << err.p << endreq; + msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance between track and vertex seed: " << err.p << endmsg; return 0; } if(!theSurfaceAtIP) msg(MSG::WARNING) << " ImpactPoin3dEstimator failed to find minimum distance and returned 0 " -<< endreq; +<< endmsg; #ifdef ImpactPoint3dAtaPlaneFactory_DEBUG - msg(MSG::VERBOSE) << "Original neutral perigee was: " << *initNeutPerigee << endreq; - msg(MSG::VERBOSE) << "The resulting surface is: " << *theSurfaceAtIP << endreq; + msg(MSG::VERBOSE) << "Original neutral perigee was: " << *initNeutPerigee << endmsg; + msg(MSG::VERBOSE) << "The resulting surface is: " << *theSurfaceAtIP << endmsg; #endif Trk::NeutralAtaPlane* res = const_cast<Trk::NeutralAtaPlane *>(dynamic_cast<const Trk::NeutralAtaPlane *> diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx index c8f9a609fb8..10e28791a52 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexTrackUpdator.cxx @@ -55,16 +55,16 @@ namespace Trk if(trk.weight() > m_maxWeight) { //actual error case - msg(MSG::INFO) << "The VxTrackAtVertex passed does not have a Linearized Track" << endreq; - msg(MSG::INFO) << "Please produce one with corresponding LinearizedTrackFactory"<< endreq; - msg(MSG::INFO) << "The VxTrackAtVertex returned not refitted"<< endreq; + msg(MSG::INFO) << "The VxTrackAtVertex passed does not have a Linearized Track" << endmsg; + msg(MSG::INFO) << "Please produce one with corresponding LinearizedTrackFactory"<< endmsg; + msg(MSG::INFO) << "The VxTrackAtVertex returned not refitted"<< endmsg; // std::cout<<"Weight of the track: "<<trk.weight()<<std::endl; }else{ if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "The VxTrackAtVertex passed does not have a Linearized Track" << endreq; - msg(MSG::DEBUG) << "However the weight of this track is less than " << m_maxWeight << endreq; - msg(MSG::DEBUG) << "The VxTrackAtVertex returned not refitted"<< endreq; + msg(MSG::DEBUG) << "The VxTrackAtVertex passed does not have a Linearized Track" << endmsg; + msg(MSG::DEBUG) << "However the weight of this track is less than " << m_maxWeight << endmsg; + msg(MSG::DEBUG) << "The VxTrackAtVertex returned not refitted"<< endmsg; } }//end of absent linTrack case @@ -85,7 +85,7 @@ namespace Trk if (Sm.determinant() == 0.0) { ATH_MSG_WARNING("Matrix can not be inverted, new type of check as part of Eigen, please monitor." - << endreq << "Matrix Sm = " << Sm); + << endmsg << "Matrix Sm = " << Sm); return; } Sm = Sm.inverse().eval(); @@ -115,25 +115,25 @@ namespace Trk if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "-U- phi = " << refTrkPar[Trk::phi0]; refTrkPar[Trk::phi0] = fmod(refTrkPar[Trk::phi0]+M_PI,2*M_PI)-M_PI; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " out of range, now " - << "corrected to " << refTrkPar[Trk::phi0] << endreq; + << "corrected to " << refTrkPar[Trk::phi0] << endmsg; } else if(refTrkPar[Trk::phi0]<-M_PI) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "-U- phi = " << refTrkPar[Trk::phi0]; refTrkPar[Trk::phi0] = fmod(refTrkPar[Trk::phi0]-M_PI,2*M_PI)+M_PI; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " out of range, now " - << "corrected to " << refTrkPar[Trk::phi0] << endreq; + << "corrected to " << refTrkPar[Trk::phi0] << endmsg; } if (refTrkPar[Trk::theta] > M_PI) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " Theta out of range: correcting theta: " << refTrkPar[Trk::theta]; refTrkPar[Trk::theta]=fmod(refTrkPar[Trk::theta]+M_PI,2*M_PI)-M_PI; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " to: " << refTrkPar[Trk::theta] << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " to: " << refTrkPar[Trk::theta] << endmsg; } else if (refTrkPar[Trk::theta]<0) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " Theta out of range: correcting theta: " << refTrkPar[Trk::theta]; refTrkPar[Trk::theta]=fmod(refTrkPar[Trk::theta]-M_PI,2*M_PI)+M_PI; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " to: " << refTrkPar[Trk::theta] << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " to: " << refTrkPar[Trk::theta] << endmsg; } if (refTrkPar[Trk::theta] < 0) @@ -156,7 +156,7 @@ namespace Trk const AmgSymMatrix(3)& vrt_cov = vtx.covariancePosition(); if (vrt_cov.determinant() == 0.0) { ATH_MSG_WARNING("Matrix can not be inverted, new type of check as part of Eigen, please monitor." - << endreq << "Matrix vrt_cov = " << vrt_cov); + << endmsg << "Matrix vrt_cov = " << vrt_cov); return; } const AmgSymMatrix(3) vrt_weight = vtx.covariancePosition().inverse(); diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx index c6ba2e40e68..fc931a9752e 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/KalmanVertexUpdator.cxx @@ -25,7 +25,7 @@ namespace Trk{ StatusCode sc = AlgTool::initialize(); if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } @@ -34,7 +34,7 @@ namespace Trk{ StatusCode KalmanVertexUpdator::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -62,8 +62,8 @@ namespace Trk{ //is already fitted to the vertex and the number of tracks at vertex is not 0 if( sign < 0 && tr_size == 0 ) { - msg(MSG::ERROR) << "No tracks fitted to this vertex yet: can not remove any" << endreq; - msg(MSG::ERROR) << "The copy of initial VxCandidate returned" << endreq; + msg(MSG::ERROR) << "No tracks fitted to this vertex yet: can not remove any" << endmsg; + msg(MSG::ERROR) << "The copy of initial VxCandidate returned" << endmsg; return new xAOD::Vertex( vtx ); } @@ -90,7 +90,7 @@ namespace Trk{ ATH_MSG_VERBOSE ("The track requested for removal or adding is not found in the vector of tracks"); if (sign<0) { ATH_MSG_ERROR ("During remove track has to be already attached to the vertex"); - msg(MSG::ERROR) << "The copy of initial xAOD::Vertex returned" << endreq; + msg(MSG::ERROR) << "The copy of initial xAOD::Vertex returned" << endmsg; return &vtx; } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx index 7943e9b7a49..2e01ea928e1 100755 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/NeutralParticleParameterCalculator.cxx @@ -38,20 +38,20 @@ namespace Trk if (!m_LinearizedTrackFactory.empty()) { StatusCode sc=m_LinearizedTrackFactory.retrieve(); if (sc.isFailure()) { - msg(MSG::WARNING) << "Could not find TrackLinearizer tool." << endreq; + msg(MSG::WARNING) << "Could not find TrackLinearizer tool." << endmsg; m_linearizedTrackFactoryIsAvailable=false; } else { m_linearizedTrackFactoryIsAvailable=true; } } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode NeutralParticleParameterCalculator::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -62,13 +62,13 @@ namespace Trk if (myVertex.nTrackParticles()!=2) { - msg(MSG::WARNING) << " More or less than 2 tracks in Vertex. No Neutral Perigee could be created" << endreq; + msg(MSG::WARNING) << " More or less than 2 tracks in Vertex. No Neutral Perigee could be created" << endmsg; return 0; } if ( !myVertex.trackParticleLinks()[0].isValid() || !myVertex.trackParticleLinks()[1].isValid() ) { - msg(MSG::WARNING) << " Track Particle Element link is not valid" << endreq; + msg(MSG::WARNING) << " Track Particle Element link is not valid" << endmsg; return 0; } @@ -88,7 +88,7 @@ namespace Trk //check if the linearizedTrackFactory is available... if (m_linearizedTrackFactoryIsAvailable==false) { - msg(MSG::ERROR) << " No LinearizedTrackFactory is defined and no ExtendedVxCandidate is provided. Cannot obtain covariance matrix of neutral particle. Failed... " << endreq; + msg(MSG::ERROR) << " No LinearizedTrackFactory is defined and no ExtendedVxCandidate is provided. Cannot obtain covariance matrix of neutral particle. Failed... " << endmsg; return 0; } @@ -100,7 +100,7 @@ namespace Trk if (myFirstLinearizedTrack==0||mySecondLinearizedTrack==0) { - msg(MSG::WARNING) << " Could not find one of the linearized tracks. No Neutral Perigee could be created" << endreq; + msg(MSG::WARNING) << " Could not find one of the linearized tracks. No Neutral Perigee could be created" << endmsg; if (myFirstLinearizedTrack) delete myFirstLinearizedTrack; if (mySecondLinearizedTrack) delete mySecondLinearizedTrack; return 0; @@ -117,7 +117,7 @@ namespace Trk delete myFirstLinearizedTrack; delete mySecondLinearizedTrack; } else { - msg(MSG::WARNING) << " getPosMomentumAndMomentumCovMatrix method failed " << endreq; + msg(MSG::WARNING) << " getPosMomentumAndMomentumCovMatrix method failed " << endmsg; return 0; } @@ -231,7 +231,7 @@ namespace Trk // same maths, but doesn't compile: AmgSymMatrix(3) Sm = trkParametersWeight.similarityT(B); if (Sm.determinant() == 0.0) { ATH_MSG_WARNING("S matrix can not be inverted, new type of check as part of Eigen, please monitor." - << endreq << "Matrix Sm = " << Sm); + << endmsg << "Matrix Sm = " << Sm); ATH_MSG_WARNING("This track is returned not refitted"); // throw std::string("Inversion of S matrix fails in track parameters refit"); } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx index 020debcfdba..2f217a5bc9d 100644 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/TrackToVertexIPEstimator.cxx @@ -39,28 +39,28 @@ namespace Trk //extrapolator if ( m_extrapolator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_extrapolator << endmsg; } //updator if ( m_Updator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_Updator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_Updator << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_Updator << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_Updator << endmsg; } //linearized track factory if ( m_linFactory.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_linFactory << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_linFactory << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endreq; + msg(MSG::INFO) << "Retrieved tool " << m_linFactory << endmsg; } return StatusCode::SUCCESS; @@ -68,7 +68,7 @@ namespace Trk StatusCode TrackToVertexIPEstimator::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -78,7 +78,7 @@ namespace Trk { return estimate(&(track->perigeeParameters()),&(track->perigeeParameters()),vtx,doRemoval); }else{ - msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endmsg; return 0; }//end of track particle validity check }//end of method using track particles @@ -89,7 +89,7 @@ namespace Trk { return estimate(&(track->perigeeParameters()),&(newtrack->perigeeParameters()),vtx,doRemoval); }else{ - msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endmsg; return 0; }//end of track particle validity check }//end of method using track particles @@ -102,7 +102,7 @@ namespace Trk if(track && vtx){ return estimate(track,track,vtx,doRemoval); }else{ - msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty TrackParticle or Vertex pointer passed. Returning zero " << endmsg; return 0; }//end of track particle validity check @@ -182,7 +182,7 @@ namespace Trk } else { - msg(MSG::WARNING) << " The contribution to d0_err: " << d0_PVcontrib << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... " << endreq; + msg(MSG::WARNING) << " The contribution to d0_err: " << d0_PVcontrib << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... " << endmsg; newIPandSigma->sigmad0=sqrt(perigeeCov(Trk::d0,Trk::d0)); newIPandSigma->PVsigmad0=0; } @@ -208,7 +208,7 @@ namespace Trk } else { - msg(MSG::WARNING) << " The contribution to z0_err: " << vrtZZCov << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... " << endreq; + msg(MSG::WARNING) << " The contribution to z0_err: " << vrtZZCov << " from PV is negative: critical error in PV error matrix! Removing contribution from PV ... " << endmsg; newIPandSigma->IPz0SinTheta=z0*sin(theta); double _temp = (IPz0JacZ0Theta.transpose()*(covPerigeeZ0Theta*IPz0JacZ0Theta)); newIPandSigma->sigmaz0SinTheta=sqrt(_temp); @@ -362,7 +362,7 @@ const xAOD::Vertex * TrackToVertexIPEstimator::getUnbiasedVertex(const xAOD::Tra { return getUnbiasedVertex(&(track->perigeeParameters()),vtx); }else{ - msg(MSG::INFO) << "Empty xAOD::TrackParticle pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty xAOD::TrackParticle pointer passed. Returning zero " << endmsg; return 0; }//end of track particle validity check } @@ -370,11 +370,11 @@ const xAOD::Vertex * TrackToVertexIPEstimator::getUnbiasedVertex(const xAOD::Tra const xAOD::Vertex * TrackToVertexIPEstimator::getUnbiasedVertex(const TrackParameters * track, const xAOD::Vertex * vtx ) const { if (!track) { - msg(MSG::INFO) << "Empty Trk::TrackParameter pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty Trk::TrackParameter pointer passed. Returning zero " << endmsg; return 0; } if (!vtx) { - msg(MSG::INFO) << "Empty xAOD::Vertex pointer passed. Returning zero " << endreq; + msg(MSG::INFO) << "Empty xAOD::Vertex pointer passed. Returning zero " << endmsg; return 0; } diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Z0PVTrackComaptibilityEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Z0PVTrackComaptibilityEstimator.cxx index dea7676d455..80ed2e9da2b 100644 --- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Z0PVTrackComaptibilityEstimator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Z0PVTrackComaptibilityEstimator.cxx @@ -38,7 +38,7 @@ namespace Trk{ StatusCode sc = m_ipEstimator.retrieve(); if( !sc.isSuccess() ){ - msg(MSG::FATAL) << "Unable to retrieve impact parameter estimator tool" << endreq; + msg(MSG::FATAL) << "Unable to retrieve impact parameter estimator tool" << endmsg; return sc; } diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx index da7fe2c40ab..0731dc9d13d 100755 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/CrossDistancesSeedFinder.cxx @@ -59,22 +59,22 @@ namespace Trk StatusCode s = m_mode3dfinder.retrieve(); if (s.isFailure()) { - msg(MSG::FATAL)<<"Could not find mode3dfinder tool." << endreq; + msg(MSG::FATAL)<<"Could not find mode3dfinder tool." << endmsg; return StatusCode::FAILURE; } s = m_distancefinder.retrieve(); if (s.isFailure()) { - msg(MSG::FATAL)<<"Could not find distance finder tool." << endreq; + msg(MSG::FATAL)<<"Could not find distance finder tool." << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode CrossDistancesSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -134,7 +134,7 @@ namespace Trk const Trk::Perigee* MyI=dynamic_cast<const Trk::Perigee*>(*i); if (MyI==0) { - msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting this track..." << endreq; + msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting this track..." << endmsg; continue; } @@ -142,20 +142,20 @@ namespace Trk const Trk::Perigee* MyJ=dynamic_cast<const Trk::Perigee*>(*j); if (MyJ==0) { - msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting this track..." << endreq; + msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting this track..." << endmsg; continue; } #ifdef CROSSDISTANCESSEEDFINDER_DEBUG - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Track 1 d0: " << MyI->parameters()[Trk::d0] << " Track2 d0: " << MyJ->parameters()[Trk::d0] << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Track 1 z0: " << MyI->parameters()[Trk::z0] << "Track2 z0: " << MyJ->parameters()[Trk::z0] << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Track 1 d0: " << MyI->parameters()[Trk::d0] << " Track2 d0: " << MyJ->parameters()[Trk::d0] << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Track 1 z0: " << MyI->parameters()[Trk::z0] << "Track2 z0: " << MyJ->parameters()[Trk::z0] << endmsg; #endif try { bool result=m_distancefinder->CalculateMinimumDistance(*MyI,*MyJ); - if (!result) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Problem with distance finder: THIS POINT WILL BE SKIPPED!" << endreq; + if (!result) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Problem with distance finder: THIS POINT WILL BE SKIPPED!" << endmsg; } else { @@ -164,11 +164,11 @@ namespace Trk #ifdef CROSSDISTANCESSEEDFINDER_DEBUG if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Point 1 x: " << PointsAtMinDistance.first.x() << " y: " << PointsAtMinDistance.first.y() << - " z: " << PointsAtMinDistance.first.z() << endreq; + " z: " << PointsAtMinDistance.first.z() << endmsg; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "Point 2 x: " << PointsAtMinDistance.second.x() << " y: " << PointsAtMinDistance.second.y() << - " z: " << PointsAtMinDistance.second.z() << endreq; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "distance is: " << m_distancefinder->GetDistance() << endreq; + " z: " << PointsAtMinDistance.second.z() << endmsg; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "distance is: " << m_distancefinder->GetDistance() << endmsg; #endif Amg::Vector3D thepoint((PointsAtMinDistance.first+PointsAtMinDistance.second)/2.); @@ -178,13 +178,13 @@ namespace Trk PositionAndWeight thispoint(thepoint, 1./pow(m_trackdistcutoff+m_distancefinder->GetDistance(),m_trackdistexppower)); - if(msgLvl(MSG::VERBOSE)) msg(MSG::DEBUG) << "distance weight: " << 1./pow(m_trackdistcutoff+m_distancefinder->GetDistance(),m_trackdistexppower) << endreq; + if(msgLvl(MSG::VERBOSE)) msg(MSG::DEBUG) << "distance weight: " << 1./pow(m_trackdistcutoff+m_distancefinder->GetDistance(),m_trackdistexppower) << endmsg; if (constraint!=0) { Amg::Vector3D DeltaP(thepoint-constraint->position()); Amg::Vector3D DeltaPConv; - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "position x: " << DeltaP.x() << "position y: " << DeltaP.y() << "position z: " << DeltaP.z() << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "position x: " << DeltaP.x() << "position y: " << DeltaP.y() << "position z: " << DeltaP.z() << endmsg; DeltaPConv[0]=DeltaP.x(); DeltaPConv[1]=DeltaP.y(); DeltaPConv[2]=DeltaP.z(); @@ -193,7 +193,7 @@ namespace Trk double chi2=DeltaPConv.transpose()*weightMatrixPositionConstraint*DeltaPConv; if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< " chi: " << chi2 - << " beam weight " << 1./(1.+exp((chi2-m_constraintcutoff)/m_constrainttemp)) << endreq; + << " beam weight " << 1./(1.+exp((chi2-m_constraintcutoff)/m_constrainttemp)) << endmsg; thispoint.second=thispoint.second*1./(1.+exp((chi2-m_constraintcutoff)/m_constrainttemp)); @@ -213,7 +213,7 @@ namespace Trk } } } catch (...) { - msg(MSG::ERROR) << "Something wrong in distance calculation: please report..." << endreq; + msg(MSG::ERROR) << "Something wrong in distance calculation: please report..." << endmsg; } } //to be understood... @@ -241,7 +241,7 @@ namespace Trk #ifdef CROSSDISTANCESSEEDFINDER_DEBUG msg(MSG::INFO) << "Resulting mean POINT FOUND: x: " << myresult.x() << " y: " << myresult.y() << - " z: " << myresult.z() << endreq; + " z: " << myresult.z() << endmsg; #endif @@ -255,7 +255,7 @@ namespace Trk std::vector<Amg::Vector3D> CrossDistancesSeedFinder::findMultiSeeds(const std::vector<const Trk::Track*>& /* vectorTrk */,const xAOD::Vertex * /* constraint */) { //implemented to satisfy inheritance but this algorithm only supports one seed at a time - msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endreq; + msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endmsg; return std::vector<Amg::Vector3D>(0); } @@ -263,7 +263,7 @@ namespace Trk std::vector<Amg::Vector3D> CrossDistancesSeedFinder::findMultiSeeds(const std::vector<const Trk::TrackParameters*>& /* perigeeList */,const xAOD::Vertex * /* constraint */) { //implemented to satisfy inheritance but this algorithm only supports one seed at a time - msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endreq; + msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endmsg; return std::vector<Amg::Vector3D>(0); } diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/DummySeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/DummySeedFinder.cxx index a08fb11f425..c9429176f3c 100755 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/DummySeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/DummySeedFinder.cxx @@ -26,13 +26,13 @@ namespace Trk StatusCode DummySeedFinder::initialize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode DummySeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ImagingSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ImagingSeedFinder.cxx index ed3972bace2..1ae45b33abd 100644 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ImagingSeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ImagingSeedFinder.cxx @@ -46,26 +46,26 @@ namespace Trk // ImagingSeedFinder inistialize StatusCode ImagingSeedFinder::initialize() { - msg(MSG::INFO) << "ImagingSeedFinder initialization..." << endreq; + msg(MSG::INFO) << "ImagingSeedFinder initialization..." << endmsg; // Get the image maker tool if (m_vertexImageMaker.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve vertex image maker tool" << m_vertexImageMaker << endreq; + msg(MSG::FATAL) << "Failed to retrieve vertex image maker tool" << m_vertexImageMaker << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved vertex cluster tool " << m_vertexImageMaker << endreq; + msg(MSG::INFO) << "Retrieved vertex cluster tool " << m_vertexImageMaker << endmsg; } /* Get the VertexCluster Tool */ if ( m_VertexClusterFinder.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve vertex cluster tool" << m_VertexClusterFinder << endreq; + msg(MSG::FATAL) << "Failed to retrieve vertex cluster tool" << m_VertexClusterFinder << endmsg; return StatusCode::FAILURE; } else { - msg(MSG::INFO) << "Retrieved vertex cluster tool " << m_VertexClusterFinder << endreq; + msg(MSG::INFO) << "Retrieved vertex cluster tool " << m_VertexClusterFinder << endmsg; } return StatusCode::SUCCESS; @@ -91,7 +91,7 @@ namespace Trk if(evtStore()->retrieve(myEventInfo/*,"MyEvent"*/).isFailure()) { // Key "MyEvent" is optional, usually not specified for EventInfo because // there'll be only one. When not specified, just takes the first container. - msg(MSG::ERROR) << "Failed to retrieve event information" << endreq; + msg(MSG::ERROR) << "Failed to retrieve event information" << endmsg; return Amg::Vector3D(0.,0.,0.); } @@ -127,7 +127,7 @@ namespace Trk if(evtStore()->retrieve(myEventInfo/*,"MyEvent"*/).isFailure()) { // Key "MyEvent" is optional, usually not specified for EventInfo because // there'll be only one. When not specified, just takes the first container. - msg(MSG::ERROR) << "Failed to retrieve event information" << endreq; + msg(MSG::ERROR) << "Failed to retrieve event information" << endmsg; return Amg::Vector3D(0.,0.,0.); } @@ -181,7 +181,7 @@ namespace Trk std::vector<Amg::Vector3D> ImagingSeedFinder::findMultiSeeds(const std::vector<const Trk::TrackParameters*>& parametersList,const xAOD::Vertex * constraint) { //implemented to satisfy inheritance but this algorithm only supports one seed at a time - msg(MSG::DEBUG) << "findMultiSeeds using ImagingSeedFinder has been called" << endreq; + msg(MSG::DEBUG) << "findMultiSeeds using ImagingSeedFinder has been called" << endmsg; // Make the image from tracks, and immediately VertexImage image = m_vertexImageMaker->makeVertexImage( parametersList, constraint ); @@ -190,7 +190,7 @@ namespace Trk //Coordinates are relative to the center of the histogram (constraint or (0,0,0) if no constraint) std::vector<Amg::Vector3D> relCoordVertices = m_VertexClusterFinder->findVertexClusters( image ); - msg(MSG::DEBUG) << "Found " << relCoordVertices.size() << " candidate clusters" << endreq; + msg(MSG::DEBUG) << "Found " << relCoordVertices.size() << " candidate clusters" << endmsg; // Loop through the vertices in relative coordinate space, ask the image to convert to absolute positions, and set x,y to constraint if we have one. @@ -209,7 +209,7 @@ namespace Trk } - msg(MSG::DEBUG) << " Seed " << counter << " = ( " << vertices.back().x() << ", " << vertices.back().y() << ", " << vertices.back().z() << " )" << endreq; + msg(MSG::DEBUG) << " Seed " << counter << " = ( " << vertices.back().x() << ", " << vertices.back().y() << ", " << vertices.back().z() << " )" << endmsg; counter++; } diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx index 81b4e59595d..bfd02001697 100755 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/MCTrueSeedFinder.cxx @@ -67,13 +67,13 @@ namespace Trk StatusCode MCTrueSeedFinder::initialize() { - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode MCTrueSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -144,7 +144,7 @@ namespace Trk if(evtStore()->retrieve(myEventInfo/*,"MyEvent"*/).isFailure()) { // Key "MyEvent" is optional, usually not specified for EventInfo because // there'll be only one. When not specified, just takes the first container. - msg(MSG::ERROR) << "Failed to retrieve event information" << endreq; + msg(MSG::ERROR) << "Failed to retrieve event information" << endmsg; return StatusCode::FAILURE; } @@ -155,11 +155,11 @@ namespace Trk return SUCCESS; //cached info already available ATH_MSG_DEBUG("Retrieving interactions information"); - msg(MSG::DEBUG) << "StoreGate Step: MCTrueSeedFinder retrieves -- " << m_McEventCollectionName << endreq; + msg(MSG::DEBUG) << "StoreGate Step: MCTrueSeedFinder retrieves -- " << m_McEventCollectionName << endmsg; StatusCode sc = evtStore()->retrieve(m_McEventCollection, m_McEventCollectionName); if ( sc.isFailure() ) { msg(MSG::DEBUG) - << "Could not retrieve McEventCollection " << m_McEventCollectionName << " from StoreGate." << endreq; + << "Could not retrieve McEventCollection " << m_McEventCollectionName << " from StoreGate." << endmsg; return StatusCode::FAILURE; } @@ -189,7 +189,7 @@ namespace Trk HepMC::GenEvent::vertex_const_iterator Vert = myEvent->vertices_begin(); msg(MSG::DEBUG) << "Retrieved position x: " << (*Vert)->position().x() << " y: " << (*Vert)->position().y() << - " z: " << (*Vert)->position().z() << endreq; + " z: " << (*Vert)->position().z() << endmsg; vtxPosition = Amg::Vector3D((*Vert)->position().x(), (*Vert)->position().y(), (*Vert)->position().z()); diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ZScanSeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ZScanSeedFinder.cxx index efe807c4d33..b83a0828c02 100755 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ZScanSeedFinder.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/ZScanSeedFinder.cxx @@ -62,27 +62,27 @@ namespace Trk StatusCode ZScanSeedFinder::initialize() { if ( m_mode1dfinder.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_mode1dfinder << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_mode1dfinder << endmsg; return StatusCode::FAILURE; } else if ( m_IPEstimator.retrieve().isFailure() ) { - msg(MSG::FATAL) << "Failed to retrieve tool " << m_IPEstimator << endreq; + msg(MSG::FATAL) << "Failed to retrieve tool " << m_IPEstimator << endmsg; } else { - msg(MSG::INFO)<< "Retrieved tools " << m_mode1dfinder << " and " << m_IPEstimator << endreq; + msg(MSG::INFO)<< "Retrieved tools " << m_mode1dfinder << " and " << m_IPEstimator << endmsg; } if ( m_usePt && m_useLogPt ) { - msg(MSG::FATAL) << "At most one of Pt and LogPt weighting may be selected" << endreq; + msg(MSG::FATAL) << "At most one of Pt and LogPt weighting may be selected" << endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO) << "Initialize successful" << endreq; + msg(MSG::INFO) << "Initialize successful" << endmsg; return StatusCode::SUCCESS; } StatusCode ZScanSeedFinder::finalize() { - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -127,7 +127,7 @@ namespace Trk const xAOD::EventInfo* myEventInfo = 0; if (evtStore()->retrieve(myEventInfo).isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve event information; clearing cached weights" << endreq; + msg(MSG::ERROR) << "Failed to retrieve event information; clearing cached weights" << endmsg; m_weightMap.clear(); m_cachedRunNumber = 0; m_cachedEventNumber = 0; @@ -151,7 +151,7 @@ namespace Trk ( (constraint != 0) && (constraint->position().x() != m_cachedConstraintX) ) || ( (constraint != 0) && (constraint->position().y() != m_cachedConstraintY) )) { - msg(MSG::DEBUG) << "Clearing cached weights due to new event and/or constraint" << endreq; + msg(MSG::DEBUG) << "Clearing cached weights due to new event and/or constraint" << endmsg; m_weightMap.clear(); m_cachedRunNumber = ei_RunNumber; m_cachedEventNumber = ei_EventNumber; @@ -179,7 +179,7 @@ namespace Trk const Perigee* iTrk = dynamic_cast<const Trk::Perigee*>(i); if (iTrk == 0) { - msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting track..." << endreq; + msg(MSG::WARNING) << "Neutrals not supported for seeding. Rejecting track..." << endmsg; continue; } @@ -196,7 +196,7 @@ namespace Trk { z0AndWeight.first = ipas->IPz0 + constraint->position().z(); double chi2IP = std::pow(ipas->IPd0/ipas->sigmad0, 2); - msg(MSG::VERBOSE) << "d0 from tool: " << ipas->IPd0 << " error: " << ipas->sigmad0 << " chi2: " << chi2IP << endreq; + msg(MSG::VERBOSE) << "d0 from tool: " << ipas->IPd0 << " error: " << ipas->sigmad0 << " chi2: " << chi2IP << endmsg; if ( !m_disableAllWeights ) { z0AndWeight.second = 1./(1.+exp(std::min((chi2IP-m_constraintcutoff)/m_constrainttemp, maxExpArg))); @@ -208,7 +208,7 @@ namespace Trk } else { - if (constraint != 0) msg(MSG::WARNING) << "Unable to compute impact parameter significance; setting IPWeight = 1" << endreq; + if (constraint != 0) msg(MSG::WARNING) << "Unable to compute impact parameter significance; setting IPWeight = 1" << endmsg; z0AndWeight.first = iTrk->position()[Trk::z]; z0AndWeight.second = 1.; } @@ -229,7 +229,7 @@ namespace Trk // cache the result m_weightMap[*iTrk] = z0AndWeight; } // end of lookup/compute z0AndWeight - msg(MSG::DEBUG) << "Found position z: " << z0AndWeight.first << " with weight " << z0AndWeight.second << endreq; + msg(MSG::DEBUG) << "Found position z: " << z0AndWeight.first << " with weight " << z0AndWeight.second << endmsg; if (z0AndWeight.second >= 0.01) { @@ -241,11 +241,11 @@ namespace Trk if ( ZPositions.size()>0 ) { ZResult=m_mode1dfinder->getMode(ZPositions); - msg(MSG::DEBUG)<< "Resulting mean Z position found: " << ZResult << endreq; + msg(MSG::DEBUG)<< "Resulting mean Z position found: " << ZResult << endmsg; } else { - msg(MSG::DEBUG) << "No tracks with sufficient weight; return z position = 0" << endreq; + msg(MSG::DEBUG) << "No tracks with sufficient weight; return z position = 0" << endmsg; } if (constraint) @@ -259,7 +259,7 @@ namespace Trk std::vector<Amg::Vector3D> ZScanSeedFinder::findMultiSeeds(const std::vector<const Trk::Track*>& /* vectorTrk */,const xAOD::Vertex * /* constraint */) { //implemented to satisfy inheritance but this algorithm only supports one seed at a time - msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endreq; + msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endmsg; return std::vector<Amg::Vector3D>(0); } @@ -267,7 +267,7 @@ namespace Trk std::vector<Amg::Vector3D> ZScanSeedFinder::findMultiSeeds(const std::vector<const Trk::TrackParameters*>& /* perigeeList */,const xAOD::Vertex * /* constraint */) { //implemented to satisfy inheritance but this algorithm only supports one seed at a time - msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endreq; + msg(MSG::WARNING) << "Multi-seeding requested but seed finder not able to operate in that mode, returning no seeds" << endmsg; return std::vector<Amg::Vector3D>(0); } diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/NNVertexWeightCalculator.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/NNVertexWeightCalculator.cxx index 778ac9dc957..972b1b05e22 100644 --- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/NNVertexWeightCalculator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/NNVertexWeightCalculator.cxx @@ -33,7 +33,7 @@ namespace Trk{ //initializing the AlgTool itself if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } (TString)m_directoryName; @@ -41,15 +41,15 @@ namespace Trk{ sc = m_networkToHistoTool.retrieve(); if (sc.isFailure()) { - msg(MSG::FATAL) << " Could not retrieve " << m_networkToHistoTool << ". Aborting..." << endreq; + msg(MSG::FATAL) << " Could not retrieve " << m_networkToHistoTool << ". Aborting..." << endmsg; return sc; } - else msg(MSG::INFO) << " Retrieved: " << m_networkToHistoTool << ". " << endreq; + else msg(MSG::INFO) << " Retrieved: " << m_networkToHistoTool << ". " << endmsg; if (!service("THistSvc",m_iTHistSvc , true).isSuccess()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } @@ -57,7 +57,7 @@ namespace Trk{ sc = m_iTHistSvc->regHist(std::string((const char*)(m_directoryName+LayerInfo))); if (sc.isFailure()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } @@ -67,7 +67,7 @@ namespace Trk{ if (sc.isFailure()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } @@ -85,7 +85,7 @@ namespace Trk{ sc = m_iTHistSvc->regHist(std::string((const char*)(m_directoryName+weightName))); if (sc.isFailure()) { - msg(MSG::ERROR) << "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR) << "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } m_NNhistos.push_back(0); @@ -94,21 +94,21 @@ namespace Trk{ sc = m_iTHistSvc->regHist(std::string((const char*)(m_directoryName+thresholdName))); if (sc.isFailure()) { - msg(MSG::ERROR)<< "Unable to locate THistSvc" << endreq; + msg(MSG::ERROR)<< "Unable to locate THistSvc" << endmsg; return StatusCode::FAILURE; } m_NNhistos.push_back(0); sc = m_iTHistSvc->getHist(std::string((const char*)(m_directoryName+thresholdName)),m_NNhistos[2*i + 2]); } - msg(MSG::INFO)<<"Initialization successfull"<<endreq; + msg(MSG::INFO)<<"Initialization successfull"<<endmsg; return StatusCode::SUCCESS; }//end of initialize method StatusCode NNVertexWeightCalculator::finalize() { - msg(MSG::INFO)<< "Finalize successful" << endreq; + msg(MSG::INFO)<< "Finalize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/SumPtVertexWeightCalculator.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/SumPtVertexWeightCalculator.cxx index b5b79f1970c..68cc4beeff3 100644 --- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/SumPtVertexWeightCalculator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/SumPtVertexWeightCalculator.cxx @@ -18,18 +18,18 @@ namespace Trk{ //initializing the AlgTool itself if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO)<<"Initialization successfull"<<endreq; + msg(MSG::INFO)<<"Initialization successfull"<<endmsg; return StatusCode::SUCCESS; }//end of initialize method StatusCode SumPtVertexWeightCalculator::finalize() { MsgStream log(msgSvc(), name()); - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/TrueVertexDistanceWeightCalculator.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/TrueVertexDistanceWeightCalculator.cxx index 577bceee909..fd056cb91a6 100644 --- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/TrueVertexDistanceWeightCalculator.cxx +++ b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/TrueVertexDistanceWeightCalculator.cxx @@ -18,18 +18,18 @@ namespace Trk{ //initializing the AlgTool itself if(sc.isFailure()) { - msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endreq; + msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg; return StatusCode::FAILURE; } - msg(MSG::INFO)<<"Initialization successfull"<<endreq; + msg(MSG::INFO)<<"Initialization successfull"<<endmsg; return StatusCode::SUCCESS; }//end of initialize method StatusCode TrueVertexDistanceWeightCalculator::finalize() { MsgStream log(msgSvc(), name()); - msg(MSG::INFO) << "Finalize successful" << endreq; + msg(MSG::INFO) << "Finalize successful" << endmsg; return StatusCode::SUCCESS; } @@ -67,7 +67,7 @@ namespace Trk{ const HepMC::GenEvent* myEvent=(*itr); if (!myEvent) { - msg(MSG::ERROR) << " Cannot find truth event... Returning 0 distance... " << endreq; + msg(MSG::ERROR) << " Cannot find truth event... Returning 0 distance... " << endmsg; return 0; } diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/ScoutingStreamWriter.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/ScoutingStreamWriter.cxx index a75a8f6c7aa..b212cd36fcb 100755 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/ScoutingStreamWriter.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/ScoutingStreamWriter.cxx @@ -21,7 +21,7 @@ ScoutingStreamWriter::~ScoutingStreamWriter(){ HLT::ErrorCode ScoutingStreamWriter::hltInitialize(){ if (!m_clidSvc.retrieve().isSuccess()) { - msg() << MSG::FATAL << "Cannot get ClassIDSvc " << m_clidSvc << endreq; + msg() << MSG::FATAL << "Cannot get ClassIDSvc " << m_clidSvc << endmsg; return HLT::FATAL; } @@ -42,13 +42,13 @@ HLT::ErrorCode ScoutingStreamWriter::hltInitialize(){ names.push_back((*it).substr(found+1,(*it).size()-found+1)); }else{ - msg() << MSG::FATAL << "Collection type and collection name not configured correctly. " << endreq; + msg() << MSG::FATAL << "Collection type and collection name not configured correctly. " << endmsg; return HLT::FATAL; } } if (types.size() != names.size()){ - msg() << MSG::FATAL << "Collection type and collection name vectors have different size. " << endreq; + msg() << MSG::FATAL << "Collection type and collection name vectors have different size. " << endmsg; return HLT::FATAL; } @@ -77,13 +77,13 @@ HLT::ErrorCode ScoutingStreamWriter::hltExecute(const HLT::TriggerElement*, bool names.push_back((*it).substr(found+1,(*it).size()-found+1)); }else{ - msg() << MSG::FATAL << "Collection type and collection name not configured correctly. " << endreq; + msg() << MSG::FATAL << "Collection type and collection name not configured correctly. " << endmsg; return HLT::FATAL; } } if (types.size() != names.size()){ - msg() << MSG::FATAL << "Collection type and collection name vectors have different size. " << endreq; + msg() << MSG::FATAL << "Collection type and collection name vectors have different size. " << endmsg; return HLT::FATAL; } @@ -93,7 +93,7 @@ HLT::ErrorCode ScoutingStreamWriter::hltExecute(const HLT::TriggerElement*, bool for (std::vector<std::string>::const_iterator it = types.begin(), it_e = types.end(); it != it_e; it++) { CLID classid; if (!m_clidSvc->getIDOfTypeName(*it, classid).isSuccess()){ - msg() << MSG::WARNING << "Cannot convert type. No CLID for " << (*it) << endreq; + msg() << MSG::WARNING << "Cannot convert type. No CLID for " << (*it) << endmsg; } else { clid.push_back(classid); } @@ -101,7 +101,7 @@ HLT::ErrorCode ScoutingStreamWriter::hltExecute(const HLT::TriggerElement*, bool ScoutingInfo* ScoutInfo = config()->getScoutingInfo(); if(!ScoutInfo){ - msg() << MSG::DEBUG << "*** Not Executing this ScoutingStreamWriter " << name() << endreq; + msg() << MSG::DEBUG << "*** Not Executing this ScoutingStreamWriter " << name() << endmsg; return HLT::OK; } else { for(unsigned int i = 0; i < clid.size(); ++i) diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigCheckForTracks.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigCheckForTracks.cxx index 1df02c73074..e28768d0d13 100755 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigCheckForTracks.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigCheckForTracks.cxx @@ -83,7 +83,7 @@ HLT::ErrorCode TrigCheckForTracks::hltInitialize() //------------------------------ if( service( "TrigTimerSvc", m_timerSvc).isFailure() ) { msg() << MSG::WARNING << name() - << ": Unable to locate TrigTimer Service" << endreq; + << ": Unable to locate TrigTimer Service" << endmsg; } if (m_timerSvc) m_timers.push_back(m_timerSvc->addItem("TrigCheckForTracks.TrigCheckForTracksTot")); @@ -111,7 +111,7 @@ HLT::ErrorCode TrigCheckForTracks::hltBeginRun() HLT::ErrorCode TrigCheckForTracks::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_acceptedEvts <<" / "<< m_rejectedEvts << " / "<< m_errorEvts << endreq; + msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_acceptedEvts <<" / "<< m_rejectedEvts << " / "<< m_errorEvts << endmsg; return HLT::OK; } @@ -122,14 +122,14 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg if (m_executedEvent) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "*** Not Executing this TrigCheckForTracks " << name() << ", already executed" << endreq; + msg() << MSG::DEBUG << "*** Not Executing this TrigCheckForTracks " << name() << ", already executed" << endmsg; } return HLT::OK; } if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "*** Executing this TrigCheckForTracks : " << name() << endreq; + msg() << MSG::DEBUG << "*** Executing this TrigCheckForTracks : " << name() << endmsg; } @@ -137,7 +137,7 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg PartialEventBuildingInfo* pebInfo = config()->getPEBI(); if(!pebInfo){ - if (msgLvl() <= MSG::DEBUG) msg() << "*** Not Executing this TrigCheckForTracks " << name() << ", not a calib chain" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << "*** Not Executing this TrigCheckForTracks " << name() << ", not a calib chain" << endmsg; return HLT::OK; } //--< PEB Related Stuff @@ -163,30 +163,30 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg if (evtStore()->transientContains<TrackCollection>(tracksName)) { if (msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "*** TrackCollection with name "<< tracksName <<" found in StoreGate (transientContains)" << endreq; + msg() << MSG::DEBUG << "*** TrackCollection with name "<< tracksName <<" found in StoreGate (transientContains)" << endmsg; } } else { if (msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "*** No TrackCollection with name" << tracksName << " found in StoreGate (transientContains)" << endreq; + msg() << MSG::DEBUG << "*** No TrackCollection with name" << tracksName << " found in StoreGate (transientContains)" << endmsg; } return HLT::OK; } StatusCode sc = evtStore()->retrieve(tracks,tracksName); - msg() << MSG::DEBUG << "***** Status code: "<< sc << " for key: " << tracksName << endreq; + msg() << MSG::DEBUG << "***** Status code: "<< sc << " for key: " << tracksName << endmsg; if (sc.isFailure()) { if (msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "No TrackCollection with name "<<tracksName<<" found in StoreGate" << endreq; + msg() << MSG::DEBUG << "No TrackCollection with name "<<tracksName<<" found in StoreGate" << endmsg; } m_errorEvts++; m_rejectedEvts++; } else { if (msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "TrackCollection with name "<<tracksName<<" found in StoreGate" << endreq; - msg() << MSG::DEBUG << "Retrieved "<< tracks->size() <<" reconstructed tracks from StoreGate" << endreq; + msg() << MSG::DEBUG << "TrackCollection with name "<<tracksName<<" found in StoreGate" << endmsg; + msg() << MSG::DEBUG << "Retrieved "<< tracks->size() <<" reconstructed tracks from StoreGate" << endmsg; } @@ -225,7 +225,7 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg const Trk::Perigee *jp = (*jt)->perigeeParameters(); - // msg() << MSG::INFO << "pT " << jp->pT() << " eta " << jp->eta() << endreq; + // msg() << MSG::INFO << "pT " << jp->pT() << " eta " << jp->eta() << endmsg; double dphi = fabs(ip->parameters()[Trk::phi] - jp->parameters()[Trk::phi]); @@ -234,7 +234,7 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg double dR = sqrt(pow((ip->eta() - jp->eta()),2) + pow(dphi,2)); m_dR.push_back(dR); - // msg() << MSG::INFO << "DR Tracks " << dR << endreq; + // msg() << MSG::INFO << "DR Tracks " << dR << endmsg; if ((fabs(jp->pT()) > m_pT_min_iso) && (dR > m_dR0_overlap) && (dR < m_dR0 ) ) { gotIsoTrack = false; @@ -287,7 +287,7 @@ HLT::ErrorCode TrigCheckForTracks::hltExecute(std::vector<std::vector<HLT::Trigg m_acceptedEvts++; n_IsoTracks = count_IsoTracks ; - msg() << MSG::DEBUG << "Found "<< n_IsoTracks <<" Isolated ("<< lookForAnyTracks <<") Tracks" << endreq; + msg() << MSG::DEBUG << "Found "<< n_IsoTracks <<" Isolated ("<< lookForAnyTracks <<") Tracks" << endmsg; } else { m_rejectedEvts++; diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigEtaHypo.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigEtaHypo.cxx index 714f92b97de..13d2ec17e14 100644 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigEtaHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigEtaHypo.cxx @@ -42,13 +42,13 @@ TrigEtaHypo::~TrigEtaHypo() HLT::ErrorCode TrigEtaHypo::hltInitialize() // ---------------------------------------------------------------------- { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; // Initialize timing service //------------------------------ if( service( "TrigTimerSvc", m_timerSvc).isFailure() ) { msg() << MSG::WARNING << name() - << ": Unable to locate TrigTimer Service" << endreq; + << ": Unable to locate TrigTimer Service" << endmsg; } if (m_timerSvc) m_timers.push_back(m_timerSvc->addItem("TrigEtaHypo.TrigEtaHypoTot")); @@ -65,8 +65,8 @@ HLT::ErrorCode TrigEtaHypo::hltInitialize() HLT::ErrorCode TrigEtaHypo::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_acceptedEvts <<" / "<< m_rejectedEvts << " / "<< m_errorEvts << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_acceptedEvts <<" / "<< m_rejectedEvts << " / "<< m_errorEvts << endmsg; return HLT::OK; } @@ -86,9 +86,9 @@ HLT::ErrorCode TrigEtaHypo::hltExecute(const HLT::TriggerElement* outputTE, bool if (getFeature(outputTE, roiDescriptor, m_roILabel) == HLT::OK && roiDescriptor) { if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: RoI id " << roiDescriptor->roiId() - << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endreq; + << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endmsg; else - msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; if ((m_etaMinCut < 0 || std::fabs(roiDescriptor->eta()) > m_etaMinCut) && (m_etaMaxCut < 0 || std::fabs(roiDescriptor->eta()) < m_etaMaxCut)) { diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBListWriter.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBListWriter.cxx index 3d0ef968a86..7d4fac88258 100755 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBListWriter.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBListWriter.cxx @@ -47,7 +47,7 @@ HLT::ErrorCode TrigROBListWriter::hltInitialize() HLT::ErrorCode TrigROBListWriter::hltBeginRun() { - msg() << MSG::INFO << "in hltBeginRun() " << endreq; + msg() << MSG::INFO << "in hltBeginRun() " << endmsg; return m_robSelector->setupMonitoring(); } @@ -65,11 +65,11 @@ HLT::ErrorCode TrigROBListWriter::hltExecute(const HLT::TriggerElement* te_in, msg() << MSG::DEBUG << "Executing this TrigROBListWriter " << name() << " for types " << te_in->getId() << " -> " << te_out->getId(); if (m_maxRoIsPerEvent > -1) msg() << " RoI " << m_nRoIs << "/" << m_maxRoIsPerEvent; - msg() << endreq; + msg() << endmsg; if (m_maxRoIsPerEvent > -1 && m_nRoIs > m_maxRoIsPerEvent) { msg() << MSG::DEBUG << "RoI limit (" << m_maxRoIsPerEvent - << ") reached for this event : will not process this RoI" << endreq; + << ") reached for this event : will not process this RoI" << endmsg; return HLT::OK; } @@ -88,7 +88,7 @@ HLT::ErrorCode TrigROBListWriter::hltExecute(const HLT::TriggerElement* te_in, for (std::vector<std::string>::const_iterator label = m_roILabels.begin(); label != m_roILabels.end(); label++) msg() << *label << " "; - msg()<< endreq; + msg()<< endmsg; return status; } @@ -96,7 +96,7 @@ HLT::ErrorCode TrigROBListWriter::hltExecute(const HLT::TriggerElement* te_in, // create new partial EB directive PartialEventBuildingInfo* pebInfo = config()->getPEBI(); if(!pebInfo){ - msg() << MSG::DEBUG << "*** Not Executing this TrigROBListWriter " << name() << ", not a calib chain" << endreq; + msg() << MSG::DEBUG << "*** Not Executing this TrigROBListWriter " << name() << ", not a calib chain" << endmsg; return HLT::OK; } /*PartialEventBuildingInfo* pebInfo = 0; diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBSelector.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBSelector.cxx index 3e40a4d7ae4..fd841c4de55 100644 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBSelector.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigROBSelector.cxx @@ -118,9 +118,9 @@ StatusCode TrigROBSelector::initialize() msg() << MSG::DEBUG << "Selected subdetectors = "; for (std::vector<DETID>::const_iterator det = m_detectors.begin(); det != m_detectors.end(); det++) { - msg() << MSG::DEBUG << *det << " " << endreq; + msg() << MSG::DEBUG << *det << " " << endmsg; } - msg() << endreq; + msg() << endmsg; return sc; } @@ -148,7 +148,7 @@ HLT::ErrorCode TrigROBSelector::fillPEBInfo(PartialEventBuildingInfo& pebInfo, msg() << MSG::DEBUG << "ROBs requested for detector " << *detector << " : "; for (unsigned int i = 0; i < detectorROBs.size(); i++) msg() << MSG::DEBUG << "0x" << std::hex << detectorROBs[i] << std::dec << " "; - msg() << endreq; + msg() << endmsg; if (dets) (*dets).push_back(*detector); if (nRobs) (*nRobs).push_back(detectorROBs.size()); diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx index 4ea01d6a8b2..b1d80c40bba 100755 --- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx +++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx @@ -40,7 +40,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize() { ServiceHandle<IJobOptionsSvc> p_jobOptionsSvc("JobOptionsSvc", name()); if ((p_jobOptionsSvc.retrieve()).isFailure()) { - msg() << MSG::WARNING << "Could not find JobOptionsSvc to set DataFlow properties" << endreq; + msg() << MSG::WARNING << "Could not find JobOptionsSvc to set DataFlow properties" << endmsg; } else { // get the list of enabled ROBs from OKS const Property* pprob=Gaudi::Utils::getProperty( p_jobOptionsSvc->getProperties("DataFlowConfig"), "DF_Enabled_ROB_IDs"); @@ -48,9 +48,9 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize() if (m_enabledROBs.assign(*pprob)) { //robOKSconfigFound = true; msg() << MSG::DEBUG << " ---> Read from DataFlow configuration: " << m_enabledROBs.value().size() - << " enabled ROB IDs." << endreq; + << " enabled ROB IDs." << endmsg; } else { - msg() << MSG::WARNING << "Could not set Property '" << pprob->name() << "' from DataFlow." << endreq; + msg() << MSG::WARNING << "Could not set Property '" << pprob->name() << "' from DataFlow." << endmsg; } } // get the list of enabled Sub Detectors from OKS @@ -59,16 +59,16 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize() if (m_enabledSubDetectors.assign(*ppsd)) { //subDetOKSconfigFound = true; msg() << MSG::DEBUG << " ---> Read from DataFlow configuration: " << m_enabledSubDetectors.value().size() - << " enabled Sub Detector IDs." << endreq; + << " enabled Sub Detector IDs." << endmsg; } else { - msg() << MSG::WARNING << "Could not set Property '" << ppsd->name() << "' from DataFlow." << endreq; + msg() << MSG::WARNING << "Could not set Property '" << ppsd->name() << "' from DataFlow." << endmsg; } } } // The RegionSelector is being retrieved here if( (m_regionSelector.retrieve()).isFailure() ) { - msg() << MSG::FATAL << "Unable to retrieve RegionSelector Service" << endreq; + msg() << MSG::FATAL << "Unable to retrieve RegionSelector Service" << endmsg; return HLT::TOOL_FAILURE; } @@ -279,10 +279,10 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize() msg() << MSG::INFO << "Selected subdetectors = "; for (std::vector<DETID>::const_iterator det = m_detectors.begin(); det != m_detectors.end(); det++) msg() << *det << " "; - msg() << endreq; + msg() << endmsg; if ( service("THistSvc", m_thistSvc).isFailure() ) { - msg() << MSG::ERROR << "Unable to retrieve pointer to THistSvc" << endreq; + msg() << MSG::ERROR << "Unable to retrieve pointer to THistSvc" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -386,7 +386,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltBeginRun() /// Now setup all the histograms! if ( this->bookMonitoringHistograms().isFailure() ) { - msg() << MSG::WARNING << "Histogram booking error. Issuing HLT::BAD_JOB_SETUP" << endreq; + msg() << MSG::WARNING << "Histogram booking error. Issuing HLT::BAD_JOB_SETUP" << endmsg; return HLT::BAD_JOB_SETUP; } @@ -455,7 +455,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltBeginRun() StatusCode TrigSubDetListWriter::bookMonitoringHistograms() { /// Say hello - if (msgLvl()<=MSG::DEBUG) msg() << MSG::DEBUG << "Now trying to register standard monitoring histograms" << endreq; + if (msgLvl()<=MSG::DEBUG) msg() << MSG::DEBUG << "Now trying to register standard monitoring histograms" << endmsg; /*m_httemrob = bookAndRegisterTH1I("RobIdTTEM", m_outputpath,m_ttemrange.size() ,0,m_ttemrange.size() ); m_htthecrob = bookAndRegisterTH1I("RobIdTTHEC", m_outputpath,m_tthecrange.size() ,0,m_tthecrange.size() ); m_hfcalrob = bookAndRegisterTH1I("RobIdFcal", m_outputpath,m_fcalrange.size() ,0,m_fcalrange.size() ); @@ -480,7 +480,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltExecute(std::vector<std::vector<HLT::Tri if (m_useCachedResult) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Executing this Partial event " << name() << " in cached mode" << endreq; + msg() << MSG::DEBUG << "Executing this Partial event " << name() << " in cached mode" << endmsg; } } @@ -502,9 +502,9 @@ HLT::ErrorCode TrigSubDetListWriter::hltExecute(std::vector<std::vector<HLT::Tri if (msgLvl(MSG::DEBUG)) { - msg() << MSG::DEBUG << "Executing this TrigSubDetListWriter " << name() << endreq; + msg() << MSG::DEBUG << "Executing this TrigSubDetListWriter " << name() << endmsg; if (m_maxRoIsPerEvent > -1) msg() << " RoI " << m_nRoIs << "/" << m_maxRoIsPerEvent; - msg() << endreq; + msg() << endmsg; } if (m_maxRoIsPerEvent > -1 && m_nRoIs > m_maxRoIsPerEvent) { @@ -523,7 +523,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltExecute(std::vector<std::vector<HLT::Tri // create new partial EB directive PartialEventBuildingInfo* pebInfo = config()->getPEBI(); if(!pebInfo){ - msg() << MSG::DEBUG << "*** Not Executing this TrigSubDetListWriter " << name() << ", not a calib chain" << endreq; + msg() << MSG::DEBUG << "*** Not Executing this TrigSubDetListWriter " << name() << ", not a calib chain" << endmsg; return HLT::OK; } /*PartialEventBuildingInfo* pebInfo = 0; @@ -537,7 +537,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltExecute(std::vector<std::vector<HLT::Tri // now add ROBs status = fillPEBInfo(*pebInfo); if(status!=HLT::OK){ - msg() << MSG::DEBUG << "No ROB info for partial event building" << endreq; + msg() << MSG::DEBUG << "No ROB info for partial event building" << endmsg; return status; } HLT::TriggerElement* te = addRoI(te_out,roIDescriptor); @@ -596,7 +596,7 @@ HLT::ErrorCode TrigSubDetListWriter::fillPEBInfo(PartialEventBuildingInfo& pebIn //allROBs.insert(allROBs.end(), detectorROBs.begin(), detectorROBs.end()); //msg() << MSG::DEBUG << "ROBs for detector " << *detector << " : "; //for (unsigned int i = 0; i < detectorROBs.size(); i++) msg() << "0x" << std::hex << detectorROBs[i] << std::dec << " "; - //msg() << endreq; + //msg() << endmsg; switch (*detector) { case PIXEL: //for(unsigned int i=0; i<detectorROBs.size(); i++) m_hpixrob->Fill(m_robidmap[detectorROBs[i]]); @@ -642,7 +642,7 @@ HLT::ErrorCode TrigSubDetListWriter::fillPEBInfo(PartialEventBuildingInfo& pebIn ATH_MSG_DEBUG("Muon detectors not yet implemented"); break; default: - msg() << MSG::WARNING << "unknown detector type requested " << endreq; + msg() << MSG::WARNING << "unknown detector type requested " << endmsg; } } @@ -675,7 +675,7 @@ HLT::ErrorCode TrigSubDetListWriter::hltEndEvent() TH1I* TrigSubDetListWriter::bookAndRegisterTH1I(const char* name, std::string outpath, int nBins, int minX, int maxX) { TH1I* h = new TH1I(name,name,nBins,minX,maxX); - if (m_thistSvc->regHist(outpath + h->GetName(), h).isFailure()) msg() << MSG::WARNING << "Can't book " << outpath + h->GetName() << endreq; + if (m_thistSvc->regHist(outpath + h->GetName(), h).isFailure()) msg() << MSG::WARNING << "Can't book " << outpath + h->GetName() << endmsg; return h; } diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx index 331dc9069e3..ab004f700c9 100755 --- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx +++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx @@ -257,7 +257,7 @@ TrigEgammaRec::~TrigEgammaRec() HLT::ErrorCode TrigEgammaRec::hltStart() { - if(msgLvl() <= MSG::INFO) msg() << MSG::INFO << "in Start()" << endreq; + if(msgLvl() <= MSG::INFO) msg() << MSG::INFO << "in Start()" << endmsg; return HLT::OK; } @@ -268,7 +268,7 @@ HLT::ErrorCode TrigEgammaRec::hltStart() HLT::ErrorCode TrigEgammaRec::hltInitialize() { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; // Global timers if (timerSvc()) m_timerTotal = addTimer("Total"); @@ -276,7 +276,7 @@ HLT::ErrorCode TrigEgammaRec::hltInitialize() { // Pointer to Tool Service IToolSvc* p_toolSvc = 0; if (service("ToolSvc", p_toolSvc).isFailure()) { - msg() << MSG::FATAL << "REGTEST: Tool Service not found " << endreq; + msg() << MSG::FATAL << "REGTEST: Tool Service not found " << endmsg; return HLT::BAD_JOB_SETUP; } @@ -564,7 +564,7 @@ HLT::ErrorCode TrigEgammaRec::hltFinalize() { HLT::ErrorCode TrigEgammaRec::hltEndRun() { - if(msgLvl() <= MSG::INFO) msg() << MSG::INFO << "in endRun()" << endreq; + if(msgLvl() <= MSG::INFO) msg() << MSG::INFO << "in endRun()" << endmsg; return HLT::OK; } @@ -575,8 +575,8 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE ) { if ( msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "Executing HLT alg. TrigEgammaRec" << endreq; - msg() << MSG::DEBUG << "inputTE->getId(): " << inputTE->getId() << endreq; + msg() << MSG::DEBUG << "Executing HLT alg. TrigEgammaRec" << endmsg; + msg() << MSG::DEBUG << "inputTE->getId(): " << inputTE->getId() << endmsg; } // Time total TrigEgammaRec execution time. if (timerSvc()) m_timerTotal->start(); @@ -594,13 +594,13 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, else stat = getFeatures(inputTE, vectorClusterContainer); if ( stat!= HLT::OK ) { - msg() << MSG::ERROR << " REGTEST: No CaloClusterContainers retrieved for the trigger element" << endreq; + msg() << MSG::ERROR << " REGTEST: No CaloClusterContainers retrieved for the trigger element" << endmsg; return HLT::OK; } //debug message if ( msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << " REGTEST: Got " << vectorClusterContainer.size() - << " CaloClusterContainers associated to the TE " << endreq; + << " CaloClusterContainers associated to the TE " << endmsg; // Check that there is only one ClusterContainer in the RoI if (vectorClusterContainer.size() < 1){ @@ -608,7 +608,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, msg() << MSG::ERROR << "REGTEST: Size of vectorClusterContainer is not 1, it is: " << vectorClusterContainer.size() - << endreq; + << endmsg; //return HLT::BAD_JOB_SETUP; return HLT::OK; } @@ -619,7 +619,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if ( msgLvl() <= MSG::ERROR ) msg() << MSG::ERROR << " REGTEST: Retrieval of CaloClusterContainer from vector failed" - << endreq; + << endmsg; //return HLT::BAD_JOB_SETUP; return HLT::OK; } @@ -638,7 +638,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, //debug message if ( msgLvl() <= MSG::VERBOSE){ msg() << MSG::VERBOSE << " REGTEST: Got " << vectorClusterContainerTopo.size() - << " CaloCTopoclusterContainers associated to the TE " << endreq; + << " CaloCTopoclusterContainers associated to the TE " << endmsg; } // Get the last ClusterContainer if ( !vectorClusterContainerTopo.empty() ) { @@ -650,7 +650,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << clusContainer->size() << " calo clusters in container" << endreq; + << clusContainer->size() << " calo clusters in container" << endmsg; if(clusContainer->size() < 1){ return HLT::OK; @@ -663,14 +663,14 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, std::string electronKey=""; HLT::ErrorCode sc = getUniqueKey( m_electron_container, electronContSGKey, electronKey); if (sc != HLT::OK) { - msg() << MSG::DEBUG << "Could not retrieve the electron container key" << endreq; + msg() << MSG::DEBUG << "Could not retrieve the electron container key" << endmsg; return sc; } electronContSGKey+="egammaRec"; // // just store the thing now! if ( store()-> record(m_eg_container,electronContSGKey).isFailure() ) { - msg() << MSG::ERROR << "REGTEST: Could not register the EgammaRecContainer" << endreq; + msg() << MSG::ERROR << "REGTEST: Could not register the EgammaRecContainer" << endmsg; return HLT::ERROR; } // Create collections used in the navigation @@ -701,13 +701,13 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if ( stat != HLT::OK ) { //m_showerBuilderToExec = false; - msg() << MSG::ERROR << "REGTEST: No CaloCellContainers retrieved for the trigger element, shower builder to be executed: " << m_showerBuilder << endreq; + msg() << MSG::ERROR << "REGTEST: No CaloCellContainers retrieved for the trigger element, shower builder to be executed: " << m_showerBuilder << endmsg; //Should this be ERROR? Maybe just set to run showerbuilder to false? return HLT::ERROR; //May need to add ERROR codes for online debugging } else{ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " REGTEST: Got " << vectorCellContainer.size() - << " CaloCellContainers associated to the TE " << endreq; + << " CaloCellContainers associated to the TE " << endmsg; if ( getStoreGateKey( clusContainer, clusCollKey) != HLT::OK) { ATH_MSG_ERROR("Failed to get key for ClusterContainer"); @@ -720,7 +720,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, msg() << MSG::ERROR << "REGTEST: Size of calo cell container vector is not 1 but " << vectorCellContainer.size() << " shower builder to be executed: " << m_showerBuilder - << endreq; + << endmsg; return HLT::ERROR; //May need to add ERROR codes for online debugging } else{ @@ -731,11 +731,11 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if(!pCaloCellContainer){ msg() << MSG::ERROR << "Retrieval of CaloCellContainer from vector failed, m_showerBuilderToExec: " << m_showerBuilder - << endreq; + << endmsg; return HLT::ERROR; //May need to add ERROR codes for online debugging } else{ - if ( msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << "Running m_showerBuilder: " << m_showerBuilder << endreq; + if ( msgLvl() <= MSG::VERBOSE) msg() << MSG::VERBOSE << "Running m_showerBuilder: " << m_showerBuilder << endmsg; } //pCaloCellContainer } if(topoClusTrue) pTopoClusterContainer = vectorClusterContainerTopo.back(); @@ -756,13 +756,13 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if (stat != HLT::OK) { m_doTrackMatching=false; if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << " REGTEST: no TrackParticleContainer from TE, m_trackMatchBuilder: " << m_trackMatchBuilder << endreq; + << " REGTEST: no TrackParticleContainer from TE, m_trackMatchBuilder: " << m_trackMatchBuilder << endmsg; } else { // check that it is not empty if (vectorTrackParticleContainer.size() < 1) { if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << " REGTEST: empty TrackParticleContainer from TE, m_trackMatchBuilder: " << m_trackMatchBuilder << endreq; + << " REGTEST: empty TrackParticleContainer from TE, m_trackMatchBuilder: " << m_trackMatchBuilder << endmsg; } else { // Get the pointer to last TrackParticleContainer @@ -772,7 +772,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, m_doTrackMatching = false; msg() << MSG::ERROR << " REGTEST: Retrieval of TrackParticleContainer from vector failed" - << endreq; + << endmsg; } ATH_MSG_DEBUG("m_doTrackMatching: " << m_doTrackMatching); if ( getStoreGateKey( pTrackParticleContainer, TrkCollKey) != HLT::OK) { @@ -806,15 +806,15 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if (stat != HLT::OK) { m_doConversions = false; if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << " REGTEST: no VxContainer from TE, m_doConversions: " << m_doConversions << endreq; + << " REGTEST: no VxContainer from TE, m_doConversions: " << m_doConversions << endmsg; } else { if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " REGTEST: Got " << vectorVxContainer.size() - << " VertexContainers associated to the TE " << endreq; + << " VertexContainers associated to the TE " << endmsg; // check that it is not empty if (vectorVxContainer.size() < 1) { m_doConversions= false; if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << " REGTEST: no VxContainer from TE, m_doConversions: " << m_doConversions << endreq; + << " REGTEST: no VxContainer from TE, m_doConversions: " << m_doConversions << endmsg; } else { // Get the pointer to last VxContainer pVxContainer = vectorVxContainer.back(); @@ -822,9 +822,9 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, m_doConversions = false; msg() << MSG::ERROR << " REGTEST: Retrieval of VxContainer from vector failed" - << endreq; + << endmsg; } - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "m_doConversions " << m_doConversions << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "m_doConversions " << m_doConversions << endmsg; } } @@ -863,10 +863,10 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, for(auto egRec : *m_eg_container) { if (timerSvc()) m_timerTool1->start(); //timer if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << "REGTEST:: Running TrackMatchBuilder" << endreq; + << "REGTEST:: Running TrackMatchBuilder" << endmsg; if(m_trackMatchBuilder->trackExecute(egRec,pTrackParticleContainer).isFailure()) if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG - << "REGTEST: no Track matched to this cluster" << endreq; + << "REGTEST: no Track matched to this cluster" << endmsg; if (timerSvc()) m_timerTool1->stop(); //timer } // End track match building } //m_trackMatchBuilderToExec @@ -1058,7 +1058,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if (timerSvc()) m_timerTool4->start(); //timer ATH_MSG_DEBUG("about to run EMFourMomBuilder::hltExecute(eg)"); if(m_fourMomBuilder->hltExecute(eg)); // - else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: problem with fourmom tool" << endreq; + else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: problem with fourmom tool" << endmsg; if (timerSvc()) m_timerTool4->stop(); //timer // Shower Shape @@ -1066,7 +1066,7 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if (timerSvc()) m_timerTool5->start(); //timer ATH_MSG_DEBUG("about to run EMShowerBuilder::recoExecute(eg,pCaloCellContainer)"); if( m_showerBuilder->recoExecute(eg,pCaloCellContainer) ); - else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: no shower built for this cluster" << endreq; + else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: no shower built for this cluster" << endmsg; if (timerSvc()) m_timerTool5->stop(); //timer // Isolation @@ -1145,14 +1145,14 @@ HLT::ErrorCode TrigEgammaRec::hltExecute( const HLT::TriggerElement* inputTE, if (timerSvc()) m_timerTool4->start(); //timer ATH_MSG_DEBUG("about to run EMFourMomBuilder::hltExecute(eg)"); if(m_fourMomBuilder->hltExecute(eg)); // - else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: problem with fourmom tool" << endreq; + else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: problem with fourmom tool" << endmsg; if (timerSvc()) m_timerTool4->stop(); //timer // Shower Shape if (timerSvc()) m_timerTool5->start(); //timer ATH_MSG_DEBUG("about to run EMShowerBuilderrecoExecute(eg,pCaloCellContainer)"); if( m_showerBuilder->recoExecute(eg,pCaloCellContainer) ); - else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: no shower built for this cluster" << endreq; + else if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: no shower built for this cluster" << endmsg; if (timerSvc()) m_timerTool5->stop(); //timer // Isolation @@ -1262,19 +1262,19 @@ void TrigEgammaRec::PrintElectron(xAOD::Electron *eg){ //Cluster and ShowerShape info //REGTEST printout if (eg) { - msg() << MSG::DEBUG << " REGTEST: electron energy: " << eg->e() << endreq; - msg() << MSG::DEBUG << " REGTEST: electron eta: " << eg->eta() << endreq; - msg() << MSG::DEBUG << " REGTEST: electron phi: " << eg->phi() << endreq; + msg() << MSG::DEBUG << " REGTEST: electron energy: " << eg->e() << endmsg; + msg() << MSG::DEBUG << " REGTEST: electron eta: " << eg->eta() << endmsg; + msg() << MSG::DEBUG << " REGTEST: electron phi: " << eg->phi() << endmsg; ATH_MSG_DEBUG(" REGTEST: electron charge " << eg->charge()); } else{ - msg() << MSG::DEBUG << " REGTEST: problems with electron pointer" << endreq; + msg() << MSG::DEBUG << " REGTEST: problems with electron pointer" << endmsg; } ATH_MSG_DEBUG(" REGTEST: cluster variables"); if (eg->caloCluster()) { - msg() << MSG::DEBUG << " REGTEST: electron cluster transverse energy: " << eg->caloCluster()->et() << endreq; - msg() << MSG::DEBUG << " REGTEST: electron cluster eta: " << eg->caloCluster()->eta() << endreq; - msg() << MSG::DEBUG << " REGTEST: electron cluster phi: " << eg->caloCluster()->phi() << endreq; + msg() << MSG::DEBUG << " REGTEST: electron cluster transverse energy: " << eg->caloCluster()->et() << endmsg; + msg() << MSG::DEBUG << " REGTEST: electron cluster eta: " << eg->caloCluster()->eta() << endmsg; + msg() << MSG::DEBUG << " REGTEST: electron cluster phi: " << eg->caloCluster()->phi() << endmsg; double tmpeta = -999.; double tmpphi = -999.; eg->caloCluster()->retrieveMoment(xAOD::CaloCluster::ETACALOFRAME,tmpeta); @@ -1282,7 +1282,7 @@ void TrigEgammaRec::PrintElectron(xAOD::Electron *eg){ ATH_MSG_DEBUG(" REGTEST: electron Calo-frame coords. etaCalo = " << tmpeta); ATH_MSG_DEBUG(" REGTEST: electron Calo-frame coords. phiCalo = " << tmpphi); } else{ - msg() << MSG::DEBUG << " REGTEST: problems with electron cluster pointer" << endreq; + msg() << MSG::DEBUG << " REGTEST: problems with electron cluster pointer" << endmsg; } ATH_MSG_DEBUG(" REGTEST: EMShower variables"); @@ -1308,15 +1308,15 @@ void TrigEgammaRec::PrintElectron(xAOD::Electron *eg){ ATH_MSG_DEBUG(" REGTEST: trackmatch variables"); if(eg->trackParticle()){ - msg() << MSG::DEBUG << " REGTEST: pt= " << eg->trackParticle()->pt() << endreq; - msg() << MSG::DEBUG << " REGTEST: charge= " << eg->trackParticle()->charge() << endreq; - msg() << MSG::DEBUG << " REGTEST: E/p= " << eg->caloCluster()->et() / eg->trackParticle()->pt() << endreq; + msg() << MSG::DEBUG << " REGTEST: pt= " << eg->trackParticle()->pt() << endmsg; + msg() << MSG::DEBUG << " REGTEST: charge= " << eg->trackParticle()->charge() << endmsg; + msg() << MSG::DEBUG << " REGTEST: E/p= " << eg->caloCluster()->et() / eg->trackParticle()->pt() << endmsg; eg->trackCaloMatchValue(val_float,xAOD::EgammaParameters::deltaEta1); - msg() << MSG::DEBUG << " REGTEST: Delta eta 1st sampling= " << val_float << endreq; + msg() << MSG::DEBUG << " REGTEST: Delta eta 1st sampling= " << val_float << endmsg; eg->trackCaloMatchValue(val_float,xAOD::EgammaParameters::deltaPhi2); - msg() << MSG::DEBUG << " REGTEST: Delta phi 2nd sampling= " << val_float << endreq; + msg() << MSG::DEBUG << " REGTEST: Delta phi 2nd sampling= " << val_float << endmsg; } else{ - msg() << MSG::DEBUG << " REGTEST: no electron eg->trackParticle() pointer" << endreq; + msg() << MSG::DEBUG << " REGTEST: no electron eg->trackParticle() pointer" << endmsg; } } @@ -1333,22 +1333,22 @@ void TrigEgammaRec::PrintPhoton(xAOD::Photon *eg){ ATH_MSG_DEBUG("isEMTight bit " << std::hex << isEMbit); float val_float=-99; //DEBUG output for Egamma container - msg() << MSG::DEBUG << " REGTEST: xAOD Reconstruction Photon variables: " << endreq; + msg() << MSG::DEBUG << " REGTEST: xAOD Reconstruction Photon variables: " << endmsg; //Cluster and ShowerShape info //REGTEST printout if (eg) { - msg() << MSG::DEBUG << " REGTEST: photon energy: " << eg->e() << endreq; - msg() << MSG::DEBUG << " REGTEST: photon eta: " << eg->eta() << endreq; - msg() << MSG::DEBUG << " REGTEST: photon phi: " << eg->phi() << endreq; + msg() << MSG::DEBUG << " REGTEST: photon energy: " << eg->e() << endmsg; + msg() << MSG::DEBUG << " REGTEST: photon eta: " << eg->eta() << endmsg; + msg() << MSG::DEBUG << " REGTEST: photon phi: " << eg->phi() << endmsg; } else{ - msg() << MSG::DEBUG << " REGTEST: problems with photon pointer" << endreq; + msg() << MSG::DEBUG << " REGTEST: problems with photon pointer" << endmsg; } ATH_MSG_DEBUG(" REGTEST: cluster variables"); if (eg->caloCluster()) { - msg() << MSG::DEBUG << " REGTEST: photon cluster transverse energy: " << eg->caloCluster()->et() << endreq; - msg() << MSG::DEBUG << " REGTEST: photon cluster eta: " << eg->caloCluster()->eta() << endreq; - msg() << MSG::DEBUG << " REGTEST: photon cluster phi: " << eg->caloCluster()->phi() << endreq; + msg() << MSG::DEBUG << " REGTEST: photon cluster transverse energy: " << eg->caloCluster()->et() << endmsg; + msg() << MSG::DEBUG << " REGTEST: photon cluster eta: " << eg->caloCluster()->eta() << endmsg; + msg() << MSG::DEBUG << " REGTEST: photon cluster phi: " << eg->caloCluster()->phi() << endmsg; double tmpeta = -999.; double tmpphi = -999.; eg->caloCluster()->retrieveMoment(xAOD::CaloCluster::ETACALOFRAME,tmpeta); @@ -1356,7 +1356,7 @@ void TrigEgammaRec::PrintPhoton(xAOD::Photon *eg){ ATH_MSG_DEBUG(" REGTEST: photon Calo-frame coords. etaCalo = " << tmpeta); ATH_MSG_DEBUG(" REGTEST: photon Calo-frame coords. phiCalo = " << tmpphi); } else{ - msg() << MSG::DEBUG << " REGTEST: problems with photon cluster pointer" << endreq; + msg() << MSG::DEBUG << " REGTEST: problems with photon cluster pointer" << endmsg; } ATH_MSG_DEBUG(" REGTEST: EMShower variables"); diff --git a/Trigger/TrigAlgorithms/TrigHLTJetHemisphereRec/src/TrigHLTJetHemisphereRec.cxx b/Trigger/TrigAlgorithms/TrigHLTJetHemisphereRec/src/TrigHLTJetHemisphereRec.cxx index eada51121df..1534b900cde 100755 --- a/Trigger/TrigAlgorithms/TrigHLTJetHemisphereRec/src/TrigHLTJetHemisphereRec.cxx +++ b/Trigger/TrigAlgorithms/TrigHLTJetHemisphereRec/src/TrigHLTJetHemisphereRec.cxx @@ -75,7 +75,7 @@ HLT::ErrorCode TrigHLTJetHemisphereRec::acceptInput(const HLT::TriggerElement* i HLT::ErrorCode ec = getFeature(inputTE, jetContainer); if(ec!=HLT::OK) { - msg() << MSG::WARNING << " Failed to get the Jets " << endreq; + msg() << MSG::WARNING << " Failed to get the Jets " << endmsg; return ec; } diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx index a04afeebdaf..eb64bc6faef 100644 --- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx +++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/IParticleSelectorEtaPt.cxx @@ -22,7 +22,7 @@ IParticleSelectorEtaPt::IParticleSelectorEtaPt(const std::string& s, StatusCode IParticleSelectorEtaPt::initialize() { - ATH_MSG_INFO("etaMax: " << m_etaMax << " ptMin: " << m_ptMin << endreq); + ATH_MSG_INFO("etaMax: " << m_etaMax << " ptMin: " << m_ptMin << endmsg); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx index 6927a3c0cbe..1cb3a5d7a51 100644 --- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx +++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/PseudoJetSelectorEtaPt.cxx @@ -17,7 +17,7 @@ PseudoJetSelectorEtaPt::PseudoJetSelectorEtaPt(const std::string& s, StatusCode PseudoJetSelectorEtaPt::initialize() { m_selector = PseudoJetSelector(m_etaMax, m_ptMin); - ATH_MSG_INFO("etaMax: " << m_etaMax << " ptMin: " << m_ptMin << endreq); + ATH_MSG_INFO("etaMax: " << m_etaMax << " ptMin: " << m_ptMin << endmsg); return StatusCode::SUCCESS; } diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2CaloMissingET.cxx b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2CaloMissingET.cxx index 045ca09c5dd..b8c0bafca3f 100755 --- a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2CaloMissingET.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2CaloMissingET.cxx @@ -86,15 +86,15 @@ T2CaloMissingET::T2CaloMissingET(const std::string& name, ISvcLocator* pSvcLocat HLT::ErrorCode T2CaloMissingET::hltInitialize(){ m_log = new MsgStream(msgSvc(), name()); - (*m_log) << MSG::INFO << "on hltInitialize()" << endreq; + (*m_log) << MSG::INFO << "on hltInitialize()" << endmsg; if ((m_data.retrieve()).isFailure()) { - (*m_log) << MSG::ERROR << "Could not get m_data" << endreq; + (*m_log) << MSG::ERROR << "Could not get m_data" << endmsg; return HLT::OK; } if( (m_timersvc.retrieve()).isFailure() ) { - (*m_log) << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endreq; + (*m_log) << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endmsg; } if ( !m_timersvc.empty()) { @@ -111,23 +111,23 @@ HLT::ErrorCode T2CaloMissingET::hltInitialize(){ } if(toolSvc()->retrieveTool("LArCablingService",m_cablingSvc).isFailure()) { - *m_log << MSG::FATAL << "Could not get LArCablingService" << endreq; + *m_log << MSG::FATAL << "Could not get LArCablingService" << endmsg; return StatusCode::FAILURE; } StoreGateSvc* detStore = 0; if (service( "DetectorStore", detStore ).isFailure()) { - *m_log << MSG::FATAL << "Unable to locate DetectorStore" << endreq; + *m_log << MSG::FATAL << "Unable to locate DetectorStore" << endmsg; return StatusCode::FAILURE; } if (detStore->retrieve(m_LArOnlineID, "LArOnlineID").isFailure()) { - *m_log << MSG::FATAL << "Could not get LArOnlineID helper!" << endreq; + *m_log << MSG::FATAL << "Could not get LArOnlineID helper!" << endmsg; return StatusCode::FAILURE; } if (detStore->retrieve(m_CaloCell_ID, "CaloCell_ID").isFailure()) { - *m_log << MSG::FATAL << "Could not get CaloCell_ID helper!" << endreq; + *m_log << MSG::FATAL << "Could not get CaloCell_ID helper!" << endmsg; return StatusCode::FAILURE; } @@ -135,7 +135,7 @@ HLT::ErrorCode T2CaloMissingET::hltInitialize(){ } HLT::ErrorCode T2CaloMissingET::hltFinalize(){ - (*m_log) << MSG::INFO << "on hltFinalize()" << endreq; + (*m_log) << MSG::INFO << "on hltFinalize()" << endmsg; delete m_log; return HLT::OK; } @@ -155,13 +155,13 @@ HLT::TriggerElement* T2CaloMissingET::makeSeeding(std::vector<std::vector<HLT::T allTEs.push_back(tes.at(teIdx)); /* if (msgLvl() <= MSG::INFO) { - msg() << MSG::INFO << "using TE as a seed " << tes.at(teIdx)->getId() << endreq; + msg() << MSG::INFO << "using TE as a seed " << tes.at(teIdx)->getId() << endmsg; } */ } else { /* if (msgLvl() <= MSG::INFO) { - msg() << MSG::INFO << "skipping TE " << tes.at(teIdx)->getId() << endreq; + msg() << MSG::INFO << "skipping TE " << tes.at(teIdx)->getId() << endmsg; } */ } @@ -181,7 +181,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE // first check whether we executed this instance before: if (m_useCachedResult) { if (msgLvl() <= MSG::DEBUG) { - (*m_log) << MSG::DEBUG << "Executing this T2iCaloMissingET " << name() << " in cached mode" << endreq; + (*m_log) << MSG::DEBUG << "Executing this T2iCaloMissingET " << name() << " in cached mode" << endmsg; } HLT::TriggerElement* outputTE = makeSeeding(tes_in, type_out); @@ -213,7 +213,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE if(m_ReadL2L1) { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG<< " Reading in L2=L1 MET container" << endreq; + msg() << MSG::DEBUG<< " Reading in L2=L1 MET container" << endmsg; } bool storeL2L1 = true; @@ -222,18 +222,18 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE std::vector<const xAOD::TrigMissingET*> vectorL2L1MissingET; if (tes_in_size != 1) { - msg() << MSG::WARNING << " Failed to get L2=L1 vectorMissingETs. No storage of L1 will be performed " << endreq; + msg() << MSG::WARNING << " Failed to get L2=L1 vectorMissingETs. No storage of L1 will be performed " << endmsg; storeL2L1 = false; } else { HLT::ErrorCode status = getFeatures(tes_in[0][0], vectorL2L1MissingET); if(status != HLT::OK) { - msg() << MSG::WARNING << "Cannot find L2=L1 MET result!" << endreq; + msg() << MSG::WARNING << "Cannot find L2=L1 MET result!" << endmsg; storeL2L1 = false; } else { if ( vectorL2L1MissingET.size() < 1 ) { - msg() << MSG::WARNING << "Cannot find L2=L1 MET result!" << endreq; + msg() << MSG::WARNING << "Cannot find L2=L1 MET result!" << endmsg; storeL2L1 = false; } } @@ -242,7 +242,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE if(storeL2L1) { if(msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << " Got " << vectorL2L1MissingET.size() - << " vectorL2L1MissingET size associated to the TE" << endreq; + << " vectorL2L1MissingET size associated to the TE" << endmsg; } } @@ -251,7 +251,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE metL2L1 = vectorL2L1MissingET.front(); if (metL2L1==0){ if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG<< " L2=L1 MissingET pointer is null! No storage of L1 will be performed" << endreq; + msg() << MSG::DEBUG<< " L2=L1 MissingET pointer is null! No storage of L1 will be performed" << endmsg; } storeL2L1 = false; } @@ -273,12 +273,12 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE } LArFebEnergyCollection::const_iterator feb_it, feb_it_beg, feb_it_end; TileL2Container::const_iterator draw_it, draw_it_beg, draw_it_end; - if ( debug ) (*m_log) << MSG::DEBUG << "Executing" << endreq; + if ( debug ) (*m_log) << MSG::DEBUG << "Executing" << endmsg; int k_n[30]; for (int p=0; p<30; p++) k_n[p]=0; - if ( debug ) (*m_log) << MSG::DEBUG << "Size of detid:" << m_detid.size() << endreq; + if ( debug ) (*m_log) << MSG::DEBUG << "Size of detid:" << m_detid.size() << endmsg; //bool BSerrors = false; //if (m_data->report_error()) BSerrors = true; @@ -287,7 +287,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE for(size_t detid = 0; detid<m_detid.size();detid++){ m_timer[1]->resume(); if ( (m_data->LoadFullCollections(feb_it_beg,feb_it_end, m_detid[detid])).isFailure() ){ - (*m_log) << MSG::INFO << "problems to run load collection" << endreq; + (*m_log) << MSG::INFO << "problems to run load collection" << endmsg; return HLT::OK; } @@ -298,9 +298,9 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE #ifdef USECABLINGSERVICE if( (*feb_it)->getFebId() == 0) { if(msgLvl() <= MSG::DEBUG) { - (*m_log) << "component unknown for this FEB id: " << std::hex << (*feb_it)->getFebId() << std::dec << endreq; - (*m_log) << "this feb has: Ex " << (*feb_it)->getFebEx() << " Ey: " << (*feb_it)->getFebEy() << " Ez: " << (*feb_it)->getFebEz() << endreq; - (*m_log) << "Skipping this FEB" << endreq; + (*m_log) << "component unknown for this FEB id: " << std::hex << (*feb_it)->getFebId() << std::dec << endmsg; + (*m_log) << "this feb has: Ex " << (*feb_it)->getFebEx() << " Ey: " << (*feb_it)->getFebEy() << " Ez: " << (*feb_it)->getFebEz() << endmsg; + (*m_log) << "Skipping this FEB" << endmsg; } continue; } @@ -314,7 +314,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE ichannel++; if (ichannel>127) { (*m_log) << MSG::ERROR - << "not connected channel found for this FEB: " << (*feb_it)->getFebId() << endreq; + << "not connected channel found for this FEB: " << (*feb_it)->getFebId() << endmsg; return StatusCode::RECOVERABLE; } } while(!offChId.is_valid()); @@ -341,7 +341,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE k = 11 + caloSamp; break; default: - (*m_log) << MSG::FATAL << "Unknown subdetector!" << endreq; + (*m_log) << MSG::FATAL << "Unknown subdetector!" << endmsg; return StatusCode::FAILURE; } @@ -349,10 +349,10 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE if (k<30){ k_n[k]=k_n[k]+1; }else{ - (*m_log) << MSG::ERROR << "Unknown subdetector index!" << endreq; + (*m_log) << MSG::ERROR << "Unknown subdetector index!" << endmsg; } #else - //if(msgLvl() <= MSG::DEBUG) (*m_log) << "USING FEB MAP" << endreq; + //if(msgLvl() <= MSG::DEBUG) (*m_log) << "USING FEB MAP" << endmsg; unsigned char k = 0; std::map<int,unsigned char>::const_iterator it = febIdToComponentMap.find( (*feb_it)->getFebId() ); @@ -360,8 +360,8 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE k = it->second +1; } else { if(msgLvl() <= MSG::DEBUG) { - (*m_log) << "component unknown for this FEB id: " << std::hex << (*feb_it)->getFebId() << std::dec << endreq; - (*m_log) << "this feb has: Ex " << (*feb_it)->getFebEx() << " Ey: " << (*feb_it)->getFebEy() << " Ez: " << (*feb_it)->getFebEz() << endreq; + (*m_log) << "component unknown for this FEB id: " << std::hex << (*feb_it)->getFebId() << std::dec << endmsg; + (*m_log) << "this feb has: Ex " << (*feb_it)->getFebEx() << " Ey: " << (*feb_it)->getFebEy() << " Ez: " << (*feb_it)->getFebEz() << endmsg; } k = 1; // TODO to which component do we add unknown FEB energies; or should we have an "unknown" component } @@ -392,14 +392,14 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE (*m_log) << "; Ex=" << (*feb_it)->getFebEx(); (*m_log) << "; Ey=" << (*feb_it)->getFebEy(); (*m_log) << "; Ez=" << (*feb_it)->getFebEz(); - (*m_log) << endreq; + (*m_log) << endmsg; } // end of debug } // end of feb_it for } // end of detid for // Get the Tile part of the Calo info if( (m_data->LoadFullCollections(draw_it_beg, draw_it_end )).isFailure() ){ - (*m_log) << MSG::INFO << "Call to LoadFullCollections for tile drawers failed." << endreq; + (*m_log) << MSG::INFO << "Call to LoadFullCollections for tile drawers failed." << endmsg; return HLT::OK; } draw_it = draw_it_beg; @@ -433,15 +433,15 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE m_tile_nebc.push_back( idd ); m_tile_ebc.push_back( Etd ); } - //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << std::hex << "drawerID=0x" << id << std::dec << endreq; + //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << std::hex << "drawerID=0x" << id << std::dec << endmsg; if( (id & 0x700) == 0x100 || (id & 0x700) == 0x200 ) { - //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << "barrel" << endreq; + //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << "barrel" << endmsg; targetComponent = 10; }else if( (id & 0x700) == 0x300 || (id & 0x700) == 0x400 ) { - //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << "extended barrel" << endreq; + //if(m_outputLevel <= MSG::DEBUG) (*m_log) << MSG::DEBUG << "extended barrel" << endmsg; targetComponent = 11; }else{ - (*m_log) << MSG::ERROR << "dont know which part this tile drawer belongs to." << endreq; + (*m_log) << MSG::ERROR << "dont know which part this tile drawer belongs to." << endmsg; } float tempEx = m_met_feature->exComponent(targetComponent); @@ -465,11 +465,11 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE (*m_log) << "; Ex=" << (*draw_it)->Ex(); (*m_log) << "; Ey=" << (*draw_it)->Ey(); (*m_log) << "; Ez=" << (*draw_it)->Ez(); - (*m_log) << endreq; + (*m_log) << endmsg; } } - if ( debug ) (*m_log) << MSG::DEBUG << "Setting energies" << endreq; + if ( debug ) (*m_log) << MSG::DEBUG << "Setting energies" << endmsg; //Fill the total Ex,Ey,Ez,E,Et float tempEx=0.; @@ -492,7 +492,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE if ( debug ) { - (*m_log) << MSG::DEBUG << "m_met_feature" << std::endl << m_met_feature << endreq; + (*m_log) << MSG::DEBUG << "m_met_feature" << std::endl << m_met_feature << endmsg; for(int i=0; i < NCOM; i++) { (*m_log) << MSG::DEBUG << "m_met_feature component: " << i; (*m_log) << "\t Ex : " << m_met_feature->exComponent(i); @@ -500,7 +500,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE (*m_log) << "\t Ez : " << m_met_feature->ezComponent(i); (*m_log) << "\t SumE : " << m_met_feature->sumEComponent(i); (*m_log) << "\t SumEt: " << m_met_feature->sumEtComponent(i); - (*m_log) << endreq; + (*m_log) << endmsg; } } // convert back to GeV for output log @@ -512,10 +512,10 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE m_met=sqrt(tempEx*tempEx+tempEy*tempEy)/1000.; if ( debug ) { - msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) MET = " << m_met << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) METx = " << m_Ex << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) METy = " << m_Ey << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) SumEt = " << m_Et << " GeV" << endreq; + msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) MET = " << m_met << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) METx = " << m_Ex << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) METy = " << m_Ey << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2 FEB) SumEt = " << m_Et << " GeV" << endmsg; } m_timer[1]->stop(); @@ -529,7 +529,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE if ( hltStatus != HLT::OK ) { msg() << MSG::WARNING // ERROR << "Write of TrigMissingET feature into outputTE failed" - << endreq; + << endmsg; return hltStatus; } @@ -550,7 +550,7 @@ HLT::ErrorCode T2CaloMissingET::hltExecute(std::vector<std::vector<HLT::TriggerE HLT::ErrorCode T2CaloMissingET::init(xAOD::TrigMissingET *met){ int ncom=met->getNumberOfComponents(); if(ncom!=NCOM){ - msg() << MSG::ERROR << "Wrong number of TrigMissingET dimension." << endreq; + msg() << MSG::ERROR << "Wrong number of TrigMissingET dimension." << endmsg; return HLT::NO_HLT_RESULT; } met->setNameOfComponent(0, "L1Calo "); diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx index bd710642897..347e277b267 100755 --- a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx +++ b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx @@ -152,7 +152,7 @@ HLT::ErrorCode T2MissingET::hltBeginRun() { // access StoreGate m_StoreGate = store(); if (m_StoreGate==0) { - msg() << MSG::ERROR << "Can not access StoreGate" << endreq; + msg() << MSG::ERROR << "Can not access StoreGate" << endmsg; return HLT::SG_ERROR; } @@ -181,13 +181,13 @@ HLT::TriggerElement* T2MissingET::makeSeeding(std::vector<std::vector<HLT::Trigg allTEs.push_back(tes.at(teIdx)); /* if (msgLvl() <= MSG::INFO) { - msg() << MSG::INFO << "using TE as a seed " << tes.at(teIdx)->getId() << endreq; + msg() << MSG::INFO << "using TE as a seed " << tes.at(teIdx)->getId() << endmsg; } */ } else { /* if (msgLvl() <= MSG::INFO) { - msg() << MSG::INFO << "skipping TE " << tes.at(teIdx)->getId() << endreq; + msg() << MSG::INFO << "skipping TE " << tes.at(teIdx)->getId() << endmsg; } */ } @@ -204,7 +204,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme // first check whether we executed this instance before: if (m_useCachedResult) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Executing this T2MissingET " << name() << " in cached mode" << endreq; + msg() << MSG::DEBUG << "Executing this T2MissingET " << name() << " in cached mode" << endmsg; } HLT::TriggerElement* outputTE = makeSeeding(tes_in, type_out); @@ -220,12 +220,12 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme int flag=0; if(firsteventinrun) { - msg() << MSG::DEBUG << "REGTEST: First event in run" << endreq; + msg() << MSG::DEBUG << "REGTEST: First event in run" << endmsg; // get EventInfo const xAOD::EventInfo* pEvent(0); StatusCode sc = m_StoreGate->retrieve(pEvent); if ( sc.isFailure() ) { - msg() << MSG::ERROR << "Cannot find xAODEventInfo object" << endreq; + msg() << MSG::ERROR << "Cannot find xAODEventInfo object" << endmsg; return HLT::SG_ERROR; } m_current_run_id = pEvent->runNumber(); @@ -238,7 +238,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme snprintf(buff,512, "REGTEST: Run number = %11u, luminosity block = %11u, event number = %11u, bunch crossing = %11u", m_current_run_id, m_current_lbk_id, m_current_evt_id, m_current_bcg_id); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } m_LArEMbarrelAside=true; @@ -261,7 +261,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme if(msgLvl() <= MSG::DEBUG){ char buff[512]; snprintf(buff,512,"REGTEST: DetMask = 0x%08lu",mask64); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } if (!(mask64==0)) { // 0 means present @@ -280,18 +280,18 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme m_TileExtBarAside = dm.is_set(eformat::TILECAL_EXT_A_SIDE); m_TileExtBarCside = dm.is_set(eformat::TILECAL_EXT_C_SIDE); - if(!m_LArEMbarrelAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_BARREL_A_SIDE is absent!" << endreq; - if(!m_LArEMbarrelCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_BARREL_C_SIDE is absent!" << endreq; - if(!m_LArEMendCapAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_ENDCAP_A_SIDE is absent!" << endreq; - if(!m_LArEMendCapCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_ENDCAP_C_SIDE is absent!" << endreq; - if(!m_LArHECendCapAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_HAD_ENDCAP_A_SIDE is absent!" << endreq; - if(!m_LArHECendCapCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_HAD_ENDCAP_C_SIDE is absent!" << endreq; - if(!m_LArFCalAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_FCAL_A_SIDE is absent!" << endreq; - if(!m_LArFCalCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_FCAL_C_SIDE is absent!" << endreq; - if(!m_TileBarrelAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_BARREL_A_SIDE is absent!" << endreq; - if(!m_TileBarrelCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_BARREL_C_SIDE is absent!" << endreq; - if(!m_TileExtBarAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_EXT_A_SIDE is absent!" << endreq; - if(!m_TileExtBarCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_EXT_C_SIDE is absent!" << endreq; + if(!m_LArEMbarrelAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_BARREL_A_SIDE is absent!" << endmsg; + if(!m_LArEMbarrelCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_BARREL_C_SIDE is absent!" << endmsg; + if(!m_LArEMendCapAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_ENDCAP_A_SIDE is absent!" << endmsg; + if(!m_LArEMendCapCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_EM_ENDCAP_C_SIDE is absent!" << endmsg; + if(!m_LArHECendCapAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_HAD_ENDCAP_A_SIDE is absent!" << endmsg; + if(!m_LArHECendCapCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_HAD_ENDCAP_C_SIDE is absent!" << endmsg; + if(!m_LArFCalAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_FCAL_A_SIDE is absent!" << endmsg; + if(!m_LArFCalCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "LAR_FCAL_C_SIDE is absent!" << endmsg; + if(!m_TileBarrelAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_BARREL_A_SIDE is absent!" << endmsg; + if(!m_TileBarrelCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_BARREL_C_SIDE is absent!" << endmsg; + if(!m_TileExtBarAside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_EXT_A_SIDE is absent!" << endmsg; + if(!m_TileExtBarCside && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "TILECAL_EXT_C_SIDE is absent!" << endmsg; m_L1Calo=true; if (!dm.is_set(eformat::TDAQ_CALO_PREPROC)) m_L1Calo=false; @@ -300,7 +300,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme if (!dm.is_set(eformat::TDAQ_CALO_JET_PROC_DAQ)) m_L1Calo=false; if (!dm.is_set(eformat::TDAQ_CALO_JET_PROC_ROI)) m_L1Calo=false; - if(!m_L1Calo && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "L1Calo is absent!" << endreq; + if(!m_L1Calo && msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "L1Calo is absent!" << endmsg; } // Finshed dealing with non zero detector mask @@ -320,7 +320,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme if (m_met_feature==0) { if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING - << "cannot create the TrigMissingET object!" << endreq; + << "cannot create the TrigMissingET object!" << endmsg; return HLT::NO_HLT_RESULT; } @@ -335,7 +335,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "Write of TrigMissingET feature into outputTE failed" - << endreq; + << endmsg; return hltStatus; } @@ -392,10 +392,10 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme unsigned int tes_in0_size=0; // size of L1 result (must be = 1) if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "tes_in.size() = " << tes_in_size << endreq; + msg() << MSG::DEBUG << "tes_in.size() = " << tes_in_size << endmsg; for (unsigned u=0; u<tes_in_size; ++u) { - msg() << MSG::DEBUG << "tes_in[" << u << "].size() = " << tes_in[u].size() << endreq; + msg() << MSG::DEBUG << "tes_in[" << u << "].size() = " << tes_in[u].size() << endmsg; } } @@ -403,19 +403,19 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme case 0: // unseeded mode seeded=false; if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Running in unseeded mode" << endreq; + msg() << MSG::DEBUG << "Running in unseeded mode" << endmsg; } break; case 1: // seeded mode seeded=true; if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Running in seeded mode" << endreq; + msg() << MSG::DEBUG << "Running in seeded mode" << endmsg; } tes_in0_size=tes_in[0].size(); if (tes_in0_size != 1) { msg() << MSG::WARNING // ERROR - << "Configuration error: expecting exactly 1 L1 result. Aborting chain" << endreq; + << "Configuration error: expecting exactly 1 L1 result. Aborting chain" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } break; @@ -423,7 +423,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme default: msg() << MSG::WARNING // ERROR << "Configuration error: tes_in.size() is " << tes_in_size - << " but can only be 1 or 0 in unseeded mode. Aborting chain" << endreq; + << " but can only be 1 or 0 in unseeded mode. Aborting chain" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } @@ -435,17 +435,17 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme HLT::ErrorCode status = getFeatures(tes_in[0][0], vectorOfEnergyRoI); if(status == HLT::OK) { if ( vectorOfEnergyRoI.size() < 1 ) { - msg() << MSG::WARNING << "Cannot find L1 result!" << endreq; + msg() << MSG::WARNING << "Cannot find L1 result!" << endmsg; return HLT::NAV_ERROR; } else if ( vectorOfEnergyRoI.size() > 1 ) { msg() << MSG::WARNING << "found " << vectorOfEnergyRoI.size() - << " RecEnergyRoI features but they should be exactly 1! Taking first one with fingers crossed" << endreq; + << " RecEnergyRoI features but they should be exactly 1! Taking first one with fingers crossed" << endmsg; } lvl1_energyRoi = vectorOfEnergyRoI.front(); } else { msg() << MSG::WARNING - << "RecEnergyRoI feature not found. Aborting" << endreq; + << "RecEnergyRoI feature not found. Aborting" << endmsg; return HLT::NAV_ERROR; } } else { // unseeded mode: get all RoIs and look for the good one @@ -458,7 +458,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme } } if(!lvl1_energyRoi) { - msg() << MSG::WARNING << "No RecEnergyRoI object found! Aborting" << endreq; + msg() << MSG::WARNING << "No RecEnergyRoI object found! Aborting" << endmsg; return HLT::NAV_ERROR; } } @@ -476,7 +476,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme const xAOD::EventInfo* pEvent(0); StatusCode sc = m_StoreGate->retrieve(pEvent); if ( sc.isFailure() ) { - msg() << MSG::ERROR << "Cannot find xAOD::EventInfo object" << endreq; + msg() << MSG::ERROR << "Cannot find xAOD::EventInfo object" << endmsg; } else { m_current_run_id = pEvent->runNumber(); m_current_lbk_id = pEvent->lumiBlock(); @@ -486,14 +486,14 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme snprintf(buff,512, "REGTEST: Run number = %11u, luminosity block = %11u, event number = %11u, bunch crossing = %11u", m_current_run_id, m_current_lbk_id, m_current_evt_id, m_current_bcg_id); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } } - msg() << MSG::DEBUG << "REGTEST: (LVL1) Lvl1Id = " << config()->getLvl1Id() << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL1) et = " << m_lvl1_met << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL1) ex = " << m_lvl1_mex << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL1) ey = " << m_lvl1_mey << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL1) SumEt = " << m_lvl1_set << " GeV" << endreq; + msg() << MSG::DEBUG << "REGTEST: (LVL1) Lvl1Id = " << config()->getLvl1Id() << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL1) et = " << m_lvl1_met << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL1) ex = " << m_lvl1_mex << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL1) ey = " << m_lvl1_mey << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL1) SumEt = " << m_lvl1_set << " GeV" << endmsg; } // convert energy from GeV to MeV @@ -543,7 +543,7 @@ HLT::ErrorCode T2MissingET::hltExecute(std::vector<std::vector<HLT::TriggerEleme flag |= m_maskMETinBadPhiRegion; // flag event if (msgLvl() <= MSG::INFO) msg() << MSG::INFO << " -- measured phi = " << m_lvl2_phi - << " --> event flagged" << endreq; + << " --> event flagged" << endmsg; /* NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the future :-) @@ -558,17 +558,17 @@ NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the futu if (MEeta>etaMin && MEeta<etaMax) { flag |= m_maskMETinBadRegion; // flag event msg() << MSG::INFO << " -- measured eta = " << MEeta - << " --> event flagged" << endreq; + << " --> event flagged" << endmsg; } else { - msg() << MSG::INFO << " -- event does not point here" << endreq; + msg() << MSG::INFO << " -- event does not point here" << endmsg; } } // end eta check */ } else { if (msgLvl() <= MSG::INFO) - msg() << MSG::INFO << " -- event does not point here" << endreq; + msg() << MSG::INFO << " -- event does not point here" << endmsg; } // end of region check } // loop over bad regions } // end of phi check @@ -595,7 +595,7 @@ NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the futu if (m_met_feature==0) { msg() << MSG::WARNING // ERROR - << "cannot create the TrigMissingET object!" << endreq; + << "cannot create the TrigMissingET object!" << endmsg; return HLT::NO_HLT_RESULT; } init(m_met_feature); @@ -615,13 +615,13 @@ NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the futu m_lvl2_met = sqrt(m_lvl2_mex * m_lvl2_mex + m_lvl2_mey * m_lvl2_mey); if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: (LVL2) et = " << m_lvl2_met << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2) ex = " << m_lvl2_mex << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2) ey = " << m_lvl2_mey << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (LVL2) SumEt = " << m_lvl2_set << " GeV" << endreq; + msg() << MSG::DEBUG << "REGTEST: (LVL2) et = " << m_lvl2_met << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2) ex = " << m_lvl2_mex << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2) ey = " << m_lvl2_mey << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (LVL2) SumEt = " << m_lvl2_set << " GeV" << endmsg; char buff[128]; std::snprintf(buff,128,"REGTEST: (LVL2) Event status = 0x%08x", (unsigned)flag); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } // monitoring: status flag @@ -692,7 +692,7 @@ NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the futu if ( hltStatus != HLT::OK ) { msg() << MSG::WARNING // ERROR << "Write of TrigMissingET feature into outputTE failed" - << endreq; + << endmsg; return hltStatus; } @@ -713,7 +713,7 @@ NO CHECK ON ETA CAN BE DONE ON THE RESULT BY L1Calo: keep this code for the futu HLT::ErrorCode T2MissingET::init(xAOD::TrigMissingET *met){ int ncom=met->getNumberOfComponents(); if(ncom!=NCOM){ - msg() << MSG::ERROR << "Wrong number of TrigMissingET dimension." << endreq; + msg() << MSG::ERROR << "Wrong number of TrigMissingET dimension." << endmsg; return HLT::NO_HLT_RESULT; } met->setNameOfComponent(0,"Muons "); diff --git a/Trigger/TrigAlgorithms/TrigL2SiTrackFinder/src/TrigL2SiTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigL2SiTrackFinder/src/TrigL2SiTrackFinder.cxx index eef75a2c9e4..25e45dcea62 100755 --- a/Trigger/TrigAlgorithms/TrigL2SiTrackFinder/src/TrigL2SiTrackFinder.cxx +++ b/Trigger/TrigAlgorithms/TrigL2SiTrackFinder/src/TrigL2SiTrackFinder.cxx @@ -196,67 +196,67 @@ TrigL2SiTrackFinder::~TrigL2SiTrackFinder() {} HLT::ErrorCode TrigL2SiTrackFinder::hltInitialize() { - msg() << MSG::INFO << "TrigL2SiTrackFinder::initialize() " << PACKAGE_VERSION << endreq; + msg() << MSG::INFO << "TrigL2SiTrackFinder::initialize() " << PACKAGE_VERSION << endmsg; StatusCode sc = StatusCode::FAILURE; if (m_printDiagnosticMessages) msg() << MSG::WARNING << "TrigL2SiTrackFinder Diagnostic Messages enabled - this will give many messages per event to std::cout !!" - << endreq; + << endmsg; sc = m_spacePointProvider.retrieve(); if ( sc.isFailure() ) { - msg() << MSG::FATAL << "Unable to locate SpacePointProviderTool " << m_spacePointProvider << endreq; + msg() << MSG::FATAL << "Unable to locate SpacePointProviderTool " << m_spacePointProvider << endmsg; return HLT::BAD_JOB_SETUP; } sc = m_trigInDetTrackFitter.retrieve(); if ( sc.isFailure() ) { - msg() << MSG::FATAL << "Unable to locate TrackFitter tool " << m_trigInDetTrackFitter << endreq; + msg() << MSG::FATAL << "Unable to locate TrackFitter tool " << m_trigInDetTrackFitter << endmsg; return HLT::BAD_JOB_SETUP; } if(m_doTRTpropagation) { sc = m_trigTRT_TrackExtensionTool.retrieve(); if ( sc.isFailure() ) { - msg() << MSG::FATAL <<"Unable to locate TRT track extension tool " << m_trigTRT_TrackExtensionTool << endreq; + msg() << MSG::FATAL <<"Unable to locate TRT track extension tool " << m_trigTRT_TrackExtensionTool << endmsg; return HLT::BAD_JOB_SETUP; } } sc = m_trigL2ResidualCalculator.retrieve(); if ( sc.isFailure() ) { - msg() << MSG::FATAL <<"Unable to locate Residual calculator tool " << m_trigL2ResidualCalculator << endreq; + msg() << MSG::FATAL <<"Unable to locate Residual calculator tool " << m_trigL2ResidualCalculator << endmsg; return HLT::BAD_JOB_SETUP; } sc = m_recoStrategy.retrieve(); if ( sc.isFailure() ) { - msg() << MSG::FATAL <<"Unable to locate Reconstruction Tool " << m_recoStrategy << endreq; + msg() << MSG::FATAL <<"Unable to locate Reconstruction Tool " << m_recoStrategy << endmsg; return HLT::BAD_JOB_SETUP; } StoreGateSvc* detStore; sc = service("DetectorStore", detStore); if ( sc.isFailure() ) { - msg() << MSG::ERROR << "DetStore service not found" << endreq; + msg() << MSG::ERROR << "DetStore service not found" << endmsg; return HLT::BAD_JOB_SETUP; } if (detStore->retrieve(m_pixelId, "PixelID").isFailure()) { - msg() << MSG::ERROR << "Could not get Pixel ID helper" << endreq; + msg() << MSG::ERROR << "Could not get Pixel ID helper" << endmsg; return HLT::BAD_JOB_SETUP; } if (detStore->retrieve(m_sctId, "SCT_ID").isFailure()) { - msg() << MSG::ERROR << "Could not get SCT ID helper" << endreq; + msg() << MSG::ERROR << "Could not get SCT ID helper" << endmsg; return HLT::BAD_JOB_SETUP; } /*if ( m_adjustLayerThreshold ) { - msg() << MSG::INFO << "will adjust layer threshold depending on disabled modules" << endreq; + msg() << MSG::INFO << "will adjust layer threshold depending on disabled modules" << endmsg; sc = serviceLocator()->service( m_regionSelectorName, m_regionSelector); if ( sc.isFailure() ) { - msg() << MSG::FATAL << "Unable to retrieve RegionSelector Service " << m_regionSelectorName << endreq; + msg() << MSG::FATAL << "Unable to retrieve RegionSelector Service " << m_regionSelectorName << endmsg; return HLT::BAD_JOB_SETUP; }; } @@ -292,13 +292,13 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltInitialize() { m_TrtExtensionTimer = addTimer("TrtExtension", "TrtExtension_nTracks"); } - msg() << MSG::INFO << " TrigL2SiTrackFinder : MinHits set to " << m_minHits << endreq; + msg() << MSG::INFO << " TrigL2SiTrackFinder : MinHits set to " << m_minHits << endmsg; if (m_useBeamSpot) { StatusCode scBS = service("BeamCondSvc", m_iBeamCondSvc); if (scBS.isFailure() || m_iBeamCondSvc == 0) { m_iBeamCondSvc = 0; - msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endreq; + msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endmsg; } } @@ -321,18 +321,18 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltInitialize() { m_attachedFeatureName2 = string("TrigL2SiTrackFinder_TrkTrack"); } } - msg() << MSG::DEBUG << " Features recorded with Key " << m_attachedFeatureName << endreq; - msg() << MSG::DEBUG << " Features recorded with Key " << m_attachedFeatureName2 << endreq; + msg() << MSG::DEBUG << " Features recorded with Key " << m_attachedFeatureName << endmsg; + msg() << MSG::DEBUG << " Features recorded with Key " << m_attachedFeatureName2 << endmsg; sc= m_trackSummaryTool.retrieve(); if(sc.isFailure()) { - msg() << MSG::ERROR << "unable to locate track summary tool" << endreq; + msg() << MSG::ERROR << "unable to locate track summary tool" << endmsg; return HLT::BAD_JOB_SETUP; } - msg() << MSG::DEBUG << " Initialized successfully" << endreq; + msg() << MSG::DEBUG << " Initialized successfully" << endmsg; return HLT::OK; } @@ -386,7 +386,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_roi_nSPs=0; m_nZvertices=0; - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "TrigL2SiTrackFinder::execHLTAlgorithm()" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "TrigL2SiTrackFinder::execHLTAlgorithm()" << endmsg; // 1. Event information, masking update @@ -396,16 +396,16 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT unsigned int IdEvent=0; if ( store()->retrieve(pEventInfo).isFailure() ) { if(m_detector_mask_not_checked && m_detector_mask_on_event) { - msg() << MSG::ERROR << "Could not find EventInfo object for detector mask info" << endreq; + msg() << MSG::ERROR << "Could not find EventInfo object for detector mask info" << endmsg; return HLT::SG_ERROR; } // if we are not interested in the detector mask, this is a minor problem. - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to get EventInfo " << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to get EventInfo " << endmsg; } else { IdRun = pEventInfo->event_ID()->run_number(); IdEvent = pEventInfo->event_ID()->event_number(); - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Run " << IdRun << " Event " << IdEvent << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Run " << IdRun << " Event " << IdEvent << endmsg; if(m_detector_mask_not_checked && m_detector_mask_on_event) setup_detector_mask(pEventInfo->event_ID()); }*/ @@ -499,7 +499,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT getFeature(inputTE, roi); } if ( roi==nullptr ) { - msg() << MSG::WARNING << "REGTEST / Failed to find RoiDescriptor " << endreq; + msg() << MSG::WARNING << "REGTEST / Failed to find RoiDescriptor " << endmsg; delete m_recoTracks; m_recoTracks=nullptr; return HLT::NAV_ERROR; @@ -518,12 +518,12 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_roiPhiWidth = HLT::wrapPhi(internalRoI->phiPlus() - internalRoI->phiMinus()); if(msgLvl()<=MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST / RoI: " << *roi << endreq; + msg() << MSG::DEBUG << "REGTEST / RoI: " << *roi << endmsg; } m_countTotalRoI++; if(roi->etaMinus()== roi->etaPlus() || roi->phiMinus()== roi->phiPlus()){// use values from configurable if (!m_roiWidthWarning) { - msg() << MSG::WARNING << "REGTEST / RoI width not set properly" << " " << *roi << endreq; + msg() << MSG::WARNING << "REGTEST / RoI width not set properly" << " " << *roi << endmsg; m_roiWidthWarning=true; } TrigRoiDescriptor* _roi = new TrigRoiDescriptor( m_roiEta, m_roiEta-m_etaHalfWidth, m_roiEta+m_etaHalfWidth, @@ -565,7 +565,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT /** Debug info. */ if(msgLvl()<=MSG::DEBUG) { - msg() << MSG::DEBUG << "SEED DATA ACCESS: found " << m_filteredSpacePoints.size() << " space points" << endreq; + msg() << MSG::DEBUG << "SEED DATA ACCESS: found " << m_filteredSpacePoints.size() << " space points" << endmsg; } if ( timerSvc() ) m_SpacePointReaderTimer->stop(); @@ -606,7 +606,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT std::copy(errVect->begin(),errVect->end(),std::back_inserter(m_sctDataErrors)); } else if(scOSP.isFailure()) { - msg() << MSG::WARNING << "SpacePoint formation failed " << endreq; + msg() << MSG::WARNING << "SpacePoint formation failed " << endmsg; m_dataErrors.push_back(0); delete m_recoTracks; m_recoTracks=NULL; @@ -616,19 +616,19 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT if(scOSP.isRecoverable()||scOSP.isSuccess()) { if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Modules hit in RoI: PIX = " << listOfPixIds.size() << " , SCT = " << listOfSctIds.size() - << endreq; + << endmsg; } if( m_roi_nSPs >= m_minHits ) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / Found " << m_roi_nSPs << " space points." << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / Found " << m_roi_nSPs << " space points." << endmsg; m_countRoIwithEnoughHits++; } else { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "No tracks found - too few hits in ROI to run " << m_roi_nSPs << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "No tracks found - too few hits in ROI to run " << m_roi_nSPs << endmsg; HLT::ErrorCode code = attachFeature(outputTE, new TrigInDetTrackCollection, m_attachedFeatureName); if ( code != HLT::OK ) { - msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endreq; + msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endmsg; delete m_recoTracks; m_recoTracks=NULL; return code; @@ -652,7 +652,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT Amg::Vector3D vertex = m_iBeamCondSvc->beamPos(); if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Beam spot position " << vertex << endreq; + msg() << MSG::DEBUG << "Beam spot position " << vertex << endmsg; double xVTX = vertex.x(); double yVTX = vertex.y(); double zVTX = vertex.z(); @@ -662,7 +662,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT shifty = yVTX - tiltYZ*zVTX;//correction for tilt if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Center position: " << shiftx <<" "<< shifty << endreq; + msg() << MSG::DEBUG << "Center position: " << shiftx <<" "<< shifty << endmsg; } // 7. actual pattern recognition, for example @@ -693,7 +693,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT */ if( m_recoTracks->empty() ) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / No tracks reconstructed" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / No tracks reconstructed" << endmsg; if (m_printDiagnosticMessages) std::cout << "TrigL2SiTrackFinder DIAGNOSTIC: No tracks reconstructed" << std::endl; // StatusCode sc = m_EventData2XML->execute(); } @@ -702,10 +702,10 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_recoStrategy->getZvertices(m_zVertices); m_nZvertices=m_zVertices.size(); - msg() << MSG::VERBOSE << "vertices.size(): " << m_zVertices << endreq; + msg() << MSG::VERBOSE << "vertices.size(): " << m_zVertices << endmsg; if(msgLvl() <= MSG::VERBOSE) { for (auto vertex : m_zVertices) { - msg() << MSG::VERBOSE << "vertex " << vertex << endreq; + msg() << MSG::VERBOSE << "vertex " << vertex << endmsg; } } @@ -713,7 +713,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_ntracks=m_recoTracks->size(); if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / Found " << m_recoTracks->size() - << " tracks. Proceeding to track fitter." << endreq; + << " tracks. Proceeding to track fitter." << endmsg; if (m_printDiagnosticMessages) std::cout << "TrigL2SiTrackFinder DIAGNOSTIC " << " Found " << m_recoTracks->size() << " tracks. Proceeding to track fitter." << std::endl; if( !m_recoTracks->empty() ) @@ -775,7 +775,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT std::copy(errVect->begin(),errVect->end(),std::back_inserter(m_trtDataErrors)); } else if(sc.isFailure()) { - msg() << MSG::WARNING <<"Bad TRT data"<<endreq; + msg() << MSG::WARNING <<"Bad TRT data"<<endmsg; m_dataErrors.push_back(2); delete m_recoTracks; m_recoTracks=NULL; @@ -785,7 +785,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_currentStage = 7; if ( msgLvl() <= MSG::DEBUG || m_printDiagnosticMessages) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / Reconstructed " << m_recoTracks->size() << " tracks " << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST / Reconstructed " << m_recoTracks->size() << " tracks " << endmsg; if (m_printDiagnosticMessages) std::cout << "TrigL2SiTrackFinder DIAGNOSTIC " << " Reconstructed " << m_recoTracks->size() << " tracks " << std::endl; TrigInDetTrackCollection::iterator track = m_recoTracks->begin(); TrigInDetTrackCollection::iterator lastTrack = m_recoTracks->end(); @@ -800,7 +800,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT (*track)->param()->eta() << " / " << (*track)->param()->a0() << " / " << (*track)->param()->z0() << " / " << - (*track)->chi2() << endreq; + (*track)->chi2() << endmsg; if (m_printDiagnosticMessages) std::cout << "TrigL2SiTrackFinder DIAGNOSTIC " << " track nstraw/ntr/phi0/pt/eta/d0/z0/chi2: " << (*track)->NStrawHits() << " / " << @@ -825,7 +825,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT HLT::ErrorCode code = attachFeature(outputTE, m_recoTracks, m_attachedFeatureName); if ( code != HLT::OK ) { - msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endreq; + msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endmsg; delete m_recoTracks; m_recoTracks=NULL; return code; @@ -839,17 +839,17 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT m_trackSummaryTool->updateTrack(**track); } code = attachFeature(outputTE, m_recoTrkTracks, m_attachedFeatureName2); - //msg() << MSG::INFO << "Number of converted tracks: " << m_recoTrkTracks->size() << endreq; + //msg() << MSG::INFO << "Number of converted tracks: " << m_recoTrkTracks->size() << endmsg; //if (m_recoTrkTracks->size()!=m_recoTracks->size()) { - // msg() << MSG::INFO << "Mismatch " << endreq; - // msg() << MSG::INFO << "Number of original tracks: " << m_recoTracks->size() << endreq; - // msg() << MSG::INFO << "Number of converted tracks: " << m_recoTrkTracks->size() << endreq; + // msg() << MSG::INFO << "Mismatch " << endmsg; + // msg() << MSG::INFO << "Number of original tracks: " << m_recoTracks->size() << endmsg; + // msg() << MSG::INFO << "Number of converted tracks: " << m_recoTrkTracks->size() << endmsg; //} if ( code != HLT::OK ) { - msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endreq; + msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endmsg; delete m_recoTrkTracks; m_recoTrkTracks=NULL; return code; @@ -868,7 +868,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltExecute(const HLT::TriggerElement* inputT } HLT::ErrorCode code = attachFeature(outputTE,zVertColl, m_attachedFeatureName); if ( code != HLT::OK ) { - msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endreq; + msg() << MSG::ERROR << "REGTEST/ Write into outputTE failed" << endmsg; delete zVertColl; return code; } @@ -891,13 +891,13 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltFinalize() } #endif - msg() << MSG::INFO << "=========================================================" << endreq; - msg() << MSG::INFO << "TrigL2SiTrackFinder::finalize() - TrigL2SiTrackFinder Statistics: " << endreq; - msg() << MSG::INFO << "Events processed: " << m_countTotalEvents << endreq; - msg() << MSG::INFO << "RoI processed: " << m_countTotalRoI << endreq; - msg() << MSG::INFO << "RoI with enough SPs : " << m_countRoIwithEnoughHits << endreq; - msg() << MSG::INFO << "RoI with Track(s) Total/goodZvertex/badZvertex: " << m_countRoIwithTracks << endreq; - msg() << MSG::INFO << "=========================================================" << endreq; + msg() << MSG::INFO << "=========================================================" << endmsg; + msg() << MSG::INFO << "TrigL2SiTrackFinder::finalize() - TrigL2SiTrackFinder Statistics: " << endmsg; + msg() << MSG::INFO << "Events processed: " << m_countTotalEvents << endmsg; + msg() << MSG::INFO << "RoI processed: " << m_countTotalRoI << endmsg; + msg() << MSG::INFO << "RoI with enough SPs : " << m_countRoIwithEnoughHits << endmsg; + msg() << MSG::INFO << "RoI with Track(s) Total/goodZvertex/badZvertex: " << m_countRoIwithTracks << endmsg; + msg() << MSG::INFO << "=========================================================" << endmsg; return HLT::OK; } @@ -911,7 +911,7 @@ HLT::ErrorCode TrigL2SiTrackFinder::hltFinalize() zinfo->push_back(zvert); HLT::ErrorCode code = attachFeature(outputTE, zinfo, m_attachedFeatureName); - if (code != HLT::OK) msg() << MSG::ERROR << "zinfo Write into outputTE failed" << endreq; + if (code != HLT::OK) msg() << MSG::ERROR << "zinfo Write into outputTE failed" << endmsg; } */ @@ -920,12 +920,12 @@ HLT::ErrorCode TrigL2SiTrackFinder::retrieveSpacePointsContainers() { StatusCode sc=store()->retrieve(m_pixelSpacePointsContainer,m_pixelSpContName); if(sc.isFailure()) { - msg() << MSG::WARNING << "Trig SP Pixel container " <<m_pixelSpContName <<" not found"<<endreq; + msg() << MSG::WARNING << "Trig SP Pixel container " <<m_pixelSpContName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } sc=store()->retrieve(m_sctSpacePointsContainer,m_sctSpContName); if(sc.isFailure()) { - msg() << MSG::WARNING << "Trig SP SCT container " <<m_sctSpContName <<" not found"<<endreq; + msg() << MSG::WARNING << "Trig SP SCT container " <<m_sctSpContName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } @@ -947,7 +947,7 @@ void TrigL2SiTrackFinder::runResidualMonitoring(const TrigInDetTrack* pT) { if(!scRes.isSuccess()) return; for(std::vector<TrigL2HitResidual>::iterator it=vResid.begin();it!=vResid.end();++it) { - //msg() << MSG::INFO << (*it) << endreq; + //msg() << MSG::INFO << (*it) << endmsg; switch(it->regionId()) { case Region::PixBarrel : m_pixResPhiBarrel.push_back(it->phiResidual()); diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigTrackCounter.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigTrackCounter.cxx index d5fdfa94a55..14683892c47 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigTrackCounter.cxx +++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigTrackCounter.cxx @@ -71,7 +71,7 @@ TrigTrackCounter::~TrigTrackCounter(void) { HLT::ErrorCode TrigTrackCounter::hltInitialize() { m_log.setLevel(outputLevel()); - m_log << MSG::INFO << "Initialising this TrigTrackCounter: " << name() << endreq; + m_log << MSG::INFO << "Initialising this TrigTrackCounter: " << name() << endmsg; // Create timers if( timerSvc() ){ @@ -81,7 +81,7 @@ HLT::ErrorCode TrigTrackCounter::hltInitialize() { StatusCode sc = service("StoreGateSvc", m_storeGate); if( sc.isFailure() ){ - m_log << MSG::ERROR << "Unable to get StoreGateSvc" << endreq; + m_log << MSG::ERROR << "Unable to get StoreGateSvc" << endmsg; return StatusCode::FAILURE; } @@ -96,7 +96,7 @@ HLT::ErrorCode TrigTrackCounter::hltInitialize() { m_eta_phi->initialize(m_hEtaBins, m_hEtaMin, m_hEtaMax, m_hPhiBins, m_hPhiMin, m_hPhiMax); - m_log << MSG::INFO << "TrigTrackCounter initialized successfully" << endreq; + m_log << MSG::INFO << "TrigTrackCounter initialized successfully" << endmsg; return HLT::OK; } @@ -105,7 +105,7 @@ HLT::ErrorCode TrigTrackCounter::hltInitialize() { HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::TriggerElement* outputTE ){ if ( msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this TrigTrackCounter " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigTrackCounter " << name() << endmsg; } if( timerSvc() ){ @@ -116,11 +116,11 @@ HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::T // retrieve output from TrigAmbiguitySolver HLT::ErrorCode ec = getFeature( outputTE, m_recoTracks, m_trkContainerName ); if( ec != HLT::OK ){ - m_log << MSG::ERROR << "Input track collection " << m_trkContainerName << "could not be found " << endreq; + m_log << MSG::ERROR << "Input track collection " << m_trkContainerName << "could not be found " << endmsg; return HLT::NAV_ERROR; } else{ - m_log << MSG::DEBUG << "Retrieved successfully track collection " << m_trkContainerName << endreq; + m_log << MSG::DEBUG << "Retrieved successfully track collection " << m_trkContainerName << endmsg; } if( timerSvc() ){ @@ -134,13 +134,13 @@ HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::T m_ntrks = -999; if( !m_recoTracks || m_recoTracks->size() == 0 ){ if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST: TrackCollection contains is empty or contains 0 tracks." << endreq; + m_log << MSG::DEBUG << "REGTEST: TrackCollection contains is empty or contains 0 tracks." << endmsg; } } else{ m_ntrks = m_recoTracks->size(); if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST: TrackCollection contains " << m_ntrks << " tracks." << endreq; + m_log << MSG::DEBUG << "REGTEST: TrackCollection contains " << m_ntrks << " tracks." << endmsg; } TrackCollection::const_iterator itr = m_recoTracks->begin(); @@ -168,7 +168,7 @@ HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::T << "z0 = " << z0 << " mm, " << "phi0 = " << phi0 << ", " << "eta = " << eta << ", " - << "pt = " << pT/1000. << " GeV" << endreq; + << "pt = " << pT/1000. << " GeV" << endmsg; } } } @@ -212,7 +212,7 @@ HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::T HLT::ErrorCode hltStatus = attachFeature( outputTE, tk, "trackcounts" ); if(hltStatus != HLT::OK) { if(msgLvl() <= MSG::ERROR) { - m_log << MSG::ERROR << "Write of TrigTrackCounts into outputTE failed" << endreq; + m_log << MSG::ERROR << "Write of TrigTrackCounts into outputTE failed" << endmsg; } return hltStatus; } @@ -224,6 +224,6 @@ HLT::ErrorCode TrigTrackCounter::hltExecute( const HLT::TriggerElement *, HLT::T HLT::ErrorCode TrigTrackCounter::hltFinalize() { - m_log << MSG::INFO << "Finalizing this TrigTrackCounter" << name() << endreq; + m_log << MSG::INFO << "Finalizing this TrigTrackCounter" << name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounter.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounter.cxx index 18c6519ff0c..30863a5def2 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounter.cxx +++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounter.cxx @@ -38,7 +38,7 @@ TrigVertexCounter::~TrigVertexCounter(void) { HLT::ErrorCode TrigVertexCounter::hltInitialize() { m_log.setLevel(outputLevel()); - m_log << MSG::INFO << "Initialising this TrigVertexCounter: " << name() << endreq; + m_log << MSG::INFO << "Initialising this TrigVertexCounter: " << name() << endmsg; // Create timers if( timerSvc() ){ @@ -46,7 +46,7 @@ HLT::ErrorCode TrigVertexCounter::hltInitialize() { m_getVerticesTimer = addTimer("getVertices"); } - m_log << MSG::INFO << "TrigVertexCounter initialized successfully" << endreq; + m_log << MSG::INFO << "TrigVertexCounter initialized successfully" << endmsg; return HLT::OK; } @@ -60,7 +60,7 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: m_vtxNvtx = -1; if ( msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this TrigVertexCounter " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigVertexCounter " << name() << endmsg; } if( timerSvc() ){ @@ -70,11 +70,11 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: HLT::ErrorCode ec = getFeature( outputTE, m_vxContainer, m_vtxContainerName ); if( ec != HLT::OK ) { - m_log << MSG::ERROR << "Vertex collection " << m_vtxContainerName << "could not be found " << endreq; + m_log << MSG::ERROR << "Vertex collection " << m_vtxContainerName << "could not be found " << endmsg; return HLT::NAV_ERROR; } else { - m_log << MSG::DEBUG << "Retrieved successfully vertex collection " << m_vtxContainerName << endreq; + m_log << MSG::DEBUG << "Retrieved successfully vertex collection " << m_vtxContainerName << endmsg; } if( timerSvc() ){ @@ -83,7 +83,7 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: if( !m_vxContainer || m_vxContainer->size() == 0 ){ if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "VxContainer is null or contains 0 vertices." << endreq; + m_log << MSG::DEBUG << "VxContainer is null or contains 0 vertices." << endmsg; } } else{ @@ -101,13 +101,13 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: for (const auto& tplTrk : tpLinks) { if ( !(tplTrk.isValid()) ) { - m_log << MSG::WARNING << "Got an invalid element link. Continuing..." << endreq; + m_log << MSG::WARNING << "Got an invalid element link. Continuing..." << endmsg; continue; } const xAOD::TrackParticle* trk = *tplTrk; - //m_log << MSG::DEBUG << "Track pt = " << trk->pt() << endreq; + //m_log << MSG::DEBUG << "Track pt = " << trk->pt() << endmsg; // If the track fails the minimum pT cut skip it. if(trk->pt() < m_pTmin) continue; @@ -135,7 +135,7 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: HLT::ErrorCode hltStatus = attachFeature( outputTE, vc, "vertexcounts" ); if(hltStatus != HLT::OK) { if(msgLvl() <= MSG::ERROR) { - m_log << MSG::ERROR << "Write of TrigVertexCounts into outputTE failed" << endreq; + m_log << MSG::ERROR << "Write of TrigVertexCounts into outputTE failed" << endmsg; } return hltStatus; } @@ -147,6 +147,6 @@ HLT::ErrorCode TrigVertexCounter::hltExecute( const HLT::TriggerElement *, HLT:: HLT::ErrorCode TrigVertexCounter::hltFinalize() { - m_log << MSG::INFO << "Finalizing this TrigVertexCounter" << name() << endreq; + m_log << MSG::INFO << "Finalizing this TrigVertexCounter" << name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounterHypo.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounterHypo.cxx index 07fbd77f8ce..006430c90cd 100644 --- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounterHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrigVertexCounterHypo.cxx @@ -45,12 +45,12 @@ HLT::ErrorCode TrigVertexCounterHypo::hltInitialize() { m_log.setLevel( outputLevel() ); if (msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "Initialising TrigVertexCounterHypo, name = " << name() << endreq; - m_log << MSG::INFO << "RejectPileup = " << (m_rejectPileup ? "True" : "False") << endreq; - m_log << MSG::INFO << "Required_ntrks = " << m_required_ntrks << " #" << endreq; - m_log << MSG::INFO << "Max_ntrks = " << m_max_ntrks << " #" << endreq; - m_log << MSG::INFO << "AcceptAll = " << (m_acceptAll ? "True" : "False") << endreq; - m_log << MSG::INFO << "CutNumVtx = " << (m_cutNumVtx ? "True" : "False") << endreq; + m_log << MSG::INFO << "Initialising TrigVertexCounterHypo, name = " << name() << endmsg; + m_log << MSG::INFO << "RejectPileup = " << (m_rejectPileup ? "True" : "False") << endmsg; + m_log << MSG::INFO << "Required_ntrks = " << m_required_ntrks << " #" << endmsg; + m_log << MSG::INFO << "Max_ntrks = " << m_max_ntrks << " #" << endmsg; + m_log << MSG::INFO << "AcceptAll = " << (m_acceptAll ? "True" : "False") << endmsg; + m_log << MSG::INFO << "CutNumVtx = " << (m_cutNumVtx ? "True" : "False") << endmsg; } return HLT::OK; @@ -70,7 +70,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp m_vtxNvtxAccepted = -1; if( msgLvl() <= MSG::DEBUG ) { - m_log << MSG::DEBUG << "Executing this TrigVertexCounterHypo " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigVertexCounterHypo " << name() << endmsg; } if( m_acceptAll ){ @@ -82,7 +82,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp m_trigVertexCounts = 0; HLT::ErrorCode hltStatus = getFeature(outputTE, m_trigVertexCounts, "vertexcounts"); if(hltStatus != HLT::OK || !m_trigVertexCounts){ - if( msgLvl() <= MSG::WARNING ) m_log << MSG::WARNING << "Failed to retrieve features from TE." << endreq; + if( msgLvl() <= MSG::WARNING ) m_log << MSG::WARNING << "Failed to retrieve features from TE." << endmsg; return HLT::OK; } @@ -92,7 +92,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp unsigned int nvtx = m_vtxNtrks.size(); if(nvtx != m_vtxTrkPtSqSum.size()) { - m_log << MSG::ERROR << "The number of vertices does not agree within the TrigVertexCounts object." << endreq; + m_log << MSG::ERROR << "The number of vertices does not agree within the TrigVertexCounts object." << endmsg; return HLT::OK; } m_vtxNvtx = nvtx; @@ -105,7 +105,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp } if(num_vtx> m_min_Nvtx){ pass = true; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event accepted. Num vertices is :" << num_vtx << " with at least " << m_required_ntrks << " tracks" << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event accepted. Num vertices is :" << num_vtx << " with at least " << m_required_ntrks << " tracks" << endmsg; // Fill the monitoring variables m_vtxNtrksAccepted = m_vtxNtrks; m_vtxTrkPtSqSumAccepted = m_vtxTrkPtSqSum; @@ -113,7 +113,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp return HLT::OK; } else { pass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Not enough vertices." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Not enough vertices." << endmsg; return HLT::OK; } @@ -135,7 +135,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp if(firstVtx) { pass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. No primary vertex." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. No primary vertex." << endmsg; return HLT::OK; } @@ -144,7 +144,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp if(ivtx == priVtx) continue; // Skip the primary vertex if(m_vtxNtrks[ivtx] > m_max_ntrks) { // Check the pile up requirement pass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Failed pile up requirement." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Failed pile up requirement." << endmsg; return HLT::OK; } } @@ -152,12 +152,12 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp // Check if the primary vertex contains enough tracks. if(m_vtxNtrks[priVtx] < m_required_ntrks) { pass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Primary vertex only has " << m_vtxNtrks[priVtx] << " tracks." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. Primary vertex only has " << m_vtxNtrks[priVtx] << " tracks." << endmsg; return HLT::OK; } if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG - << "Event accepted. Primary vertex has " << m_vtxNtrks[priVtx] << " tracks." << endreq; + << "Event accepted. Primary vertex has " << m_vtxNtrks[priVtx] << " tracks." << endmsg; // Fill the monitoring variables m_vtxNtrksAccepted.push_back(m_vtxNtrks[priVtx]); @@ -174,7 +174,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event accepted, has a vertex with " - << m_vtxNtrks[ivtx] << " tracks." << endreq; + << m_vtxNtrks[ivtx] << " tracks." << endmsg; // Fill the monitoring variables m_vtxNtrksAccepted = m_vtxNtrks; @@ -185,7 +185,7 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp } } - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. No vertex contains enough tracks." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event rejected. No vertex contains enough tracks." << endmsg; pass = false; } @@ -198,6 +198,6 @@ HLT::ErrorCode TrigVertexCounterHypo::hltExecute(const HLT::TriggerElement* outp HLT::ErrorCode TrigVertexCounterHypo::hltFinalize() { if( msgLvl() <= MSG::INFO ) - m_log << MSG::INFO << " Finalizing this TrigVertexCounterHypo" << name() <<"." << endreq; + m_log << MSG::INFO << " Finalizing this TrigVertexCounterHypo" << name() <<"." << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx b/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx index 6687a1037fa..d93373f701d 100755 --- a/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx +++ b/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx @@ -74,7 +74,7 @@ HLT::ErrorCode TrigMissingETMuon::hltBeginRun() { // access StoreGate m_StoreGate = store(); if (m_StoreGate==0) { - msg() << MSG::ERROR << "Can not access StoreGate" << endreq; + msg() << MSG::ERROR << "Can not access StoreGate" << endmsg; return HLT::SG_ERROR; } @@ -82,13 +82,13 @@ HLT::ErrorCode TrigMissingETMuon::hltBeginRun() { const EventInfo* pEvent(0); StatusCode sc = m_StoreGate->retrieve(pEvent); if ( sc.isFailure() ) { - msg() << MSG::ERROR << "Can not find EventInfo object" << endreq; + msg() << MSG::ERROR << "Can not find EventInfo object" << endmsg; return HLT::SG_ERROR; } const EventID* pEventId = pEvent->event_ID(); if(pEventId==0) { - msg() << MSG::ERROR << "Can not find EventID object" << endreq; + msg() << MSG::ERROR << "Can not find EventID object" << endmsg; return HLT::SG_ERROR; } m_current_run_id = pEventId->run_number(); @@ -101,7 +101,7 @@ HLT::ErrorCode TrigMissingETMuon::hltBeginRun() { snprintf(buff,512, "REGTEST: Run number = %11u, luminosity block = %11u, event number = %11u, bunch crossing = %11u", m_current_run_id, m_current_lbk_id, m_current_evt_id, m_current_bcg_id); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } // Retrieve run number and detector mask @@ -110,7 +110,7 @@ HLT::ErrorCode TrigMissingETMuon::hltBeginRun() { if(msgLvl() <= MSG::DEBUG){ char buff[512]; snprintf(buff,512,"REGTEST: DetMask_1 = 0x%08x, DetMask_0 = 0x%08x",mask1,mask0); - msg() << MSG::DEBUG << buff << endreq; + msg() << MSG::DEBUG << buff << endmsg; } if (mask0==0 && mask1==0) return HLT::OK; // 0 means present @@ -125,7 +125,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge // first check whether we executed this instance before: if (m_useCachedResult) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Executing this xAOD::TrigMissingETMuon " << name() << " in cached mode" << endreq; + msg() << MSG::DEBUG << "Executing this xAOD::TrigMissingETMuon " << name() << " in cached mode" << endmsg; } // Only count MET as an input TE (for seeding relation of navigation structure) HLT::TEVec allTEs; @@ -160,14 +160,14 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge unsigned int tes_in1_size=0; // size of muon container if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Executing xAOD::TrigMissingETMuon::hltExecute()" << endreq; + msg() << MSG::DEBUG << "Executing xAOD::TrigMissingETMuon::hltExecute()" << endmsg; } if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: tes_in.size() = " << tes_in_size << endreq; + msg() << MSG::DEBUG << "REGTEST: tes_in.size() = " << tes_in_size << endmsg; for (unsigned u=0; u<tes_in_size; ++u) { - msg() << MSG::DEBUG << "REGTEST: tes_in[" << u << "].size() = " << tes_in[u].size() << endreq; + msg() << MSG::DEBUG << "REGTEST: tes_in[" << u << "].size() = " << tes_in[u].size() << endmsg; } } //algorithm is muon seeded, therefore: @@ -180,14 +180,14 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge case 1: // unseeded mode with TrigMissingET. if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Running in unseeded mode" << endreq; + msg() << MSG::DEBUG << "Running in unseeded mode" << endmsg; msg() << MSG::DEBUG - << "No muon feature found: skipping muon correction" << endreq; + << "No muon feature found: skipping muon correction" << endmsg; } tes_in0_size=tes_in[0].size(); if (tes_in0_size != 1) { msg() << MSG::WARNING // ERROR - << "Configuration error: expecting exactly 1 TrigMissingET object. Aborting chain" << endreq; + << "Configuration error: expecting exactly 1 TrigMissingET object. Aborting chain" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } else{ @@ -197,12 +197,12 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if(status != HLT::OK) { msg() << MSG::ERROR << "no TrigMissingET object found for this TE ... ?!?" - << endreq; + << endmsg; return HLT::NAV_ERROR; } } if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: Florian: No muon input. Will save the input TE without updating it " << endreq; + msg() << MSG::DEBUG << "REGTEST: Florian: No muon input. Will save the input TE without updating it " << endmsg; } // Check if EDM is there @@ -222,13 +222,13 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if (tes_in0_size != 1) { msg() << MSG::WARNING // ERROR - << "Configuration error: expecting exactly 1 L2 or EF result. Aborting chain" << endreq; + << "Configuration error: expecting exactly 1 L2 or EF result. Aborting chain" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } if (tes_in1_size == 0) { if (msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG - << "No muon feature found: skipping muon correction" << endreq; + << "No muon feature found: skipping muon correction" << endmsg; } // Save ouput TE before leaving. @@ -238,7 +238,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if(status != HLT::OK) { msg() << MSG::ERROR << "no TrigMissingET object found for this TE ... ?!?" - << endreq; + << endmsg; return HLT::NAV_ERROR; } } @@ -257,7 +257,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge default: msg() << MSG::WARNING // ERROR << "Configuration error: tes_in.size() is " << tes_in_size - << " but can only be 1 in seeded mode or 0 in unseeded mode. Aborting chain" << endreq; + << " but can only be 1 in seeded mode or 0 in unseeded mode. Aborting chain" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } @@ -268,7 +268,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if(status != HLT::OK) { msg() << MSG::ERROR << "no TrigMissingET object found for this TE ... ?!?" - << endreq; + << endmsg; return HLT::NAV_ERROR; } } @@ -281,10 +281,10 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge const xAOD::TrigMissingET *met_temp=vectorOfMET[0]; m_met = const_cast<xAOD::TrigMissingET *>(met_temp); // ++++++++++++++++++++++++++++++++++++++++++ - msg() << MSG::DEBUG << "xAOD::TrigMissingET object retrieved." <<endreq; + msg() << MSG::DEBUG << "xAOD::TrigMissingET object retrieved." <<endmsg; flag=m_met->flag(); - msg() << MSG::DEBUG << "Flag got." <<endreq; + msg() << MSG::DEBUG << "Flag got." <<endmsg; // Now we loop over all the muons float muon_ex=0; @@ -296,13 +296,13 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge unsigned int Nmuons=0; bool MuonError=false; - msg() << MSG::DEBUG << "REGTEST: Ready to access xAOD::MuonContainer muons " << endreq; + msg() << MSG::DEBUG << "REGTEST: Ready to access xAOD::MuonContainer muons " << endmsg; std::vector<const xAOD::TrackParticle*> vecOfMuonTrk; if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG - << "REGTEST: Using muon pt threshold "<<m_muonptcut<<" GeV."<< endreq; + << "REGTEST: Using muon pt threshold "<<m_muonptcut<<" GeV."<< endmsg; } for (HLT::TEVec::const_iterator muon_it = tes_in[muonIndex].begin(); @@ -317,7 +317,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << "no MuonContainer found for this TE ... ?!?" - << endreq; + << endmsg; } continue; } @@ -327,7 +327,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge // Check that there is at least one muon in TrigMuonEFInfoContainer if (NofMuons == 0){ if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Size of vectorOfMuons is 0. Skipping muon correction" << endreq; + msg() << MSG::DEBUG << "Size of vectorOfMuons is 0. Skipping muon correction" << endmsg; } MuonError=true; continue; @@ -337,7 +337,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge for(auto muon : *muonContainer) { if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << "Looking at muon " << kk << "pt = " << muon->pt() << "eta= " << - muon->eta() << "phi= " << muon->phi() << endreq; + muon->eta() << "phi= " << muon->phi() << endmsg; } const xAOD::Muon::MuonType muontype = muon->muonType(); if(muontype == xAOD::Muon::MuonType::Combined || muontype == xAOD::Muon::MuonType::SegmentTagged ) { @@ -388,7 +388,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << "REGTEST: Adding muon with pT = " << Et - << " MeV, phi = " << phi << " rad, eta = " << eta << endreq; + << " MeV, phi = " << phi << " rad, eta = " << eta << endmsg; } } // end muon-type if statement @@ -400,14 +400,14 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge m_mu_set = muon_sum_et; if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Muon correction calculated." << endreq; + msg() << MSG::DEBUG << "Muon correction calculated." << endmsg; } - if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Setting energies and flag" << endreq; + if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Setting energies and flag" << endmsg; unsigned int muonComp = m_met->getNumberOfComponents() - 1; // Suggested by Diego: Checking the component name of the input if( (m_met->nameOfComponent(muonComp)).substr(0,4)!="Muon") { - msg() << MSG::ERROR << "Could not find MET container with muon information!!! Exit..." <<endreq; + msg() << MSG::ERROR << "Could not find MET container with muon information!!! Exit..." <<endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::BAD_JOB_SETUP); } // Fetch Muon Components @@ -423,19 +423,19 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge flag |= m_maskErrMuon; flag |= m_maskCompErrors; } m_met->setFlag(flag); - if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Setting energies and flag done." << endreq; + if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Setting energies and flag done." << endmsg; if (msgLvl() <= MSG::DEBUG) { char buff[128]; std::snprintf(buff,128,"REGTEST: (Muon FEX) Event status = 0x%08x", (unsigned)flag); - msg() << MSG::DEBUG << buff << endreq; - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) Nmuons = " << Nmuons << endreq; + msg() << MSG::DEBUG << buff << endmsg; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) Nmuons = " << Nmuons << endmsg; if (Nmuons>0) { - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ex = " << muon_ex*1e-3 << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ey = " << muon_ey*1e-3 << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ez = " << muon_ez*1e-3 << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_sum_et = " << muon_sum_et*1e-3 << " GeV" << endreq; - msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_sum_e = " << muon_sum_e*1e-3 << " GeV" << endreq; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ex = " << muon_ex*1e-3 << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ey = " << muon_ey*1e-3 << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_ez = " << muon_ez*1e-3 << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_sum_et = " << muon_sum_et*1e-3 << " GeV" << endmsg; + msg() << MSG::DEBUG << "REGTEST: (Muon FEX) muon_sum_e = " << muon_sum_e*1e-3 << " GeV" << endmsg; } } @@ -480,7 +480,7 @@ HLT::ErrorCode TrigMissingETMuon::makeOutputTE(std::vector<std::vector<HLT::Trig if (status != HLT::OK){ msg() << MSG::ERROR << "Write of xAOD::TrigMissingET feature into outputTE failed" - << endreq; + << endmsg; return status; } @@ -489,13 +489,13 @@ HLT::ErrorCode TrigMissingETMuon::makeOutputTE(std::vector<std::vector<HLT::Trig msg() << MSG::DEBUG << "We assume success, set TE with label " << " active to signal positive result." - << endreq; + << endmsg; } // CACHING // if we got here, everything was okay. so, we cache the feature for further execution of this instance in e.g. other MET Sequences: if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Updated feature copied to output TE." << endreq; + msg() << MSG::DEBUG << "Updated feature copied to output TE." << endmsg; } m_useCachedResult = true; m_cachedTE = outputTE; diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx index ee5d4b520a3..f354bb8a6b1 100644 --- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx +++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx @@ -50,31 +50,31 @@ TrigSecVtxFinder::~TrigSecVtxFinder() { HLT::ErrorCode TrigSecVtxFinder::hltInitialize() { - msg() << MSG::INFO << "TrigSecVtxFinder::initialize()" << endreq; + msg() << MSG::INFO << "TrigSecVtxFinder::initialize()" << endmsg; //* Retrieve TrigTrackJetFinder tool *// StatusCode sc = m_trackJetFinderTool.retrieve(); if(sc.isFailure()) { - msg() << MSG::FATAL << "Failed to locate tool " << m_trackJetFinderTool << endreq; + msg() << MSG::FATAL << "Failed to locate tool " << m_trackJetFinderTool << endmsg; return HLT::BAD_JOB_SETUP; } else - msg() << MSG::INFO << "Retrieved tool " << m_trackJetFinderTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_trackJetFinderTool << endmsg; sc = m_secvtxFinderTool.retrieve(); if ( sc.isFailure() ){ - msg() << MSG::FATAL << "Unable to retrieve TrigInDetVxInJetTool " << m_secvtxFinderTool << endreq; + msg() << MSG::FATAL << "Unable to retrieve TrigInDetVxInJetTool " << m_secvtxFinderTool << endmsg; return HLT::BAD_JOB_SETUP; } else - msg() << MSG::INFO << "Retrieved tool " << m_secvtxFinderTool << endreq; + msg() << MSG::INFO << "Retrieved tool " << m_secvtxFinderTool << endmsg; //* declareProperty overview *// if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "declareProperty review:" << endreq; - msg() << MSG::DEBUG << " AlgoId = " << m_algo << endreq; - msg() << MSG::DEBUG << " UseBeamSpotFlag = " << m_useBeamSpotFlag << endreq; - msg() << MSG::DEBUG << " TrackJetTrkSelExt = " << m_trackJetTrkSelExt << endreq; - msg() << MSG::DEBUG << " UseJetDirection = " << m_useJetDirection << endreq; + msg() << MSG::DEBUG << "declareProperty review:" << endmsg; + msg() << MSG::DEBUG << " AlgoId = " << m_algo << endmsg; + msg() << MSG::DEBUG << " UseBeamSpotFlag = " << m_useBeamSpotFlag << endmsg; + msg() << MSG::DEBUG << " TrackJetTrkSelExt = " << m_trackJetTrkSelExt << endmsg; + msg() << MSG::DEBUG << " UseJetDirection = " << m_useJetDirection << endmsg; } return HLT::OK; @@ -89,11 +89,11 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << "Using inputTE: " << "RoI id " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() - << ", Eta = " << roiDescriptor->eta() << endreq; + << ", Eta = " << roiDescriptor->eta() << endmsg; } } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endreq; + msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endmsg; return HLT::NAV_ERROR; } @@ -104,8 +104,8 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if ((sc = getPrmVtxForFit(prmVtx,outputTE)) != HLT::OK) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; - msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (primary vertex not available)" << endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; + msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (primary vertex not available)" << endmsg; } return sc; @@ -114,8 +114,8 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if(prmVtx.fitQuality().chiSquared() == -9) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; - msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (default primary vertex: -200 +/- -200)" << endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; + msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (default primary vertex: -200 +/- -200)" << endmsg; } return HLT::OK; @@ -124,8 +124,8 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if(prmVtx.fitQuality().chiSquared() == -99) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; - msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (beam spot status not meeting requirement)" << endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; + msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (beam spot status not meeting requirement)" << endmsg; } return HLT::OK; @@ -136,8 +136,8 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if (tracks.size() < 2) { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; - msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (less than 2 tracks)" << endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; + msg() << MSG::DEBUG << "REGTEST: No Secondary vertex reconstructed (less than 2 tracks)" << endmsg; } return HLT::OK; @@ -152,12 +152,12 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, // ====== store the result ========== if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; if (!secVertex) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No sec vtx reconstructed (not found by tool)" << endreq; + msg() << MSG::DEBUG << "REGTEST: No sec vtx reconstructed (not found by tool)" << endmsg; return HLT::OK; @@ -165,7 +165,7 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Sec vtx reconstructed: mass: " << secVertex->mass() - << " dl/sigma(dl): " << secVertex->decayLengthSignificance() << endreq; + << " dl/sigma(dl): " << secVertex->decayLengthSignificance() << endmsg; TrackInVertexList* trackInVtx = secVertex->tracks(); @@ -185,7 +185,7 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, if ((sc = attachFeature(outputTE, secVrtContainer, "secVrt")) != HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Cannot attach feature to TE!" << endreq; + msg() << MSG::DEBUG << "Cannot attach feature to TE!" << endmsg; return sc; } @@ -195,7 +195,7 @@ HLT::ErrorCode TrigSecVtxFinder::hltExecute(const HLT::TriggerElement* inputTE, HLT::ErrorCode TrigSecVtxFinder::hltFinalize() { - msg() << MSG::INFO << "TrigSecVtxFinder::finalize()" << endreq; + msg() << MSG::INFO << "TrigSecVtxFinder::finalize()" << endmsg; return HLT::OK; } @@ -208,7 +208,7 @@ HLT::ErrorCode TrigSecVtxFinder::getPrmVtxForFit(Trk::RecVertex& vertex, std::vector<const TrigVertexCollection*> vectorOfL2PrmVtxCollections; const TrigVertexCollection* prmVtxColl = NULL; if (getFeatures(outputTE, vectorOfL2PrmVtxCollections, "") != HLT::OK) { - msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endreq; + msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endmsg; return HLT::NAV_ERROR; } @@ -221,13 +221,13 @@ HLT::ErrorCode TrigSecVtxFinder::getPrmVtxForFit(Trk::RecVertex& vertex, ((m_algo == 8) && vectorOfL2PrmVtxCollections[i]->front()->algorithmId() == 19) || ((m_algo == 13) && vectorOfL2PrmVtxCollections[i]->front()->algorithmId() == 23) ) { prmVtxColl = vectorOfL2PrmVtxCollections[i]; - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Retrieved prm vertex collection with algo_id " << prmVtxColl->front()->algorithmId() << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Retrieved prm vertex collection with algo_id " << prmVtxColl->front()->algorithmId() << endmsg; break; } } if (!prmVtxColl || prmVtxColl->size() == 0) { - msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endreq; + msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endmsg; return HLT::MISSING_FEATURE; } @@ -244,7 +244,7 @@ HLT::ErrorCode TrigSecVtxFinder::getPrmVtxForFit(Trk::RecVertex& vertex, StatusCode sc = service("BeamCondSvc", m_iBeamCondSvc); if (sc.isFailure() || m_iBeamCondSvc == 0) { - if (msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endreq; + if (msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endmsg; return HLT::ERROR; } @@ -263,10 +263,10 @@ HLT::ErrorCode TrigSecVtxFinder::getPrmVtxForFit(Trk::RecVertex& vertex, msg() << MSG::DEBUG << "Beam spot from service: x=" << m_beamSpot.x() << ", y=" << m_beamSpot.y() << ", z=" << m_beamSpot.z() << ", tiltXZ=" << m_iBeamCondSvc->beamTilt(0) << ", tiltYZ=" << m_iBeamCondSvc->beamTilt(1) << ", sigmaX=" << m_iBeamCondSvc->beamSigma(0) << ", sigmaY=" << m_iBeamCondSvc->beamSigma(1) << ", sigmaZ=" << m_iBeamCondSvc->beamSigma(2) - << ", status=" << m_beamSpotStatus << endreq; + << ", status=" << m_beamSpotStatus << endmsg; if (m_useBeamSpotFlag && !m_beamSpotStatus) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Beam spot status not meeting requirement." << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Beam spot status not meeting requirement." << endmsg; vertex = Trk::RecVertex(Amg::Vector3D(0.,0.,0.),0,-99); return HLT::OK; } @@ -301,9 +301,9 @@ HLT::ErrorCode TrigSecVtxFinder::getSelectedTracks(std::vector<const TrigInDetTr std::vector<const TrigInDetTrackCollection*> vectorOfL2TrackCollections; if (HLT::ErrorCode status = getFeatures(outputTE, vectorOfL2TrackCollections, "") != HLT::OK) { - msg() << MSG::ERROR << "Failed to get InDetTrackCollection from the trigger element" << endreq; + msg() << MSG::ERROR << "Failed to get InDetTrackCollection from the trigger element" << endmsg; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got " << vectorOfL2TrackCollections.size() << " InDetTrackCollection" << endreq; + msg() << MSG::DEBUG << "Got " << vectorOfL2TrackCollections.size() << " InDetTrackCollection" << endmsg; std::vector<const TrigInDetTrackCollection*>::iterator trackCollection = vectorOfL2TrackCollections.begin(); std::vector<const TrigInDetTrackCollection*>::iterator lastTrackColl = vectorOfL2TrackCollections.end(); @@ -312,15 +312,15 @@ HLT::ErrorCode TrigSecVtxFinder::getSelectedTracks(std::vector<const TrigInDetTr if ((*trackCollection)->size() != 0) { if ((*trackCollection)->front()->algorithmId() == m_algo) { if (msgLvl() <= MSG::DEBUG && m_algo == 1) - msg() << MSG::DEBUG << "Selected collection with SiTrack label" << endreq; + msg() << MSG::DEBUG << "Selected collection with SiTrack label" << endmsg; else if (msgLvl() <= MSG::DEBUG && m_algo == 2) - msg() << MSG::DEBUG << "Selected collection with IdScan label" << endreq; + msg() << MSG::DEBUG << "Selected collection with IdScan label" << endmsg; else if (msgLvl() <= MSG::DEBUG && m_algo == 5) - msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy A)" << endreq; + msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy A)" << endmsg; else if (msgLvl() <= MSG::DEBUG && m_algo == 6) - msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy B)" << endreq; + msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy B)" << endmsg; else if (msgLvl() <= MSG::DEBUG && m_algo == 8) - msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy F)" << endreq; + msg() << MSG::DEBUG << "Selected collection with L2Star label (strategy F)" << endmsg; break; } } @@ -328,7 +328,7 @@ HLT::ErrorCode TrigSecVtxFinder::getSelectedTracks(std::vector<const TrigInDetTr if (trackCollection == lastTrackColl) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "No track collection found or colletion empty" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "No track collection found or colletion empty" << endmsg; return HLT::OK; } @@ -336,7 +336,7 @@ HLT::ErrorCode TrigSecVtxFinder::getSelectedTracks(std::vector<const TrigInDetTr tracks.push_back((*trackCollection)->at(i)); // TODO do track selection before calling trackJetFinder? - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Selected " << tracks.size() << " tracks." << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Selected " << tracks.size() << " tracks." << endmsg; return HLT::OK; } @@ -355,7 +355,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir if ((getFeature(inputTE, roiDescriptor) == HLT::OK) && roiDescriptor) { if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << "Using inputTE: " << "RoI id " << roiDescriptor->roiId() - << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; + << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; } etaJet=roiDescriptor->eta(); @@ -363,7 +363,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endreq; + msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endmsg; return HLT::NAV_ERROR; } @@ -374,7 +374,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir if (initialRoI) { if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << "Using initialRoI: " << "RoI id " << initialRoI->roiId() - << ", Phi = " << initialRoI->phi() << ", Eta = " << initialRoI->eta() << endreq; + << ", Phi = " << initialRoI->phi() << ", Eta = " << initialRoI->eta() << endmsg; } } else { initialRoI=roiDescriptor; // L1.5 Jets... @@ -385,7 +385,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endreq; + msg() << MSG::DEBUG << "No RoI for this Trigger Element" << endmsg; return HLT::NAV_ERROR; } @@ -393,7 +393,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir m_trackJetFinderTool->clear(); m_trackJetFinderTool->inputPrimaryVertexZ(prmVtx_z); - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "getJetDirection() using Ext track sel = " << m_trackJetTrkSelExt << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "getJetDirection() using Ext track sel = " << m_trackJetTrkSelExt << endmsg; if(m_trackJetTrkSelExt) m_trackJetFinderTool->setExtTrackSel(true); for (unsigned int i = 0; i < (unsigned int) tracks.size(); i++) { @@ -413,12 +413,12 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "eta RoI " << etaRoI << " phiRoI " << phiRoI << "; eta TrkJet " << etaTrkJet << " phi TrkJet " << phiTrkJet - << "; eta Jet " << etaJet << " phi Jet " << phiJet << endreq; + << "; eta Jet " << etaJet << " phi Jet " << phiJet << endmsg; if (m_useJetDirection == 1) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Using the LVL2 jet direction as input" << endreq; + msg() << MSG::DEBUG << "Using the LVL2 jet direction as input" << endmsg; jetDirection.setX(cos(phiJet)); jetDirection.setY(sin(phiJet)); @@ -427,7 +427,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir } else if (m_useJetDirection == 2) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Using the LVL2 track-jet direction as input" << endreq; + msg() << MSG::DEBUG << "Using the LVL2 track-jet direction as input" << endmsg; jetDirection.setX(cos(phiTrkJet)); jetDirection.setY(sin(phiTrkJet)); @@ -436,7 +436,7 @@ HLT::ErrorCode TrigSecVtxFinder::getJetDirection(CLHEP::HepLorentzVector& jetDir } else if (m_useJetDirection == 3) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Using the LVL1 RoI jet direction as input" << endreq; + msg() << MSG::DEBUG << "Using the LVL1 RoI jet direction as input" << endmsg; jetDirection.setX(cos(phiRoI)); jetDirection.setY(sin(phiRoI)); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloBase.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloBase.cxx index 6032e8063e5..6bfa6b38266 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloBase.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloBase.cxx @@ -71,22 +71,22 @@ StatusCode T2CaloBase::initialize(){ MsgStream log(msgSvc(), name()); // if ( msgLvl() <= MSG::INFO ) - log << MSG::INFO << "on initialize()" << endreq; + log << MSG::INFO << "on initialize()" << endmsg; StatusCode stat = HLT::FexAlgo::initialize(); if (stat.isFailure()) { - log << MSG::ERROR << "base class finalize failed!" << endreq; + log << MSG::ERROR << "base class finalize failed!" << endmsg; return stat; } if( m_emAlgTools.retrieve().isFailure() ) { log << MSG::FATAL << "Unable to create " << - "some AlgTool" << endreq; + "some AlgTool" << endmsg; return StatusCode::FAILURE; } ; if ((m_data.retrieve()).isFailure()) { - log << MSG::ERROR << "Could not get m_data" << endreq; + log << MSG::ERROR << "Could not get m_data" << endmsg; return StatusCode::FAILURE; } @@ -94,7 +94,7 @@ StatusCode T2CaloBase::initialize(){ // Initialize timing service if( (m_timersvc.retrieve()).isFailure() ) { - log << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endreq; + log << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endmsg; } if ( !m_timersvc.empty()) { @@ -107,7 +107,7 @@ StatusCode T2CaloBase::initialize(){ #ifndef NDEBUG log << MSG::INFO << "Initialization completed successfully" - << endreq; + << endmsg; #endif return StatusCode::SUCCESS; @@ -119,12 +119,12 @@ StatusCode T2CaloBase::finalize(){ MsgStream log(msgSvc(), name()); #ifndef NDEBUG - log << MSG::INFO << "in finalize()" << endreq; + log << MSG::INFO << "in finalize()" << endmsg; #endif StatusCode stat = HLT::FexAlgo::finalize(); if (stat.isFailure()) { - log << MSG::ERROR << "base class finalize failed!" << endreq; + log << MSG::ERROR << "base class finalize failed!" << endmsg; return stat; } diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx index 3044b32b167..f458a272f4d 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloInitSvc.cxx @@ -32,7 +32,7 @@ StatusCode T2CaloInitSvc::queryInterface(const InterfaceID& riid, void** ppvIF) *ppvIF = (T2CaloInitSvc*)this; } else { MsgStream log(messageService(), name()); - log << MSG::DEBUG << name() << " cannot found the interface!" <<endreq; + log << MSG::DEBUG << name() << " cannot found the interface!" <<endmsg; return AthService::queryInterface(riid, ppvIF); } return StatusCode::SUCCESS; @@ -43,7 +43,7 @@ StatusCode T2CaloInitSvc::initialize() StatusCode sc; MsgStream log(messageService(), name()); - log << MSG::DEBUG << name() << ": Start of run initialisation" << endreq; + log << MSG::DEBUG << name() << ": Start of run initialisation" << endmsg; sc = AthService::initialize(); if ( sc.isFailure() ) return sc; @@ -57,16 +57,16 @@ StatusCode T2CaloInitSvc::initialize() if ( sc.isSuccess( ) ) { sc = detStore->retrieve( theMgr ); if(sc.isSuccess( )) { - log << MSG::DEBUG << name() << ": successfully retrived CaloDetDescrManager" << endreq; + log << MSG::DEBUG << name() << ": successfully retrived CaloDetDescrManager" << endmsg; } else { - log << MSG::ERROR << name() << ": failed to retrive CaloDetDescrManager" << endreq; + log << MSG::ERROR << name() << ": failed to retrive CaloDetDescrManager" << endmsg; return sc; } } else { - log << MSG::ERROR << name() << ": Could not locate DetectorStore" << endreq; + log << MSG::ERROR << name() << ": Could not locate DetectorStore" << endmsg; return sc; } diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloNewBase.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloNewBase.cxx index db19940cac1..fc0718be2cc 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloNewBase.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/T2CaloNewBase.cxx @@ -53,16 +53,16 @@ StatusCode T2CaloNewBase::initialize(){ MsgStream log(msgSvc(), name()); // if ( msgLvl() <= MSG::INFO ) - log << MSG::INFO << "on initialize()" << endreq; + log << MSG::INFO << "on initialize()" << endmsg; StatusCode stat = HLT::FexAlgo::initialize(); if (stat.isFailure()) { - log << MSG::ERROR << "base class finalize failed!" << endreq; + log << MSG::ERROR << "base class finalize failed!" << endmsg; return stat; } m_emAlgTools.reserve(MaxNumberTools); - log << MSG::DEBUG << "Initialization set of tools" << endreq; + log << MSG::DEBUG << "Initialization set of tools" << endmsg; std::vector<std::string>::iterator it = m_emToolName.begin(); @@ -71,7 +71,7 @@ StatusCode T2CaloNewBase::initialize(){ for (int iC = 0; it != m_emToolName.end(); ++iC, ++it) { if (iC >= MaxNumberTools) { - log << MSG::FATAL << "More T2Calo Tools than expected" << endreq; + log << MSG::FATAL << "More T2Calo Tools than expected" << endmsg; return StatusCode::FAILURE; } @@ -81,13 +81,13 @@ StatusCode T2CaloNewBase::initialize(){ if(toolSvc->retrieveTool(toolName, bTool, this).isFailure() ) { log << MSG::FATAL << "Unable to create " << *it - << "AlgTool" << endreq; + << "AlgTool" << endmsg; return StatusCode::FAILURE; } else { pTool = dynamic_cast<IAlgToolCalo*> (bTool); #ifndef NDEBUG - log << MSG::DEBUG << "Created " << *it << " AlgTool" << endreq; + log << MSG::DEBUG << "Created " << *it << " AlgTool" << endmsg; #endif } @@ -99,7 +99,7 @@ StatusCode T2CaloNewBase::initialize(){ // Initialize timing service if( service( "TrigTimerSvc", m_timersvc).isFailure() ) { - log << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endreq; + log << MSG::WARNING << name() << ": Unable to locate TrigTimer Service" << endmsg; } if (m_timersvc) { @@ -112,7 +112,7 @@ StatusCode T2CaloNewBase::initialize(){ #ifndef NDEBUG log << MSG::INFO << "Initialization completed successfully" - << endreq; + << endmsg; #endif return StatusCode::SUCCESS; @@ -124,12 +124,12 @@ StatusCode T2CaloNewBase::finalize(){ MsgStream log(msgSvc(), name()); #ifndef NDEBUG - log << MSG::INFO << "in finalize()" << endreq; + log << MSG::INFO << "in finalize()" << endmsg; #endif StatusCode stat = HLT::FexAlgo::finalize(); if (stat.isFailure()) { - log << MSG::ERROR << "base class finalize failed!" << endreq; + log << MSG::ERROR << "base class finalize failed!" << endmsg; return stat; } diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx index c5024f5bb2d..f388a10bde1 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx @@ -149,7 +149,7 @@ StatusCode TrigDataAccess::initialize() } // //if ( m_lumiTool.retrieve().isFailure() ) { - // (*m_log) << MSG::FATAL << "Could not find m_lumiTool" <<endreq; + // (*m_log) << MSG::FATAL << "Could not find m_lumiTool" <<endmsg; // return StatusCode::FAILURE; //} else { // std::cout << "Retrieve lumiTool successfully" << std::endl; @@ -664,7 +664,7 @@ StatusCode TrigDataAccess::LoadCollections ( << std::hex << m_tile[0] << std::dec ); msg(MSG::WARNING) << "Error reading bytestream " << "event: Empty ROD block (less than 3 words) : 0x" - << std::hex << m_tile[0] << std::dec << endreq; + << std::hex << m_tile[0] << std::dec << endmsg; // Data seems corrupted m_error|=0x20000000; if ( !m_tilecell->cached(m_rIds[i])){ diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/TrigT2CaloCosmic/CosmicSamp2Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/TrigT2CaloCosmic/CosmicSamp2Fex.h index ad842fee50f..8dcff7927f4 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/TrigT2CaloCosmic/CosmicSamp2Fex.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/TrigT2CaloCosmic/CosmicSamp2Fex.h @@ -51,7 +51,7 @@ class CosmicSamp2Fex: public IAlgToolCalo { if ( IAlgToolCalo::initialize().isFailure() ) { *(new MsgStream(AlgTool::msgSvc(), name())) << MSG::FATAL - << "Could not init base class IAlgTooCalo" << endreq; + << "Could not init base class IAlgTooCalo" << endmsg; } std::string basename(name().substr(25,5)+"."); if (m_timersvc) { diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/T2CaloCosmic.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/T2CaloCosmic.cxx index 284af0189fd..cb8a855bff3 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/T2CaloCosmic.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/T2CaloCosmic.cxx @@ -87,9 +87,9 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, // Some debug output: if (msgLvl(MSG::DEBUG)) { - msg (MSG::DEBUG) << "outputTE->getId(): " << outputTE->getId() << endreq; + msg (MSG::DEBUG) << "outputTE->getId(): " << outputTE->getId() << endmsg; - msg(MSG::DEBUG) << "inputTE->getId(): " << inputTE->getId() << endreq; + msg(MSG::DEBUG) << "inputTE->getId(): " << inputTE->getId() << endmsg; } const TrigRoiDescriptor* roiDescriptor = 0; @@ -97,9 +97,9 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, HLT::ErrorCode hltStatus = getFeature(inputTE, roiDescriptor); if ( hltStatus == HLT::OK ) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << *roiDescriptor << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << *roiDescriptor << endmsg; } else { - msg(MSG::WARNING) << " Failed to find RoiDescriptor " << endreq; + msg(MSG::WARNING) << " Failed to find RoiDescriptor " << endmsg; return hltStatus; } @@ -109,7 +109,7 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, << roiDescriptor->phi() << " & LVL1 eta=" << roiDescriptor->eta() - << endreq; + << endmsg; // End LVL1 part double etamin, etamax, phimin, phimax; @@ -141,15 +141,15 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << " etamin = "<< *roiDescriptor << endreq; - // (*m_log) << MSG::DEBUG << " etamin = "<< etamin << endreq; - // (*m_log) << MSG::DEBUG << " etamax = "<< etamax << endreq; - // (*m_log) << MSG::DEBUG << " phimin = "<< phimin << endreq; - // (*m_log) << MSG::DEBUG << " phimax = "<< phimax << endreq; + msg(MSG::DEBUG) << " etamin = "<< *roiDescriptor << endmsg; + // (*m_log) << MSG::DEBUG << " etamin = "<< etamin << endmsg; + // (*m_log) << MSG::DEBUG << " etamax = "<< etamax << endmsg; + // (*m_log) << MSG::DEBUG << " phimin = "<< phimin << endmsg; + // (*m_log) << MSG::DEBUG << " phimax = "<< phimax << endmsg; } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Making TrigEMCluster "<< endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Making TrigEMCluster "<< endmsg; std::vector<xAOD::TrigEMCluster*> m_vec_clus; std::cout << "m_emAlgTools.size() = " << m_emAlgTools.size() << std::endl; @@ -198,25 +198,25 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, xAOD::TrigEMCluster* ptrigEmCluster=m_vec_clus[i]; // Print out Cluster produced - msg(MSG::DEBUG) << " Values of Cluster produced: "<< endreq; - msg(MSG::DEBUG) << " REGTEST: emEnergy = "<< (*ptrigEmCluster).energy() << endreq; - msg(MSG::DEBUG) << " REGTEST: hadEnergy = "<< (*ptrigEmCluster).ehad1() << endreq; - msg(MSG::DEBUG) << " REGTEST: rCore = " << ((*ptrigEmCluster).e237() )/ ((*ptrigEmCluster).e277()) << endreq; + msg(MSG::DEBUG) << " Values of Cluster produced: "<< endmsg; + msg(MSG::DEBUG) << " REGTEST: emEnergy = "<< (*ptrigEmCluster).energy() << endmsg; + msg(MSG::DEBUG) << " REGTEST: hadEnergy = "<< (*ptrigEmCluster).ehad1() << endmsg; + msg(MSG::DEBUG) << " REGTEST: rCore = " << ((*ptrigEmCluster).e237() )/ ((*ptrigEmCluster).e277()) << endmsg; msg(MSG::DEBUG) << " REGTEST: energyRatio = " << (((*ptrigEmCluster).emaxs1()-(*ptrigEmCluster).e2tsts1())/ ((*ptrigEmCluster).emaxs1()+(*ptrigEmCluster).e2tsts1())) - << endreq; - msg(MSG::DEBUG) << " REGTEST: clusterWidth = " << (*ptrigEmCluster).weta2() << endreq; - msg(MSG::DEBUG) << " REGTEST: frac73 = " << (*ptrigEmCluster).fracs1() << endreq; - msg(MSG::DEBUG) << " REGTEST: eta = "<< (*ptrigEmCluster).eta() << endreq; - msg(MSG::DEBUG) << " REGTEST: phi = "<< (*ptrigEmCluster).phi() << endreq; - msg(MSG::DEBUG) << " REGTEST: roiWord = " << (*ptrigEmCluster).RoIword() << endreq; + << endmsg; + msg(MSG::DEBUG) << " REGTEST: clusterWidth = " << (*ptrigEmCluster).weta2() << endmsg; + msg(MSG::DEBUG) << " REGTEST: frac73 = " << (*ptrigEmCluster).fracs1() << endmsg; + msg(MSG::DEBUG) << " REGTEST: eta = "<< (*ptrigEmCluster).eta() << endmsg; + msg(MSG::DEBUG) << " REGTEST: phi = "<< (*ptrigEmCluster).phi() << endmsg; + msg(MSG::DEBUG) << " REGTEST: roiWord = " << (*ptrigEmCluster).RoIword() << endmsg; // Fill monitoring hists: /* if (m_mon) if ( m_monitoring->fillT2CaloCosmicHists(ptrigEmCluster).isFailure() ) - (*m_log) << MSG::DEBUG << " Failled to Monitor" << endreq; + (*m_log) << MSG::DEBUG << " Failled to Monitor" << endmsg; */ std::string key = ""; @@ -241,7 +241,7 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, if ( hltStatus != HLT::OK ) { (*m_log) << MSG::ERROR << "Write of update TrigRoiDescriptor into outputTE failed" - << endreq; + << endmsg; return hltStatus; } */ @@ -249,14 +249,14 @@ HLT::ErrorCode T2CaloCosmic::hltExecute(const HLT::TriggerElement* inputTE, //#ifndef NDEBUG // (*m_log) << MSG::DEBUG << "Recorded an RoiDescriptor " // << " phi " << newRoiDescriptor->phi0() -// << " eta " << newRoiDescriptor->eta0() << endreq; +// << " eta " << newRoiDescriptor->eta0() << endmsg; //#endif // Some debug output: if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "We assume success, set TE with Id " << outputTE->getId() << " active to signal positive result." - << endreq; + << endmsg; } // Time total T2CaloCosmic execution time. diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h index e3561a2cde1..4ce8d4f1083 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h @@ -72,7 +72,7 @@ class EgammaAllFex: public IAlgToolCalo { if ( IAlgToolCalo::initialize().isFailure() ) { *(new MsgStream(AlgTool::msgSvc(), name())) << MSG::FATAL - << "Could not init base class IAlgTooCalo" << endreq; + << "Could not init base class IAlgTooCalo" << endmsg; } std::string basename(name().substr(25,5)+"."); //std::string basename(name().substr(6,1)+name().substr(name().find("Fex",0)-5,5)); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h index b1551c529bf..206582b57cb 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h @@ -49,7 +49,7 @@ class EgammaHadEnFex: public IAlgToolCalo { if ( IAlgToolCalo::initialize().isFailure() ) { *(new MsgStream(AlgTool::msgSvc(), name())) << MSG::FATAL - << "Could not init base class IAlgTooCalo" << endreq; + << "Could not init base class IAlgTooCalo" << endmsg; } if (m_timersvc) { m_timer[0]->propName("T2CaEm_NCells"); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h index 37125506142..1566c8eeb80 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h @@ -53,7 +53,7 @@ class EgammaSamp2Fex: public IAlgToolCalo { if ( IAlgToolCalo::initialize().isFailure() ) { *(new MsgStream(AlgTool::msgSvc(), name())) << MSG::FATAL - << "Could not init base class IAlgTooCalo" << endreq; + << "Could not init base class IAlgTooCalo" << endmsg; } std::string basename(name().substr(25,5)+"."); //std::string basename(name().substr(6,1)+name().substr(name().find("Fex",0)-5,5)); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx index 428f0a3eaec..ef7979c4278 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx @@ -53,7 +53,7 @@ StatusCode EgammaHadEnFex::execute(xAOD::TrigEMCluster &rtrigEmCluster, #ifndef NDEBUG if ( msg().level() <= MSG::DEBUG ) - msg() << MSG::INFO << "in execute(TrigEMCluster &)" << endreq; + msg() << MSG::INFO << "in execute(TrigEMCluster &)" << endmsg; #endif double deta = 0.; // eta difference current cell - seed @@ -153,7 +153,7 @@ StatusCode EgammaHadEnFex::execute(xAOD::TrigEMCluster &rtrigEmCluster, if ( msg().level() <= MSG::DEBUG ) { for (int sampling=0; sampling<3;sampling++) if (m_geometryTool->EtaPhiRange(1,sampling,energyEta, energyPhi)) - msg() << MSG::ERROR << "problems with EtaPhiRange" << endreq; + msg() << MSG::ERROR << "problems with EtaPhiRange" << endmsg; PrintCluster(rtrigEmCluster.energy(CaloSampling::HEC0),1,0 ,CaloSampling::HEC0,CaloSampling::HEC0); PrintCluster(rtrigEmCluster.energy(CaloSampling::HEC1),1,1 diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx index 6c469c52c56..0ffa1086eaa 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx @@ -413,7 +413,7 @@ StatusCode EgammaSamp1Fex::execute(xAOD::TrigEMCluster &rtrigEmCluster, #ifndef NDEBUG if ( msg().level() <= MSG::DEBUG ) { if ( m_geometryTool->EtaPhiRange(0,1,energyEta, energyPhi)) - msg() << MSG::ERROR << "problems with EtaPhiRange" << endreq; + msg() << MSG::ERROR << "problems with EtaPhiRange" << endmsg; PrintCluster(totalEnergy,0,1,CaloSampling::EMB1,CaloSampling::EME1); } #endif diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx index 65d0550b0aa..3150701d19e 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx @@ -76,8 +76,8 @@ HLT::ErrorCode T2CaloEgamma::hltInitialize() declareMonitoredVariable("Eratio",m_eRatio); declareMonitoredVariable("ConversionErrors", m_conversionError); declareMonitoredVariable("AlgorithmErrors", m_algorithmError); - if ( m_calibsBarrel.retrieve().isFailure() ) (*m_log) << MSG::DEBUG << "No Calibration Available for the Barrel" << endreq; - if ( m_calibsEndcap.retrieve().isFailure() ) (*m_log) << MSG::DEBUG << "No Calibration Available for the Endcap" << endreq; + if ( m_calibsBarrel.retrieve().isFailure() ) (*m_log) << MSG::DEBUG << "No Calibration Available for the Barrel" << endmsg; + if ( m_calibsEndcap.retrieve().isFailure() ) (*m_log) << MSG::DEBUG << "No Calibration Available for the Endcap" << endmsg; // Sets the name of the key container ToolHandleArray<IAlgToolCalo>::iterator it = m_emAlgTools.begin(); @@ -85,7 +85,7 @@ HLT::ErrorCode T2CaloEgamma::hltInitialize() (*it)->setCellContainerPointer(&m_Container); if ( (m_egammaqweta2c.retrieve()).isFailure() ){ - (*m_log) << MSG::FATAL << "Could not find egammaqweta2c" << endreq; + (*m_log) << MSG::FATAL << "Could not find egammaqweta2c" << endmsg; return HLT::TOOL_FAILURE; } return HLT::OK; @@ -107,7 +107,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) - (*m_log) << MSG::INFO << "in execute()" << endreq; + (*m_log) << MSG::INFO << "in execute()" << endmsg; #endif // Some debug output: @@ -116,12 +116,12 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: (*m_log) << MSG::DEBUG << "outputTE->getId(): " << outputTE->getId() - << endreq; + << endmsg; (*m_log) << MSG::DEBUG << "inputTE->getId(): " << inputTE->getId() - << endreq; + << endmsg; } #endif @@ -132,10 +132,10 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: if ( hltStatus == HLT::OK ) { #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) - (*m_log) << MSG::DEBUG << *roiDescriptor << endreq; + (*m_log) << MSG::DEBUG << *roiDescriptor << endmsg; #endif } else { - (*m_log) << MSG::WARNING << " Failed to find RoiDescriptor " << endreq; + (*m_log) << MSG::WARNING << " Failed to find RoiDescriptor " << endmsg; return hltStatus; } @@ -147,7 +147,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: << roiDescriptor->phi() << " & LVL1 eta=" << roiDescriptor->eta() - << endreq; + << endmsg; #endif // This will be used to restrict hot cell search @@ -202,17 +202,17 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) { - (*m_log) << MSG::DEBUG << " etamin = "<< etamin << endreq; - (*m_log) << MSG::DEBUG << " etamax = "<< etamax << endreq; - (*m_log) << MSG::DEBUG << " phimin = "<< phimin << endreq; - (*m_log) << MSG::DEBUG << " phimax = "<< phimax << endreq; + (*m_log) << MSG::DEBUG << " etamin = "<< etamin << endmsg; + (*m_log) << MSG::DEBUG << " etamax = "<< etamax << endmsg; + (*m_log) << MSG::DEBUG << " phimin = "<< phimin << endmsg; + (*m_log) << MSG::DEBUG << " phimax = "<< phimax << endmsg; } #endif #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) - (*m_log) << MSG::DEBUG << " Making TrigEMCluster "<< endreq; + (*m_log) << MSG::DEBUG << " Making TrigEMCluster "<< endmsg; #endif @@ -264,7 +264,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: (*it)->setCaloDetDescrElement(caloDDE); // if ((*it)->execute(*ptrigEmCluster,etamin,etamax,phimin,phimax).isFailure() ) { if ((*it)->execute(*ptrigEmCluster, newroi ).isFailure() ) { - (*m_log) << MSG::WARNING << "T2Calo AlgToolEgamma returned Failure" << endreq; + (*m_log) << MSG::WARNING << "T2Calo AlgToolEgamma returned Failure" << endmsg; // return HLT::TOOL_FAILURE; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN,HLT::Reason::USERDEF_1); } @@ -329,30 +329,30 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: // Print out Cluster produced if ( (*m_log).level() <= MSG::DEBUG ) { - (*m_log) << MSG::DEBUG << " Values of Cluster produced: "<< endreq; - (*m_log) << MSG::DEBUG << " REGTEST: emEnergy = "<< (*ptrigEmCluster).energy() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: hadEnergy = "<< (*ptrigEmCluster).ehad1() << endreq; + (*m_log) << MSG::DEBUG << " Values of Cluster produced: "<< endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: emEnergy = "<< (*ptrigEmCluster).energy() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: hadEnergy = "<< (*ptrigEmCluster).ehad1() << endmsg; if ( ptrigEmCluster->e277()!=0. ) (*m_log) << MSG::DEBUG << " REGTEST: rCore = " - << ((*ptrigEmCluster).e237() )/ ((*ptrigEmCluster).e277()) << endreq; - else (*m_log) << MSG::DEBUG << " REGTEST: e277 equals to 0" << endreq; + << ((*ptrigEmCluster).e237() )/ ((*ptrigEmCluster).e277()) << endmsg; + else (*m_log) << MSG::DEBUG << " REGTEST: e277 equals to 0" << endmsg; (*m_log) << MSG::DEBUG << " REGTEST: energyRatio = " << (((*ptrigEmCluster).emaxs1()-(*ptrigEmCluster).e2tsts1())/ ((*ptrigEmCluster).emaxs1()+(*ptrigEmCluster).e2tsts1())) - << endreq; - - (*m_log) << MSG::DEBUG << " REGTEST: clusterWidth = " << (*ptrigEmCluster).weta2() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: frac73 = " << (*ptrigEmCluster).fracs1() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: e233 = " << (*ptrigEmCluster).e233() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: wstot = " << (*ptrigEmCluster).wstot() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: eta = "<< (*ptrigEmCluster).eta() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: phi = "<< (*ptrigEmCluster).phi() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: Eta1 = "<< (*ptrigEmCluster).eta1() << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: calZ0 = "<< calZ0 << endreq; - (*m_log) << MSG::DEBUG << " REGTEST: quality = "<< (*ptrigEmCluster).clusterQuality() << endreq; - (*m_log) << MSG::DEBUG << std::hex << " REGTEST: roiWord = 0x" << (*ptrigEmCluster).RoIword() << std::dec <<endreq; + << endmsg; + + (*m_log) << MSG::DEBUG << " REGTEST: clusterWidth = " << (*ptrigEmCluster).weta2() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: frac73 = " << (*ptrigEmCluster).fracs1() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: e233 = " << (*ptrigEmCluster).e233() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: wstot = " << (*ptrigEmCluster).wstot() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: eta = "<< (*ptrigEmCluster).eta() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: phi = "<< (*ptrigEmCluster).phi() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: Eta1 = "<< (*ptrigEmCluster).eta1() << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: calZ0 = "<< calZ0 << endmsg; + (*m_log) << MSG::DEBUG << " REGTEST: quality = "<< (*ptrigEmCluster).clusterQuality() << endmsg; + (*m_log) << MSG::DEBUG << std::hex << " REGTEST: roiWord = 0x" << (*ptrigEmCluster).RoIword() << std::dec <<endmsg; } std::string key = ""; @@ -362,7 +362,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) (*m_log) << MSG::ERROR << "Write of TrigEMCluster into outputTE failed" - << endreq; + << endmsg; #endif if ( m_timersvc ) m_timer[0]->stop(); return hltStatus; @@ -375,7 +375,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) (*m_log) << MSG::ERROR << "Write of TrigEMClusterCells into outputTE failed" - << endreq; + << endmsg; #endif if ( m_timersvc ) m_timer[0]->stop(); return hltStatus; @@ -414,7 +414,7 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: if ( hltStatus != HLT::OK ) { (*m_log) << MSG::ERROR << "Write of update TrigRoiDescriptor into outputTE failed" - << endreq; + << endmsg; if ( m_timersvc ) m_timer[0]->stop(); return hltStatus; } @@ -424,23 +424,23 @@ HLT::ErrorCode T2CaloEgamma::hltExecute(const HLT::TriggerElement* inputTE, HLT: if(m_rings){ hltStatus = recordAndAttachRings(outputTE); if(hltStatus != HLT::OK){ - (*m_log) << MSG::ERROR << "Can not attach the xAOD::TrigRingerRings features into StoreGate." << endreq; + (*m_log) << MSG::ERROR << "Can not attach the xAOD::TrigRingerRings features into StoreGate." << endmsg; return hltStatus; } if( (*m_log).level() <= MSG::DEBUG){ (*m_log) << MSG::DEBUG << "attach xAOD::TrigRingerRings with feature name " << m_ringerFeatureLabel - << " and with roiword 0x" << std::hex << m_rings->emCluster()->RoIword() << std::dec << endreq; - //<< " and with roiword 0x" << std::hex << m_rings->RoIword() << std::dec << endreq; + << " and with roiword 0x" << std::hex << m_rings->emCluster()->RoIword() << std::dec << endmsg; + //<< " and with roiword 0x" << std::hex << m_rings->RoIword() << std::dec << endmsg; } } #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) { - (*m_log) << MSG::DEBUG << "Recorded an RoiDescriptor " << *newRoiDescriptor << endreq; + (*m_log) << MSG::DEBUG << "Recorded an RoiDescriptor " << *newRoiDescriptor << endmsg; (*m_log) << MSG::DEBUG << "We assume success, set TE with Id " << outputTE->getId() << " active to signal positive result." - << endreq; + << endmsg; } #endif @@ -458,7 +458,7 @@ HLT::ErrorCode T2CaloEgamma::hltFinalize(){ #ifndef NDEBUG if ( (*m_log).level() <= MSG::DEBUG ) - (*m_log) << MSG::INFO << "in finalize()" << endreq; + (*m_log) << MSG::INFO << "in finalize()" << endmsg; #endif return HLT::OK; @@ -485,7 +485,7 @@ HLT::ErrorCode T2CaloEgamma::recordAndAttachRings(HLT::TriggerElement *outputTE) } if(el_t2calo_clus.isValid()){ if ( (*m_log).level() <= MSG::DEBUG ) { - (*m_log) << MSG::DEBUG << "ElementLink to xAOD::TrigEMClusterContainer is valid. set into xAOD::TrigRingerRings..." << endreq; + (*m_log) << MSG::DEBUG << "ElementLink to xAOD::TrigEMClusterContainer is valid. set into xAOD::TrigRingerRings..." << endmsg; } /* @@ -493,7 +493,7 @@ HLT::ErrorCode T2CaloEgamma::recordAndAttachRings(HLT::TriggerElement *outputTE) if( (*m_log).level() <= MSG::DEBUG){ static SG::AuxElement::Accessor<ElementLink<xAOD::TrigEMClusterContainer>>orig("emClusterLink"); if( !orig.isAvailable(*m_rings) || !orig(*m_rings).isValid() ){ - (*m_log) << MSG::DEBUG << "Problem with emClusterLink." << endreq; + (*m_log) << MSG::DEBUG << "Problem with emClusterLink." << endmsg; } }*/ diff --git a/Trigger/TrigAlgorithms/TrigT2CaloTau/src/T2CaloTau.cxx b/Trigger/TrigAlgorithms/TrigT2CaloTau/src/T2CaloTau.cxx index 264cf46932c..7744a9e9501 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloTau/src/T2CaloTau.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloTau/src/T2CaloTau.cxx @@ -128,12 +128,12 @@ HLT::ErrorCode T2CaloTau::hltInitialize() StatusCode sc = it->retrieve(); if(sc.isFailure()) { - msg() << MSG::ERROR << "Unable to initialize tool " << *it << endreq; + msg() << MSG::ERROR << "Unable to initialize tool " << *it << endmsg; return HLT::BAD_ALGO_CONFIG ; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: Created " << *it << " AlgTool" << endreq; + msg() << MSG::DEBUG << "REGTEST: Created " << *it << " AlgTool" << endmsg; } (*it)->setCellContainerPointer(&m_Container); } @@ -142,17 +142,17 @@ HLT::ErrorCode T2CaloTau::hltInitialize() { if(m_updateRoiDescriptor) { - msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endreq; + msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endmsg; } else { - msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endreq; + msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endmsg; } } if(m_storeCells && msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "REGTEST: will store cells in output " << endreq; + msg() << MSG::DEBUG << "REGTEST: will store cells in output " << endmsg; } return HLT::OK; @@ -162,7 +162,7 @@ HLT::ErrorCode T2CaloTau::hltFinalize() { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << " hltFinalize is done" << endreq; + msg() << MSG::DEBUG << " hltFinalize is done" << endmsg; } return HLT::OK; } @@ -217,7 +217,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr #ifndef NDEBUG if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::INFO << "in execute()" << endreq; + msg() << MSG::INFO << "in execute()" << endmsg; } #endif @@ -225,7 +225,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr #ifndef NDEBUG if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "output TE ID: " << outputTE->getId() << endreq; + msg() << MSG::DEBUG << "output TE ID: " << outputTE->getId() << endmsg; } #endif @@ -233,7 +233,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr #ifndef NDEBUG if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "input TE ID: " << inputTE->getId() << endreq; + msg() << MSG::DEBUG << "input TE ID: " << inputTE->getId() << endmsg; } #endif const TrigRoiDescriptor* roiDescriptor = 0; @@ -246,15 +246,15 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { msg() << MSG::DEBUG << " RoI id " << roiDescriptor->roiId() << " LVL1 id " << roiDescriptor->l1Id() - << *roiDescriptor << endreq; + << *roiDescriptor << endmsg; // << " located at phi = " << roiDescriptor->phi0() - // << ", eta = " << roiDescriptor->eta0() << endreq; + // << ", eta = " << roiDescriptor->eta0() << endmsg; } #endif } else { - msg() << MSG::WARNING << " Failed to find RoiDescriptor " << endreq; + msg() << MSG::WARNING << " Failed to find RoiDescriptor " << endmsg; return HLT::ERROR; } @@ -266,7 +266,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr << roiDescriptor->phi() << " & LVL1 eta=" << roiDescriptor->eta() << " " << roiDescriptor - << endreq; + << endmsg; } @@ -282,7 +282,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::ERROR << "Write of TrigTauClusterDetails into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of TrigTauClusterDetails into outputTE failed" << endmsg; } return hltstatusD; } @@ -302,7 +302,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Failed to get TrigTauClusterDetails" << endreq; + msg() << MSG::DEBUG << "Failed to get TrigTauClusterDetails" << endmsg; } return HLT::MISSING_FEATURE; } @@ -331,7 +331,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr // TrigRoiDescriptor* roiEM = new TrigRoiDescriptor( _roi->eta(), _roi->eta()-m_etaWidthEM, _roi->eta()+m_etaWidthE<, // _roi->phi(), HLT::wrap_phi(_roi->phi()-m_phiWidthEM), HLT::wrap_phi(_roi->phi()+m_phiWidthEM) ); - msg() << MSG::DEBUG << "Using RoIs " << roi << endreq; + msg() << MSG::DEBUG << "Using RoIs " << roi << endmsg; ToolHandleArray<IAlgToolCalo>::iterator it = m_emAlgTools.begin(); if(timerSvc()) m_timer[1]->start(); @@ -343,14 +343,14 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr HLT::ErrorCode stat = (*it)->execute(*ptrigTauCluster, roi ); if(stat.reason() == NEG_ENERGY_CLUSTER) { - msg() << MSG::DEBUG << (*it)->name() << " Found a cluster with E~<=0. CONTINUE execution. " << endreq; + msg() << MSG::DEBUG << (*it)->name() << " Found a cluster with E~<=0. CONTINUE execution. " << endmsg; // do not forget to delete trigTauCluster of attach it to storegate if return // return stat; // uncomment to avaid running on the remaining tools. ToolStat = stat; } if(stat.reason() == NULL_ENERGY_SAMPLING) { - msg() << MSG::DEBUG << (*it)->name() << " Found E==0 in this sampling. CONTINUE execution. " << endreq; + msg() << MSG::DEBUG << (*it)->name() << " Found E==0 in this sampling. CONTINUE execution. " << endmsg; // do not forget to delete trigTauCluster of attach it to storegate if return // return stat; // uncomment to avaid running on the remaining tools. ToolStat = stat; @@ -359,7 +359,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr } if(stat == HLT::TOOL_FAILURE) { - msg() << MSG::WARNING << "T2CaloTau AlgTool " << (*it)->name() << " returned Failure" << endreq; + msg() << MSG::WARNING << "T2CaloTau AlgTool " << (*it)->name() << " returned Failure" << endmsg; // if tool has returned this failure, then loadingCollection has failed and it // does not make sense to keep this TrigTauCluster - we would not learn anything from it delete ptrigTauCluster; @@ -393,10 +393,10 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr if(msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << " RoI id " << roiL1Descriptor->roiId() << " LVL1 id " << roiL1Descriptor->l1Id() - << *roiL1Descriptor << endreq; + << *roiL1Descriptor << endmsg; } } else { - msg() << MSG::WARNING << " Failed to find RoiDescriptor " << endreq; + msg() << MSG::WARNING << " Failed to find RoiDescriptor " << endmsg; return HLT::ERROR; } @@ -497,64 +497,64 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr if(msgLvl() <= MSG::DEBUG) { // Print out Cluster produced - // msg() << MSG::DEBUG << "TEST-TEST-TEST-TEST" << endreq; - msg() << MSG::DEBUG << " REGTEST: eta/phi = "<< m_Eta << "/" << m_Phi << endreq; - //msg() << MSG::DEBUG << " REGTEST: etaL1/phiL1 = "<< m_EtaL1 << "/" << m_PhiL1 << endreq; + // msg() << MSG::DEBUG << "TEST-TEST-TEST-TEST" << endmsg; + msg() << MSG::DEBUG << " REGTEST: eta/phi = "<< m_Eta << "/" << m_Phi << endmsg; + //msg() << MSG::DEBUG << " REGTEST: etaL1/phiL1 = "<< m_EtaL1 << "/" << m_PhiL1 << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergy0Narrow/Medium/Wide = "<< (*ptrigTauCluster).clusterDetails()->EMenergyNarrow(0) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyMedium(0) << "/" - << (*ptrigTauCluster).clusterDetails()->EMenergyWide(0) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMenergyWide(0) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergy1Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->EMenergyNarrow(1) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyMedium(1) << "/" - << (*ptrigTauCluster).clusterDetails()->EMenergyWide(1) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMenergyWide(1) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergy2Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->EMenergyNarrow(2) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyMedium(2) << "/" - << (*ptrigTauCluster).clusterDetails()->EMenergyWide(2) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMenergyWide(2) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergy3Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->EMenergyNarrow(3) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyMedium(3) << "/" - << (*ptrigTauCluster).clusterDetails()->EMenergyWide(3) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMenergyWide(3) << endmsg; msg() << MSG::DEBUG << " REGTEST: HADenergy0Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->HADenergyNarrow(0) << "/" << (*ptrigTauCluster).clusterDetails()->HADenergyMedium(0) << "/" - << (*ptrigTauCluster).clusterDetails()->HADenergyWide(0) << endreq; + << (*ptrigTauCluster).clusterDetails()->HADenergyWide(0) << endmsg; msg() << MSG::DEBUG << " REGTEST: HADenergy1Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->HADenergyNarrow(1) << "/" << (*ptrigTauCluster).clusterDetails()->HADenergyMedium(1) << "/" - << (*ptrigTauCluster).clusterDetails()->HADenergyWide(1) << endreq; + << (*ptrigTauCluster).clusterDetails()->HADenergyWide(1) << endmsg; msg() << MSG::DEBUG << " REGTEST: HADenergy2Narrow/Medium/Wide = " << (*ptrigTauCluster).clusterDetails()->HADenergyNarrow(2) << "/" << (*ptrigTauCluster).clusterDetails()->HADenergyMedium(2) << "/" - << (*ptrigTauCluster).clusterDetails()->HADenergyWide(2) << endreq; + << (*ptrigTauCluster).clusterDetails()->HADenergyWide(2) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMRadius0/1/2/3 = " << (*ptrigTauCluster).clusterDetails()->EMRadius(0) << "/" << (*ptrigTauCluster).clusterDetails()->EMRadius(1) << "/" << (*ptrigTauCluster).clusterDetails()->EMRadius(2) << "/" - << (*ptrigTauCluster).clusterDetails()->EMRadius(3) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMRadius(3) << endmsg; msg() << MSG::DEBUG << " REGTEST: HADRadius0/1/2 = " << (*ptrigTauCluster).clusterDetails()->HADRadius(0) << "/" << (*ptrigTauCluster).clusterDetails()->HADRadius(1) << "/" - << (*ptrigTauCluster).clusterDetails()->HADRadius(2) << endreq; + << (*ptrigTauCluster).clusterDetails()->HADRadius(2) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergyWidth0/1/2/3 = " << (*ptrigTauCluster).clusterDetails()->EMenergyWidth(0) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyWidth(1) << "/" << (*ptrigTauCluster).clusterDetails()->EMenergyWidth(2) << "/" - << (*ptrigTauCluster).clusterDetails()->EMenergyWidth(3) << endreq; + << (*ptrigTauCluster).clusterDetails()->EMenergyWidth(3) << endmsg; msg() << MSG::DEBUG << " REGTEST: EMenergy/Hadenergy = " << (*ptrigTauCluster).EMenergy() << "/" << (*ptrigTauCluster).HADenergy() << "/" - << endreq; + << endmsg; msg() << MSG::DEBUG << " REGTEST: numStripCells/stripWidth/IsoFrac = " << (*ptrigTauCluster).numStripCells() << "/" << (*ptrigTauCluster).stripWidth() << "/" - << m_IsoFrac << endreq; + << m_IsoFrac << endmsg; msg() << MSG::DEBUG << " REGTEST: RoIWord = " - << (*ptrigTauCluster).RoIword() << endreq; + << (*ptrigTauCluster).RoIword() << endmsg; } //// From egamma. This is already done inside the tools for tau! but maybe would like to change at some point... @@ -571,7 +571,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::ERROR << "Write of TrigTauCluster into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of TrigTauCluster into outputTE failed" << endmsg; } return hltstatus; } @@ -583,14 +583,14 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr HLT::ErrorCode hltstatus = recordAndAttachFeature(outputTE, m_Container, key, "TrigT2CaloTauCells"); if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << " recorded " << m_Container->size() << " cells "<< endreq; + msg() << MSG::DEBUG << " recorded " << m_Container->size() << " cells "<< endmsg; } if(hltstatus != HLT::OK) { #ifndef NDEBUG if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::ERROR << "Write of TrigTauClusterCells into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of TrigTauClusterCells into outputTE failed" << endmsg; } #endif if(m_timersvc) m_timer[0]->stop(); @@ -629,7 +629,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { msg() << MSG::DEBUG << "Recorded an RoiDescriptor " << " phi " << newRoiDescriptor->phi() - << " eta " << newRoiDescriptor->eta() << " " << *newRoiDescriptor << endreq; + << " eta " << newRoiDescriptor->eta() << " " << *newRoiDescriptor << endmsg; } hltstatus = attachFeature(outputTE, newRoiDescriptor, "TrigT2CaloTau"); @@ -638,7 +638,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr { if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::ERROR << "Write of newRoiDescriptor into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of newRoiDescriptor into outputTE failed" << endmsg; } return hltstatus; } @@ -651,7 +651,7 @@ HLT::ErrorCode T2CaloTau::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr << "We assume success, set TE with id " << outputTE->getId() << " active to signal positive result." - << endreq; + << endmsg; } #endif diff --git a/Trigger/TrigAlgorithms/TrigT2CaloTau/src/TauAllCaloDRFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloTau/src/TauAllCaloDRFex.cxx index 82b15f24c3f..0790f6c8c82 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloTau/src/TauAllCaloDRFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloTau/src/TauAllCaloDRFex.cxx @@ -53,20 +53,20 @@ StatusCode TauAllCaloDRFex::initialize() { StatusCode sc = IAlgToolCalo::initialize(); if( sc.isFailure() ) return sc; - msg() << MSG::INFO << "REGTEST initialized with:" << endreq; - msg() << MSG::INFO << "REGTEST dRSeed=" << m_dRSeed << endreq; - msg() << MSG::INFO << "REGTEST StripEthr=" << m_stripEthr << endreq; - msg() << MSG::INFO << "REGTEST CaloNoiseTool=" << m_noiseTool << endreq; - msg() << MSG::INFO << "REGTEST applyNoiseCut=" << m_applyNoiseCut << endreq; - msg() << MSG::INFO << "REGTEST noiseNSigmaCut=" << m_noiseNSigmaCut << endreq; - msg() << MSG::INFO << "REGTEST hecQualityCut=" << m_hecQualityCut << endreq; - msg() << MSG::INFO << "REGTEST defaultWidth=" << m_defaultWidth << endreq; - msg() << MSG::INFO << "REGTEST dRConeNarrow=" << m_dRConeNarrow << endreq; - msg() << MSG::INFO << "REGTEST dRConeMedium=" << m_dRConeMedium << endreq; - msg() << MSG::INFO << "REGTEST dRConeWide=" << m_dRConeWide << endreq; + msg() << MSG::INFO << "REGTEST initialized with:" << endmsg; + msg() << MSG::INFO << "REGTEST dRSeed=" << m_dRSeed << endmsg; + msg() << MSG::INFO << "REGTEST StripEthr=" << m_stripEthr << endmsg; + msg() << MSG::INFO << "REGTEST CaloNoiseTool=" << m_noiseTool << endmsg; + msg() << MSG::INFO << "REGTEST applyNoiseCut=" << m_applyNoiseCut << endmsg; + msg() << MSG::INFO << "REGTEST noiseNSigmaCut=" << m_noiseNSigmaCut << endmsg; + msg() << MSG::INFO << "REGTEST hecQualityCut=" << m_hecQualityCut << endmsg; + msg() << MSG::INFO << "REGTEST defaultWidth=" << m_defaultWidth << endmsg; + msg() << MSG::INFO << "REGTEST dRConeNarrow=" << m_dRConeNarrow << endmsg; + msg() << MSG::INFO << "REGTEST dRConeMedium=" << m_dRConeMedium << endmsg; + msg() << MSG::INFO << "REGTEST dRConeWide=" << m_dRConeWide << endmsg; if( m_saveCells && msg().level() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "REGTEST: store cells with Et> " << m_cellkeepthr << endreq; + msg() << MSG::DEBUG << "REGTEST: store cells with Et> " << m_cellkeepthr << endmsg; if ( !m_timersvc.empty() ) { @@ -82,7 +82,7 @@ StatusCode TauAllCaloDRFex::initialize() { if(m_noiseTool.retrieve().isFailure()) { - msg() << MSG::FATAL << "Unable to find CaloNoiseTool" << endreq; + msg() << MSG::FATAL << "Unable to find CaloNoiseTool" << endmsg; return StatusCode::FAILURE; } } @@ -124,7 +124,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, double seedEta = roi.eta(); if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << " Seed position (L1) eta/phi=" << seedEta << "/" << seedPhi << endreq; + msg() << MSG::DEBUG << " Seed position (L1) eta/phi=" << seedEta << "/" << seedPhi << endmsg; double energyEta = 0.; @@ -151,12 +151,12 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, //------------------ step 1 : clusterization ----------------------------------- // loop over all samplings if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << " Start clusterization "<< endreq; + msg() << MSG::DEBUG << " Start clusterization "<< endmsg; for(unsigned int is=0; is<NSamplings;++is) { if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << "LAr sampling "<< samplings[is]<< endreq; + msg() << MSG::DEBUG << "LAr sampling "<< samplings[is]<< endmsg; if (!m_timersvc.empty()) { m_timer[3]->pause(); m_timer[1]->resume();} // m_data->RegionSelector(samplings[is], etamin, etamax, phimin, phimax, detectorID[is]); @@ -164,7 +164,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, if (!m_timersvc.empty()) {m_timer[1]->pause(); m_timer[2]->resume(); } if ( m_data->LoadCollections(m_iBegin,m_iEnd).isFailure() ){ if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << " can not LoadCollections " << *m_iBegin << " " << *m_iEnd << endreq; + msg() << MSG::DEBUG << " can not LoadCollections " << *m_iBegin << " " << *m_iEnd << endmsg; return HLT::TOOL_FAILURE; } m_error|=m_data->report_error(); @@ -246,7 +246,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, energyEta += energyCell * etaCell ; if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << "take cell E="<<energyCell << " Eta/Phi="<<etaCell << "/"<<phiCell<< endreq; + msg() << MSG::DEBUG << "take cell E="<<energyCell << " Eta/Phi="<<etaCell << "/"<<phiCell<< endmsg; if (phiCell > 0.){ EnergyMediumPosPhi += energyCell; @@ -277,7 +277,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, if (msg().level()<=MSG::DEBUG) msg() << MSG::DEBUG <<"REGTEST problems finding seed: negative energy = "<< EnergyMediumNegPhi + EnergyMediumPosPhi <<" eta/phi = "<< energyEta<<" / "<<energyPhi <<" . Seed set to L1 direction: eta/phi = " - <<roi.eta()<<" / "<<roi.phi()<< endreq; + <<roi.eta()<<" / "<<roi.phi()<< endmsg; energyEta = roi.eta() ; // if Cluster energy is null or negative, set L1 position energyPhi = roi.phi() ; SetClusterError(TAUCLUSTERROR::FAILSEED); @@ -286,7 +286,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, } if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG <<"REGTEST Pre-seed eta/phi " << seedEta<<"/"<<seedPhi << " => Cluster eta/phi = "<< energyEta << "/"<< energyPhi << endreq; + msg() << MSG::DEBUG <<"REGTEST Pre-seed eta/phi " << seedEta<<"/"<<seedPhi << " => Cluster eta/phi = "<< energyEta << "/"<< energyPhi << endmsg; while (energyPhi < -M_PI) energyPhi= energyPhi + 2. * M_PI; while (energyPhi > M_PI) energyPhi= energyPhi - 2. * M_PI; @@ -299,7 +299,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, if (msg().level()<=MSG::DEBUG) msg() << MSG::DEBUG <<"REGTEST problems finding seed: eta/phi = "<<energyEta<<" / "<<energyPhi <<" too far from L1 eta/phi = "<< seedEta<<" / "<<seedPhi - <<" . Energy = "<< EnergyMediumNegPhi + EnergyMediumPosPhi<< endreq; + <<" . Energy = "<< EnergyMediumNegPhi + EnergyMediumPosPhi<< endmsg; energyEta=roi.eta(); energyPhi=roi.phi(); // this a similar case as above: energy is too small to calculate a good seed position. they should be monitored together. @@ -328,7 +328,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, ClearClusterError(TAUCLUSTERROR::HADS3E0); if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << " Start shape calculation "<< endreq; + msg() << MSG::DEBUG << " Start shape calculation "<< endmsg; int numStripCell = 0; @@ -422,7 +422,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, if ( m_data->LoadCollections(m_iBegin,m_iEnd).isFailure() ){ if (msg().level()<=MSG::DEBUG) - msg() << MSG::DEBUG << " can not LoadCollections " << *m_iBegin << " " << *m_iEnd << endreq; + msg() << MSG::DEBUG << " can not LoadCollections " << *m_iBegin << " " << *m_iEnd << endmsg; return HLT::TOOL_FAILURE; } m_error|=m_data->report_error(); @@ -875,7 +875,7 @@ HLT::ErrorCode TauAllCaloDRFex::execute( TrigTauCluster &rtrigTauCluster, if ( msg().level() <= MSG::DEBUG) msg()<<MSG::DEBUG << "REGTEST Record energy RawE" << rtrigTauCluster.rawEnergy() - << "Had " << rtrigTauCluster.HADenergy() << endreq; + << "Had " << rtrigTauCluster.HADenergy() << endmsg; if (!m_timersvc.empty()){ m_timer[4]->pause(); m_timer[3]->resume();} diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtx.cxx b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtx.cxx index 099234ab3f3..3f78f91ed50 100755 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtx.cxx +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtx.cxx @@ -76,24 +76,24 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltInitialize() { // Get message service if (msgLvl() <= MSG::INFO) - msg() << MSG::INFO << "Initializing TrigT2HistoPrmVtx, version " << PACKAGE_VERSION << endreq; + msg() << MSG::INFO << "Initializing TrigT2HistoPrmVtx, version " << PACKAGE_VERSION << endmsg; if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "declareProperty review:" << endreq; - msg() << MSG::DEBUG << " AlgoId = " << c->m_algo << endreq; - msg() << MSG::DEBUG << " Instance = " << c->m_instance << endreq; - msg() << MSG::DEBUG << " Numbins = " << c->m_nBins << endreq; - msg() << MSG::DEBUG << " UseBeamSpot = " << c->m_useBeamSpot << endreq; - msg() << MSG::DEBUG << " UseEtaPhiTrackSel = " << c->m_useEtaPhiTrackSel << endreq; + msg() << MSG::DEBUG << "declareProperty review:" << endmsg; + msg() << MSG::DEBUG << " AlgoId = " << c->m_algo << endmsg; + msg() << MSG::DEBUG << " Instance = " << c->m_instance << endmsg; + msg() << MSG::DEBUG << " Numbins = " << c->m_nBins << endmsg; + msg() << MSG::DEBUG << " UseBeamSpot = " << c->m_useBeamSpot << endmsg; + msg() << MSG::DEBUG << " UseEtaPhiTrackSel = " << c->m_useEtaPhiTrackSel << endmsg; if (c->m_instance == "_EF") { - msg() << MSG::DEBUG << " EFTrkSel_Chi2 = " << c->m_efTrkSelChi2 << endreq; - msg() << MSG::DEBUG << " EFTrkSel_BLayer = " << c->m_efTrkSelBLayer << endreq; - msg() << MSG::DEBUG << " EFTrkSel_PixHits = " << c->m_efTrkSelPixHits << endreq; - msg() << MSG::DEBUG << " EFTrkSel_SiHits = " << c->m_efTrkSelSiHits << endreq; - msg() << MSG::DEBUG << " EFTrkSel_D0 = " << c->m_efTrkSelD0 << endreq; - msg() << MSG::DEBUG << " EFTrkSel_Pt = " << c->m_efTrkSelPt << endreq; + msg() << MSG::DEBUG << " EFTrkSel_Chi2 = " << c->m_efTrkSelChi2 << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_BLayer = " << c->m_efTrkSelBLayer << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_PixHits = " << c->m_efTrkSelPixHits << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_SiHits = " << c->m_efTrkSelSiHits << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_D0 = " << c->m_efTrkSelD0 << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_Pt = " << c->m_efTrkSelPt << endmsg; } } @@ -113,11 +113,11 @@ unsigned int TrigT2HistoPrmVtx::getTrackNumbers(const xAOD::TrackParticleContain if (pointerToEFTrackCollections) { nEFtracks = pointerToEFTrackCollections->size(); if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Found " << nEFtracks << " tracks in the RoI" << endreq; + msg() << MSG::DEBUG << "Found " << nEFtracks << " tracks in the RoI" << endmsg; } else { nEFtracks = 0; if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "No tracks in the RoI" << endreq; + msg() << MSG::DEBUG << "No tracks in the RoI" << endmsg; } return nEFtracks; @@ -130,7 +130,7 @@ unsigned int TrigT2HistoPrmVtx::getTrackNumbers(const xAOD::TrackParticleContain HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputTE*/, HLT::TriggerElement* outputTE) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtx" << endreq; + msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtx" << endmsg; float zFirstTrack=0; float zFirstTrackError=0; @@ -161,8 +161,8 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT m_iBeamCondSvc = 0; if (msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endreq; - msg() << MSG::WARNING << "Using origin at ( " << c->m_xBeamSpot << " , " << c->m_yBeamSpot << " , " << c->m_zBeamSpot << " ) " << endreq; + msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endmsg; + msg() << MSG::WARNING << "Using origin at ( " << c->m_xBeamSpot << " , " << c->m_yBeamSpot << " , " << c->m_zBeamSpot << " ) " << endmsg; } } else { @@ -181,7 +181,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Beam spot from service: x = " << c->m_xBeamSpot << " +/- " << c->m_xBeamSpotSigma << " " << "y = " << c->m_yBeamSpot << " +/- " << c->m_yBeamSpotSigma << " " - << "z = " << c->m_zBeamSpot << " +/- " << c->m_zBeamSpotSigma << endreq; + << "z = " << c->m_zBeamSpot << " +/- " << c->m_zBeamSpotSigma << endmsg; } } @@ -192,11 +192,11 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT msg() << MSG::DEBUG << "Using outputTE: " << "RoI id " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() - << ", Eta = " << roiDescriptor->eta() << endreq; + << ", Eta = " << roiDescriptor->eta() << endmsg; } } else { if (msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "No RoI for this Trigger Element " << endreq; + msg() << MSG::WARNING << "No RoI for this Trigger Element " << endmsg; return HLT::NAV_ERROR; } @@ -207,14 +207,14 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT if (c->m_instance == "_EF" || c->m_instance == "_HLT") { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtx at HLT" << endreq; + msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtx at HLT" << endmsg; HLT::ErrorCode status = getFeature(outputTE, pointerToEFTrackCollections, ""); if (status != HLT::OK) { - msg() << MSG::DEBUG << "No tracks retrieved from TrigT2HistoPrmVtx" << endreq; + msg() << MSG::DEBUG << "No tracks retrieved from TrigT2HistoPrmVtx" << endmsg; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got collection from TrigT2HistoPrmVtx" << endreq; + msg() << MSG::DEBUG << "Got collection from TrigT2HistoPrmVtx" << endmsg; // Get tracks number c->m_totTracks = getTrackNumbers(pointerToEFTrackCollections); @@ -225,7 +225,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT for (unsigned int i = 0; i < c->m_totTracks; i++) { if (msgLvl() <= MSG::DEBUG && i == 0) - msg() << MSG::DEBUG << "Loop over tracks: retrieving z0" << endreq; + msg() << MSG::DEBUG << "Loop over tracks: retrieving z0" << endmsg; const xAOD::TrackParticle* track = (*pointerToEFTrackCollections)[i]; float z0 = track->z0(); @@ -242,7 +242,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT } if (msgLvl() <= MSG::VERBOSE) - msg() << MSG::VERBOSE << "Track number " << i+1 << " with z0 = " << z0 << " and ez0 = " << ez0 << endreq; + msg() << MSG::VERBOSE << "Track number " << i+1 << " with z0 = " << z0 << " and ez0 = " << ez0 << endmsg; c->m_hisVtx->fill(z0); } @@ -261,7 +261,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT if (msgLvl() <= MSG::DEBUG) { for (int i = 0; i <3; i++) - msg() << MSG::DEBUG << "Primary vertex " << i << ": z=" << c->zPrmVtx.at(i) << ", sigma=" << c->zPrmVtxSigmaAll.at(i) << ", nTracks=" << c->nTrackVtx.at(i) << endreq; + msg() << MSG::DEBUG << "Primary vertex " << i << ": z=" << c->zPrmVtx.at(i) << ", sigma=" << c->zPrmVtxSigmaAll.at(i) << ", nTracks=" << c->nTrackVtx.at(i) << endmsg; } if (msgLvl() <= MSG::DEBUG) { @@ -269,13 +269,13 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT const EventInfo* pEventInfo; if ( !store() || store()->retrieve(pEventInfo).isFailure() ) { - msg() << MSG::DEBUG << "Failed to get EventInfo " << endreq; + msg() << MSG::DEBUG << "Failed to get EventInfo " << endmsg; } else { msg() << MSG::DEBUG << "PrmVtx summary (Run " << pEventInfo->event_ID()->run_number() - << "; Event "<< pEventInfo->event_ID()->event_number() << ")" << endreq; - msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endreq; - msg() << MSG::DEBUG << "REGTEST: Tracks: " << c->m_totTracks << " reconstructed and " << c->m_totSelTracks <<" selected" << endreq; - msg() << MSG::DEBUG << "REGTEST: Primary vertex: " << c->zPrmVtx.at(0) << " +/- " << c->zPrmVtxSigmaAll.at(0) << " with " << c->nTrackVtx.at(0) << " tracks" << endreq; + << "; Event "<< pEventInfo->event_ID()->event_number() << ")" << endmsg; + msg() << MSG::DEBUG << "REGTEST: RoI " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() << ", Eta = " << roiDescriptor->eta() << endmsg; + msg() << MSG::DEBUG << "REGTEST: Tracks: " << c->m_totTracks << " reconstructed and " << c->m_totSelTracks <<" selected" << endmsg; + msg() << MSG::DEBUG << "REGTEST: Primary vertex: " << c->zPrmVtx.at(0) << " +/- " << c->zPrmVtxSigmaAll.at(0) << " with " << c->nTrackVtx.at(0) << " tracks" << endmsg; } } @@ -312,7 +312,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT HLT::ErrorCode stat = attachFeature(outputTE, m_trigVertexColl, key); if (stat != HLT::OK) { if (msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "Failed to attach xAOD::VertexContainer to navigation" << endreq; + msg() << MSG::WARNING << "Failed to attach xAOD::VertexContainer to navigation" << endmsg; return stat; } @@ -325,7 +325,7 @@ HLT::ErrorCode TrigT2HistoPrmVtx::hltExecute(const HLT::TriggerElement* /*inputT HLT::ErrorCode TrigT2HistoPrmVtx::hltFinalize() { if (msgLvl() <= MSG::INFO) - msg() << MSG::INFO << "Finalizing TrigT2HistoPrmVtx" << endreq; + msg() << MSG::INFO << "Finalizing TrigT2HistoPrmVtx" << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxAllTE.cxx b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxAllTE.cxx index b3c857711da..1ee80224600 100755 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxAllTE.cxx +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxAllTE.cxx @@ -77,24 +77,24 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltInitialize() { // Get message service if (msgLvl() <= MSG::INFO) - msg() << MSG::INFO << "Initializing TrigT2HistoPrmVtxAllTE, version " << PACKAGE_VERSION << endreq; + msg() << MSG::INFO << "Initializing TrigT2HistoPrmVtxAllTE, version " << PACKAGE_VERSION << endmsg; if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "declareProperty review:" << endreq; - msg() << MSG::DEBUG << " AlgoId = " << c->m_algo << endreq; - msg() << MSG::DEBUG << " Instance = " << c->m_instance << endreq; - msg() << MSG::DEBUG << " Numbins = " << c->m_nBins << endreq; - msg() << MSG::DEBUG << " UseBeamSpot = " << c->m_useBeamSpot << endreq; - msg() << MSG::DEBUG << " UseEtaPhiTrackSel = " << c->m_useEtaPhiTrackSel << endreq; + msg() << MSG::DEBUG << "declareProperty review:" << endmsg; + msg() << MSG::DEBUG << " AlgoId = " << c->m_algo << endmsg; + msg() << MSG::DEBUG << " Instance = " << c->m_instance << endmsg; + msg() << MSG::DEBUG << " Numbins = " << c->m_nBins << endmsg; + msg() << MSG::DEBUG << " UseBeamSpot = " << c->m_useBeamSpot << endmsg; + msg() << MSG::DEBUG << " UseEtaPhiTrackSel = " << c->m_useEtaPhiTrackSel << endmsg; if (c->m_instance == "_EF" || c->m_instance == "_HLT") { - msg() << MSG::DEBUG << " EFTrkSel_Chi2 = " << c->m_efTrkSelChi2 << endreq; - msg() << MSG::DEBUG << " EFTrkSel_BLayer = " << c->m_efTrkSelBLayer << endreq; - msg() << MSG::DEBUG << " EFTrkSel_PixHits = " << c->m_efTrkSelPixHits << endreq; - msg() << MSG::DEBUG << " EFTrkSel_SiHits = " << c->m_efTrkSelSiHits << endreq; - msg() << MSG::DEBUG << " EFTrkSel_D0 = " << c->m_efTrkSelD0 << endreq; - msg() << MSG::DEBUG << " EFTrkSel_Pt = " << c->m_efTrkSelPt << endreq; + msg() << MSG::DEBUG << " EFTrkSel_Chi2 = " << c->m_efTrkSelChi2 << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_BLayer = " << c->m_efTrkSelBLayer << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_PixHits = " << c->m_efTrkSelPixHits << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_SiHits = " << c->m_efTrkSelSiHits << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_D0 = " << c->m_efTrkSelD0 << endmsg; + msg() << MSG::DEBUG << " EFTrkSel_Pt = " << c->m_efTrkSelPt << endmsg; } } @@ -114,11 +114,11 @@ unsigned int TrigT2HistoPrmVtxAllTE::getTrackNumbers(const xAOD::TrackParticleCo if (pointerToEFTrackCollections) { nEFtracks = pointerToEFTrackCollections->size(); if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Found " << nEFtracks << " tracks in the RoI" << endreq; + msg() << MSG::DEBUG << "Found " << nEFtracks << " tracks in the RoI" << endmsg; } else { nEFtracks = 0; if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "No tracks in the RoI" << endreq; + msg() << MSG::DEBUG << "No tracks in the RoI" << endmsg; } return nEFtracks; @@ -134,7 +134,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T beforeExecMonitors().ignore(); if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtxAllTE" << endreq; + msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtxAllTE" << endmsg; float zFirstTrack=0; float zFirstTrackError=0; @@ -167,8 +167,8 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T m_iBeamCondSvc = 0; if (msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endreq; - msg() << MSG::WARNING << "Using origin at ( " << c->m_xBeamSpot << " , " << c->m_yBeamSpot << " , " << c->m_zBeamSpot << " ) " << endreq; + msg() << MSG::WARNING << "Could not retrieve Beam Conditions Service. " << endmsg; + msg() << MSG::WARNING << "Using origin at ( " << c->m_xBeamSpot << " , " << c->m_yBeamSpot << " , " << c->m_zBeamSpot << " ) " << endmsg; } } else { @@ -187,7 +187,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Beam spot from service: x = " << c->m_xBeamSpot << " +/- " << c->m_xBeamSpotSigma << " " << "y = " << c->m_yBeamSpot << " +/- " << c->m_yBeamSpotSigma << " " - << "z = " << c->m_zBeamSpot << " +/- " << c->m_zBeamSpotSigma << endreq; + << "z = " << c->m_zBeamSpot << " +/- " << c->m_zBeamSpotSigma << endmsg; } } @@ -202,12 +202,12 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T msg() << MSG::DEBUG << "Using inputTE: " << "RoI id " << roiDescriptor->roiId() << ", Phi = " << roiDescriptor->phi() - << ", Eta = " << roiDescriptor->eta() << endreq; + << ", Eta = " << roiDescriptor->eta() << endmsg; } } else { if (msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "No RoI for this Trigger Element " << endreq; + msg() << MSG::WARNING << "No RoI for this Trigger Element " << endmsg; return HLT::NAV_ERROR; } @@ -222,14 +222,14 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T if (c->m_instance == "_EF") { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtxAllTE at EF" << endreq; + msg() << MSG::DEBUG << "Executing TrigT2HistoPrmVtxAllTE at EF" << endmsg; HLT::ErrorCode status = getFeature(*inner_it, pointerToEFTrackCollections, ""); if (status != HLT::OK) { - msg() << MSG::DEBUG << "No tracks retrieved from TrigT2HistoPrmVtxAllTE" << endreq; + msg() << MSG::DEBUG << "No tracks retrieved from TrigT2HistoPrmVtxAllTE" << endmsg; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got collection from TrigT2HistoPrmVtxAllTE" << endreq; + msg() << MSG::DEBUG << "Got collection from TrigT2HistoPrmVtxAllTE" << endmsg; // Get tracks number c->m_totTracks = getTrackNumbers(pointerToEFTrackCollections); @@ -240,7 +240,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T for (unsigned int i = 0; i < c->m_totTracks; i++) { if (msgLvl() <= MSG::DEBUG && i == 0) - msg() << MSG::DEBUG << "Loop over tracks: retrieving z0" << endreq; + msg() << MSG::DEBUG << "Loop over tracks: retrieving z0" << endmsg; const xAOD::TrackParticle* track = (*pointerToEFTrackCollections)[i]; float z0 = track->z0(); @@ -258,7 +258,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T } if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Track number " << i+1 << " with z0 = " << z0 << " and ez0 = " << ez0 << endreq; + msg() << MSG::DEBUG << "Track number " << i+1 << " with z0 = " << z0 << " and ez0 = " << ez0 << endmsg; c->m_hisVtx->fill(z0); //std::cout << "PRMVTX-USING track " << z0 << std::endl; @@ -279,7 +279,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T if (msgLvl() <= MSG::DEBUG) { for (int i = 0; i <3; i++) msg() << MSG::DEBUG << "Primary vertex " << i << ": z=" << c->zPrmVtx.at(i) << ", sigma=" << c->zPrmVtxSigmaAll.at(i) - << ", nTracks=" << c->nTrackVtx.at(i) << ", and ntot track in all ROIs" << c->m_totSelTracks_All << endreq; + << ", nTracks=" << c->nTrackVtx.at(i) << ", and ntot track in all ROIs" << c->m_totSelTracks_All << endmsg; } if (msgLvl() <= MSG::DEBUG) { @@ -287,13 +287,13 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T const EventInfo* pEventInfo; if ( !store() || store()->retrieve(pEventInfo).isFailure() ) { - msg() << MSG::DEBUG << "Failed to get EventInfo " << endreq; + msg() << MSG::DEBUG << "Failed to get EventInfo " << endmsg; } else { msg() << MSG::DEBUG << "PrmVtx summary (Run " << pEventInfo->event_ID()->run_number() - << "; Event "<< pEventInfo->event_ID()->event_number() << ")" << endreq; - msg() << MSG::DEBUG << "REGTEST: Number of RoIs " << inputTE[0].size() << endreq; - msg() << MSG::DEBUG << "REGTEST: Tracks: " << c->m_totTracks_All << " reconstructed and " << c->m_totSelTracks_All <<" selected" << endreq; - msg() << MSG::DEBUG << "REGTEST: Primary vertex: " << c->zPrmVtx.at(0) << " +/ " << c->zPrmVtxSigmaAll.at(0) << " with " << c->nTrackVtx.at(0) << " tracks" << endreq; + << "; Event "<< pEventInfo->event_ID()->event_number() << ")" << endmsg; + msg() << MSG::DEBUG << "REGTEST: Number of RoIs " << inputTE[0].size() << endmsg; + msg() << MSG::DEBUG << "REGTEST: Tracks: " << c->m_totTracks_All << " reconstructed and " << c->m_totSelTracks_All <<" selected" << endmsg; + msg() << MSG::DEBUG << "REGTEST: Primary vertex: " << c->zPrmVtx.at(0) << " +/ " << c->zPrmVtxSigmaAll.at(0) << " with " << c->nTrackVtx.at(0) << " tracks" << endmsg; } } @@ -333,12 +333,12 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T if (stat != HLT::OK) { if (msgLvl() <= MSG::WARNING) - msg() << MSG::WARNING << "Failed to attach xAOD::VertexCollection to navigation" << endreq; + msg() << MSG::WARNING << "Failed to attach xAOD::VertexCollection to navigation" << endmsg; return stat; } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Attached xAOD::VertexCollection to navigation" << endreq; + msg() << MSG::DEBUG << "Attached xAOD::VertexCollection to navigation" << endmsg; } // since this is an AllTEAlgo, we have to call the monitoring ourselves: @@ -353,7 +353,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltExecute(std::vector<std::vector<HLT::T HLT::ErrorCode TrigT2HistoPrmVtxAllTE::hltFinalize() { if (msgLvl() <= MSG::INFO) - msg() << MSG::INFO << "Finalizing TrigT2HistoPrmVtxAllTE" << endreq; + msg() << MSG::INFO << "Finalizing TrigT2HistoPrmVtxAllTE" << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx index 8e15c51a402..ebd496289ed 100755 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx @@ -192,7 +192,7 @@ void TrigT2HistoPrmVtxBase::IPCorr(float d0, float z0, float& d0c, float& z0c, f d0c = d0 + m_xBeamSpot*sn - m_yBeamSpot*cs; if(m_xBeamSpot != 0 && m_yBeamSpot != 0 && m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endreq; + m_log << MSG::DEBUG << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endmsg; } else { double rc = fabs(pt)*15.0/(9.0*1.042); @@ -201,7 +201,7 @@ void TrigT2HistoPrmVtxBase::IPCorr(float d0, float z0, float& d0c, float& z0c, f double yc = (fabs(d0)-spt*sd0*rc)*sin(phi0+M_PI/2*sd0) - m_yBeamSpot; if(m_xBeamSpot != 0 && m_yBeamSpot != 0 && m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "Coordinates of the circle center in transverse plane = (" << xc << "," << yc << ")" << endreq; + m_log << MSG::DEBUG << "Coordinates of the circle center in transverse plane = (" << xc << "," << yc << ")" << endmsg; double newphi; double xd01,yd01,xd02,yd02; @@ -243,9 +243,9 @@ void TrigT2HistoPrmVtxBase::IPCorr(float d0, float z0, float& d0c, float& z0c, f z0c = z0 + deltaz0; if(m_xBeamSpot != 0 && m_yBeamSpot != 0 && m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "z0 (shifted) = " << z0c << " , z0 (referred to origin) = " << z0 << endreq; + m_log << MSG::DEBUG << "z0 (shifted) = " << z0c << " , z0 (referred to origin) = " << z0 << endmsg; if(m_xBeamSpot != 0 && m_yBeamSpot != 0 && m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endreq; + m_log << MSG::DEBUG << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endmsg; } } @@ -259,8 +259,8 @@ bool TrigT2HistoPrmVtxBase::efTrackSel(const xAOD::TrackParticle*& track, unsign if (fabs(track->eta()-eta) > 0.2) { if (m_logLvl <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "efTrackSel method" << endreq; - m_log << MSG::VERBOSE << " Track number " << i+1 << " is not selected (eta matching)" << endreq; + m_log << MSG::VERBOSE << "efTrackSel method" << endmsg; + m_log << MSG::VERBOSE << " Track number " << i+1 << " is not selected (eta matching)" << endmsg; } m_listCutApplied.push_back(0); @@ -269,8 +269,8 @@ bool TrigT2HistoPrmVtxBase::efTrackSel(const xAOD::TrackParticle*& track, unsign if (fabs(phiCorr(phiCorr(track->phi())-phiCorr(phi))) > 0.2) { if (m_logLvl <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "efTrackSel method" << endreq; - m_log << MSG::VERBOSE << " Track number " << i+1 << " is not selected (phi matching)" << endreq; + m_log << MSG::VERBOSE << "efTrackSel method" << endmsg; + m_log << MSG::VERBOSE << " Track number " << i+1 << " is not selected (phi matching)" << endmsg; } m_listCutApplied.push_back(1); @@ -302,26 +302,26 @@ bool TrigT2HistoPrmVtxBase::efTrackSel(const xAOD::TrackParticle*& track, unsign // IPCorr(track->d0(),track->z0(),d0,z0,track->phi(),track->eta(), pT); if (m_logLvl <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "efTrackSel method" << endreq; - m_log << MSG::VERBOSE << " Track number " << i+1 << " to be selected must be:" << endreq; - m_log << MSG::VERBOSE << " Pt " << fabs(pT) << " >= " << m_efTrkSelPt << endreq; - m_log << MSG::VERBOSE << " d0 " << fabs(d0) << " <= " << m_efTrkSelD0 << endreq; - m_log << MSG::VERBOSE << " bLayer " << (int)nBlay << " >= " << m_efTrkSelBLayer << endreq; - m_log << MSG::VERBOSE << " pixelHit " << (int)nPix << " >= " << m_efTrkSelPixHits << endreq; - m_log << MSG::VERBOSE << " SiHit " << nSi << " >= " << m_efTrkSelSiHits << endreq; - m_log << MSG::VERBOSE << " Prob(chi2) " << TMath::Prob(track->chiSquared(), (int)nSi*3-5) << " > " << m_efTrkSelChi2 << endreq; + m_log << MSG::VERBOSE << "efTrackSel method" << endmsg; + m_log << MSG::VERBOSE << " Track number " << i+1 << " to be selected must be:" << endmsg; + m_log << MSG::VERBOSE << " Pt " << fabs(pT) << " >= " << m_efTrkSelPt << endmsg; + m_log << MSG::VERBOSE << " d0 " << fabs(d0) << " <= " << m_efTrkSelD0 << endmsg; + m_log << MSG::VERBOSE << " bLayer " << (int)nBlay << " >= " << m_efTrkSelBLayer << endmsg; + m_log << MSG::VERBOSE << " pixelHit " << (int)nPix << " >= " << m_efTrkSelPixHits << endmsg; + m_log << MSG::VERBOSE << " SiHit " << nSi << " >= " << m_efTrkSelSiHits << endmsg; + m_log << MSG::VERBOSE << " Prob(chi2) " << TMath::Prob(track->chiSquared(), (int)nSi*3-5) << " > " << m_efTrkSelChi2 << endmsg; } if (fabs(pT) < m_efTrkSelPt) { if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (pT cut)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (pT cut)" << endmsg; m_listCutApplied.push_back(2); return false; } if (fabs(d0) > m_efTrkSelD0) { if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (d0 cut)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (d0 cut)" << endmsg; m_listCutApplied.push_back(3); return false; @@ -329,35 +329,35 @@ bool TrigT2HistoPrmVtxBase::efTrackSel(const xAOD::TrackParticle*& track, unsign // if (nBlay < m_efTrkSelBLayer) { if (expBL && (nBlay < m_efTrkSelBLayer) ){ if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (missing b-layer hit)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (missing b-layer hit)" << endmsg; m_listCutApplied.push_back(4); return false; } if (nPix < m_efTrkSelPixHits) { if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (too few pixel hits)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (too few pixel hits)" << endmsg; m_listCutApplied.push_back(5); return false; } if (nSi < m_efTrkSelSiHits) { if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (too few silicon hits)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (too few silicon hits)" << endmsg; m_listCutApplied.push_back(6); return false; } if (TMath::Prob(track->chiSquared(), (int)nSi*3-5) <= m_efTrkSelChi2) { if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is not selected (chi2 cut)" << endreq; + m_log << MSG::VERBOSE << " track is not selected (chi2 cut)" << endmsg; m_listCutApplied.push_back(7); return false; } if (m_logLvl <= MSG::VERBOSE) - m_log << MSG::VERBOSE << " track is selected" << endreq; + m_log << MSG::VERBOSE << " track is selected" << endmsg; m_listCutApplied.push_back(8); return true; @@ -377,7 +377,7 @@ void TrigT2HistoPrmVtxBase::findPrmVtx() { nVtxFound=0; if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "Finding primary vertex candidates:" << " histogram with " << m_hisVtx->getNBin() << " bins" << endreq; + m_log << MSG::DEBUG << "Finding primary vertex candidates:" << " histogram with " << m_hisVtx->getNBin() << " bins" << endmsg; for (int j=0; j<3; j++) { val=0; @@ -400,7 +400,7 @@ void TrigT2HistoPrmVtxBase::findPrmVtx() { if (m_logLvl <= MSG::VERBOSE) { m_log << MSG::VERBOSE << " maxVal[" << j << "] = " << maxVal[j] - << " pos[" << j << "] = " << pos[j] << endreq; + << " pos[" << j << "] = " << pos[j] << endmsg; } for (int i = pos[j]; i < (pos[j]+m_nBins); i++) { diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxCombo.cxx b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxCombo.cxx index eb58b02f24a..9690fb2e29e 100755 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxCombo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxCombo.cxx @@ -48,12 +48,12 @@ HLT::ErrorCode TrigT2HistoPrmVtxCombo::acceptInputs(HLT::TEConstVec& inputTE, bo // sanity check there has to be as many input Te as ROIS if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Running TrigT2HistoPrmVtxCombo::acceptInputs, got: " << inputTE.size() << " TE as input " << endreq; + msg() << MSG::DEBUG << "Running TrigT2HistoPrmVtxCombo::acceptInputs, got: " << inputTE.size() << " TE as input " << endmsg; m_nTeCounter = inputTE.size(); // Monitoring variable if ( inputTE.size() != 2) { - msg() << MSG::WARNING << "Got less than 2 input TE " << m_nTeCounter << endreq; + msg() << MSG::WARNING << "Got less than 2 input TE " << m_nTeCounter << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::MISSING_FEATURE); } @@ -66,7 +66,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxCombo::acceptInputs(HLT::TEConstVec& inputTE, bo HLT::ErrorCode TrigT2HistoPrmVtxCombo::hltExecute(HLT::TEConstVec& /*inputTE*/, HLT::TriggerElement* /*outputTE*/){ if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "Running TrigT2HistoPrmVtxCombo::hltExecute" << endreq; + msg() << MSG::DEBUG << "Running TrigT2HistoPrmVtxCombo::hltExecute" << endmsg; return HLT::OK; } @@ -74,7 +74,7 @@ HLT::ErrorCode TrigT2HistoPrmVtxCombo::hltExecute(HLT::TEConstVec& /*inputTE*/, HLT::ErrorCode TrigT2HistoPrmVtxCombo::hltFinalize() { if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "in finalize()" << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx index 3e4962a6700..c52ca0f8b8f 100644 --- a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx +++ b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTau.cxx @@ -60,26 +60,26 @@ T2IDTau::~T2IDTau(){ HLT::ErrorCode T2IDTau::hltInitialize() /*-------------------------------------------*/ { - msg() << MSG::DEBUG << "REGTEST: in initilize" << endreq; - msg() << MSG::DEBUG << "REGTEST: Core cone: dR < " << m_dRCore << endreq; - msg() << MSG::DEBUG << "REGTEST: Isolation annulus: "<< m_dRCore << " < dR < " << m_dRIso << endreq; - msg() << MSG::DEBUG << "REGTEST: Consider tracks with pt > " << m_ptMin << endreq; - msg() << MSG::DEBUG << "REGTEST: Slow tracks have pt < "<< m_ptSlowMax << endreq; + msg() << MSG::DEBUG << "REGTEST: in initilize" << endmsg; + msg() << MSG::DEBUG << "REGTEST: Core cone: dR < " << m_dRCore << endmsg; + msg() << MSG::DEBUG << "REGTEST: Isolation annulus: "<< m_dRCore << " < dR < " << m_dRIso << endmsg; + msg() << MSG::DEBUG << "REGTEST: Consider tracks with pt > " << m_ptMin << endmsg; + msg() << MSG::DEBUG << "REGTEST: Slow tracks have pt < "<< m_ptSlowMax << endmsg; - if ( m_dZ0Max >= 0.0 ) msg() << MSG::DEBUG << "REGTEST: track selection |DeltaZ0| wrt LdPtTrk <= "<< m_dZ0Max << endreq; - else msg() << MSG::DEBUG << "REGTEST: no track selection based on |DeltaZ0|" << endreq; + if ( m_dZ0Max >= 0.0 ) msg() << MSG::DEBUG << "REGTEST: track selection |DeltaZ0| wrt LdPtTrk <= "<< m_dZ0Max << endmsg; + else msg() << MSG::DEBUG << "REGTEST: no track selection based on |DeltaZ0|" << endmsg; - if ( m_centerAroundLeadingTrack ) msg() << MSG::DEBUG << "REGTEST: Isolation cones are centered around leading track direction" << endreq; - else msg() << MSG::DEBUG << "REGTEST: Isolation cones are centered ar RoI center " << endreq; + if ( m_centerAroundLeadingTrack ) msg() << MSG::DEBUG << "REGTEST: Isolation cones are centered around leading track direction" << endmsg; + else msg() << MSG::DEBUG << "REGTEST: Isolation cones are centered ar RoI center " << endmsg; - if ( m_secondStep ) msg() << MSG::DEBUG << "REGTEST: This algorithm is configured as second step, will find LdTrk from inputTE" << endreq; - else msg() << MSG::DEBUG << "REGTEST: This algorithm is configured as either single step or first step" << endreq; + if ( m_secondStep ) msg() << MSG::DEBUG << "REGTEST: This algorithm is configured as second step, will find LdTrk from inputTE" << endmsg; + else msg() << MSG::DEBUG << "REGTEST: This algorithm is configured as either single step or first step" << endmsg; - if ( m_TrigTrackingAlgoLabel != "" ) msg() << MSG::DEBUG << "REGTEST: take track Collection with label = " << m_TrigTrackingAlgoLabel << endreq; - else msg() << MSG::DEBUG << "REGTEST: take latest track Collection found in TE " << endreq; + if ( m_TrigTrackingAlgoLabel != "" ) msg() << MSG::DEBUG << "REGTEST: take track Collection with label = " << m_TrigTrackingAlgoLabel << endmsg; + else msg() << MSG::DEBUG << "REGTEST: take latest track Collection found in TE " << endmsg; - if ( m_updateRoiDescriptor ) msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endreq; - else msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endreq; + if ( m_updateRoiDescriptor ) msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endmsg; + else msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endmsg; return HLT::OK; } @@ -89,7 +89,7 @@ HLT::ErrorCode T2IDTau::hltFinalize() /*-------------------------------------------*/ { - msg() << MSG::DEBUG << "in finalize()" << endreq; + msg() << MSG::DEBUG << "in finalize()" << endmsg; return HLT::OK; } @@ -100,7 +100,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca { if (msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG << "in execute()" << endreq; + msg() << MSG::DEBUG << "in execute()" << endmsg; } m_nCoreTracks = -1; @@ -130,9 +130,9 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca << " word " << roiDescriptor->roiWord() << " LVL1 id " << roiDescriptor->l1Id() << " located at eta=" << roiDescriptor->eta() - << ", phi=" << roiDescriptor->phi() << endreq; + << ", phi=" << roiDescriptor->phi() << endmsg; } else { - msg() << MSG::ERROR << " No RoI Descriptor for this Trigger Element! " << endreq; + msg() << MSG::ERROR << " No RoI Descriptor for this Trigger Element! " << endmsg; return hltStatus; } @@ -143,14 +143,14 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca hltStatus = getFeature(outputTE, tracks); if (msgLvl() <= MSG::DEBUG) { - if(hltStatus== HLT::OK) msg() << MSG::DEBUG << "REGTEST: Got TrigInDetTrackCollection with label "<< m_TrigTrackingAlgoLabel << endreq; - else msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI! hltStatus = "<<hltStatus << endreq; + if(hltStatus== HLT::OK) msg() << MSG::DEBUG << "REGTEST: Got TrigInDetTrackCollection with label "<< m_TrigTrackingAlgoLabel << endmsg; + else msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI! hltStatus = "<<hltStatus << endmsg; } //-------- 3 Make new object if( tracks == 0 || tracks->size() == 0 ){ if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI or it is empty! hltStatus =HLT::OK" << endreq; + msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI or it is empty! hltStatus =HLT::OK" << endmsg; return HLT::OK; } @@ -167,17 +167,17 @@ 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" << endreq;; + 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) { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Got TrigInDetTrackCollection from inputTE "<< endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Got TrigInDetTrackCollection from inputTE "<< endmsg; } else { - msg() << MSG::ERROR << "No TrigInDetTrackCollection is found in inputTE! RETURNING" << endreq; + msg() << MSG::ERROR << "No TrigInDetTrackCollection is found in inputTE! RETURNING" << endmsg; return hltStatus; } } else { - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Finding leading track in outputTE" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Finding leading track in outputTE" << endmsg; firstTracks = tracks; } @@ -195,14 +195,14 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca z01 = (*itrack)->param()->z0(); } } // end loop over tracks - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: second step: " << m_secondStep << ", leading track pt = " << pt1 << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: second step: " << m_secondStep << ", leading track pt = " << pt1 << endmsg; if( m_centerAroundLeadingTrack && p1 != firstTracks->end() ) { eta = (*p1)->param()->eta(); phi = (*p1)->param()->phi0(); } - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Center of core area is at eta="<< eta << ", phi=" << phi << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Center of core area is at eta="<< eta << ", phi=" << phi << endmsg; @@ -234,7 +234,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca for(TrigInDetTrackCollection::const_iterator itrack = tracks->begin(); itrack != tracks->end(); ++itrack ) { if( (*itrack)->param() == 0 ) { - if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " Found TrigInDetTrack with undefined parameters" << endreq; + if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " Found TrigInDetTrack with undefined parameters" << endmsg; continue; } @@ -242,7 +242,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Found track pT = " << (*itrack)->param()->pT() << " eta = " << (*itrack)->param()->eta() << " phi0 = " << (*itrack)->param()->phi0() - << " AlgId = " << int((*itrack)->algorithmId()) << endreq; + << " AlgId = " << int((*itrack)->algorithmId()) << endmsg; //min Pt selection @@ -263,7 +263,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca double dR = dPhi*dPhi + dEta*dEta; if( dR < dRCore2 ){ - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " added to core " << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " added to core " << endmsg; double tpx = pt*cos((*itrack)->param()->phi0()); double tpy = pt*sin((*itrack)->param()->phi0()); double tpz = pt/tan(2.*atan(exp(-(*itrack)->param()->eta()))); @@ -293,7 +293,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca }else if( dR < dRIso2 ) { - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " added to isolation area " << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " added to isolation area " << endmsg; nIsoTracks++; scalarPtSumIso += pt; } @@ -353,7 +353,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca hltStatus = attachFeature(outputTE, pTrackInfo ); if (hltStatus != HLT::OK ){ - msg() << MSG::ERROR << "Write of TrigTauTracksInfo into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of TrigTauTracksInfo into outputTE failed" << endmsg; return hltStatus; } @@ -368,23 +368,23 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca hltStatus = attachFeature(outputTE, newRoiDescriptor,m_TrigTrackingAlgoLabel); // use same label as tracking if (hltStatus != HLT::OK ){ - msg() << MSG::ERROR << "Can not attach new RoI descriptor" << endreq; + msg() << MSG::ERROR << "Can not attach new RoI descriptor" << endmsg; return hltStatus; } if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Recorded an RoiDescriptor " << roiDescriptor->roiWord() << ", eta=" << newRoiDescriptor->eta() - << ", phi=" << newRoiDescriptor->phi() << endreq; + << ", phi=" << newRoiDescriptor->phi() << endmsg; } if(msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG << "REGTEST: TrigTauTrackInfo::pt,eta,phi = " << pTrackInfo->pt() <<", " << pTrackInfo->eta() <<", " << pTrackInfo->phi() << endreq; - msg() << MSG::DEBUG << "REGTEST: leading Pt " << pTrackInfo->leadingTrackPt() << endreq; + msg() << MSG::DEBUG << "REGTEST: TrigTauTrackInfo::pt,eta,phi = " << pTrackInfo->pt() <<", " << pTrackInfo->eta() <<", " << pTrackInfo->phi() << endmsg; + msg() << MSG::DEBUG << "REGTEST: leading Pt " << pTrackInfo->leadingTrackPt() << endmsg; msg() << MSG::DEBUG << "REGTEST: 3 fastests tracks pt, eta, phi = " << pTrackInfo->threeFastestTracks().pt() - <<", " << pTrackInfo->threeFastestTracks().eta() <<", " << pTrackInfo->threeFastestTracks().phi() << endreq; + <<", " << pTrackInfo->threeFastestTracks().eta() <<", " << pTrackInfo->threeFastestTracks().phi() << endmsg; msg() << MSG::DEBUG << "REGTEST: NCore= " << pTrackInfo->nCoreTracks() << ", NSlow= " << pTrackInfo->nSlowTracks() << ", NIso= " << pTrackInfo->nIsoTracks() - <<", Charge="<<pTrackInfo->charge() << endreq; + <<", Charge="<<pTrackInfo->charge() << endmsg; msg() << MSG::DEBUG << "REGTEST: sumPtCore=" << pTrackInfo->scalarPtSumCore() << ", sumPtIso="<< pTrackInfo->scalarPtSumIso() - << ", ptBalance="<<pTrackInfo->ptBalance() << endreq; + << ", ptBalance="<<pTrackInfo->ptBalance() << endmsg; } @@ -409,7 +409,7 @@ HLT::ErrorCode T2IDTau::hltExecute(const HLT::TriggerElement* inputTE, //ccuenca else m_sumPtRatio = pTrackInfo->scalarPtSumIso()*(1./40000.); // assume 40 GeV is average candidate. // Reach this point successfully - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: always accept RoI " << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: always accept RoI " << endmsg; return HLT::OK; } @@ -420,9 +420,9 @@ HLT::ErrorCode T2IDTau::getPrmVtxCollection(const TrigVertexCollection*& pointer HLT::ErrorCode status = getFeatures(outputTE, vectorOfL2PrmVtxCollections, ""); if (status != HLT::OK) { - msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endreq; + msg() << MSG::ERROR << "Failed to get TrigVertexCollection from the trigger element" << endmsg; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got " << vectorOfL2PrmVtxCollections.size() << " TrigVertexCollection" << endreq; + msg() << MSG::DEBUG << "Got " << vectorOfL2PrmVtxCollections.size() << " TrigVertexCollection" << endmsg; std::vector<const TrigVertexCollection*>::iterator pPrmVtxColl = vectorOfL2PrmVtxCollections.begin(); std::vector<const TrigVertexCollection*>::iterator lastPrmVtxColl = vectorOfL2PrmVtxCollections.end(); @@ -432,7 +432,7 @@ HLT::ErrorCode T2IDTau::getPrmVtxCollection(const TrigVertexCollection*& pointer for ( ; pPrmVtxColl != lastPrmVtxColl; pPrmVtxColl++) { if ((*pPrmVtxColl)->size() != 0) - msg() << MSG::VERBOSE << "TrigVertexCollection with label " << (*pPrmVtxColl)->front()->algorithmId() << endreq; + msg() << MSG::VERBOSE << "TrigVertexCollection with label " << (*pPrmVtxColl)->front()->algorithmId() << endmsg; } pPrmVtxColl = vectorOfL2PrmVtxCollections.begin(); @@ -446,14 +446,14 @@ HLT::ErrorCode T2IDTau::getPrmVtxCollection(const TrigVertexCollection*& pointer // if (m_algo == 1) { // if ((*pPrmVtxColl)->front()->algorithmId() == 3) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endreq; + msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endmsg; break; // } // } // else if (m_algo == 2) { // if ((*pPrmVtxColl)->front()->algorithmId() == 10) { // if (msgLvl() <= MSG::DEBUG) -// msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endreq; +// msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endmsg; // break; } // } @@ -461,7 +461,7 @@ HLT::ErrorCode T2IDTau::getPrmVtxCollection(const TrigVertexCollection*& pointer /* else if (m_instance == "EF") { if ((*pPrmVtxColl)->front()->algorithmId() == 11) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endreq; + msg() << MSG::DEBUG << "Selected collection with TrigT2HistoPrmVtx label " << (*pPrmVtxColl)->front()->algorithmId() << endmsg; break; } } diff --git a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTauIPHelper.cxx b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTauIPHelper.cxx index bc01fbef949..4db618d801a 100644 --- a/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTauIPHelper.cxx +++ b/Trigger/TrigAlgorithms/TrigT2IDTau/src/T2IDTauIPHelper.cxx @@ -41,18 +41,18 @@ T2IDTauIPHelper::~T2IDTauIPHelper() {} void T2IDTauIPHelper::showParam(const TrigInDetTrack*& track, unsigned int i) { //* Print track impact parameters at L2 *// - m_log << MSG::VERBOSE << "Print track impact parameters at L2:" << endreq; - m_log << MSG::VERBOSE << " Track number " << i+1 << endreq; + m_log << MSG::VERBOSE << "Print track impact parameters at L2:" << endmsg; + m_log << MSG::VERBOSE << " Track number " << i+1 << endmsg; m_log << MSG::VERBOSE << " d0 = " << track->param()->a0() << " z0 = " << track->param()->z0() << " eta = " << track->param()->eta() << " phi0 = " << track->param()->phi0() - << " pT = " << track->param()->pT() << endreq; + << " pT = " << track->param()->pT() << endmsg; m_log << MSG::VERBOSE << " errd0 = " << track->param()->ea0() << " errz0 = " << track->param()->ez0() << " errphi0 = " << track->param()->ephi0() << " erreta = " << track->param()->eeta() - << " errpT = " << track->param()->epT() << endreq; + << " errpT = " << track->param()->epT() << endmsg; } @@ -63,13 +63,13 @@ void T2IDTauIPHelper::showParam(const TrigInDetTrack*& track, unsigned int i) { void T2IDTauIPHelper::showParam(const Rec::TrackParticle*& track, unsigned int i) { //* Print track impact parameters at EF *// - m_log << MSG::VERBOSE << "getParam method" << endreq; - m_log << MSG::VERBOSE << " Track number " << i+1 << endreq; + m_log << MSG::VERBOSE << "getParam method" << endmsg; + m_log << MSG::VERBOSE << " Track number " << i+1 << endmsg; m_log << MSG::VERBOSE << " d0 = " << track->measuredPerigee()->parameters()[Trk::d0] << " z0 = " << track->measuredPerigee()->parameters()[Trk::z0] << " eta = " << track->measuredPerigee()->parameters()[Trk::theta] << " phi0 = " << track->measuredPerigee()->parameters()[Trk::phi0] - << " pT = " << track->pt() << endreq; + << " pT = " << track->pt() << endmsg; //* Extract covariance matrix using new EDM *// const AmgSymMatrix(5)* covariance = track->measuredPerigee()->covariance(); @@ -80,7 +80,7 @@ void T2IDTauIPHelper::showParam(const Rec::TrackParticle*& track, unsigned int i << " errz0**2 = " << (*covariance)(Trk::z0, Trk::z0) << " errphi0**2 = " << (*covariance)(Trk::phi0, Trk::phi0) << " erreta**2 = " << (*covariance)(Trk::theta, Trk::theta) - << " errqOverP**2 = " << (*covariance)(Trk::qOverP, Trk::qOverP) << endreq; + << " errqOverP**2 = " << (*covariance)(Trk::qOverP, Trk::qOverP) << endmsg; } } @@ -94,16 +94,16 @@ unsigned int T2IDTauIPHelper::getTrackNumber(const TrigInDetTrackCollection* poi unsigned int nTracks=-999; // if (m_logLvl <= MSG::DEBUG) -// m_log << MSG::DEBUG << "Get track number from tagger helper" << endreq; +// m_log << MSG::DEBUG << "Get track number from tagger helper" << endmsg; if (pointerToL2TrackCollections) { nTracks = pointerToL2TrackCollections->size(); // if (m_logLvl <= MSG::DEBUG) - // m_log << MSG::DEBUG << "Found " << nTracks << " tracks in the RoI" << endreq; + // m_log << MSG::DEBUG << "Found " << nTracks << " tracks in the RoI" << endmsg; } else { nTracks = 0; // if (m_logLvl <= MSG::DEBUG) - // m_log << MSG::DEBUG << "No tracks in the RoI" << endreq; + // m_log << MSG::DEBUG << "No tracks in the RoI" << endmsg; } return nTracks; @@ -120,11 +120,11 @@ unsigned int T2IDTauIPHelper::getTrackNumber(const Rec::TrackParticleContainer* if (pointerToEFTrackCollections) { nTracks = pointerToEFTrackCollections->size(); if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "Found " << nTracks << " tracks in the RoI" << endreq; + m_log << MSG::DEBUG << "Found " << nTracks << " tracks in the RoI" << endmsg; } else { nTracks = 0; if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "No tracks in the RoI" << endreq; + m_log << MSG::DEBUG << "No tracks in the RoI" << endmsg; } return nTracks; @@ -141,11 +141,11 @@ unsigned int T2IDTauIPHelper::getVerticesNumber(const TrigVertexCollection*& poi if (pointerToPrmVtxCollections) { nVertices = pointerToPrmVtxCollections->size(); if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "Found " << nVertices << " vertices in the RoI" << endreq; + m_log << MSG::DEBUG << "Found " << nVertices << " vertices in the RoI" << endmsg; } else { nVertices = 0; if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "No vertices in the RoI" << endreq; + m_log << MSG::DEBUG << "No vertices in the RoI" << endmsg; } return nVertices; @@ -162,11 +162,11 @@ unsigned int T2IDTauIPHelper::getVerticesNumber(const VxContainer*& pointerToPrm if (pointerToPrmVtxCollections) { nVertices = pointerToPrmVtxCollections->size(); if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "Found " << nVertices << " primary vertices in the RoI" << endreq; + m_log << MSG::DEBUG << "Found " << nVertices << " primary vertices in the RoI" << endmsg; } else { nVertices = 0; if (m_logLvl <= MSG::DEBUG) - m_log << MSG::DEBUG << "No vertices in the RoI" << endreq; + m_log << MSG::DEBUG << "No vertices in the RoI" << endmsg; } return nVertices; @@ -227,7 +227,7 @@ void T2IDTauIPHelper::IPCorr(float d0, float z0, float& d0c, float& z0c, float p d0c = d0 + xBeamSpot*sn - yBeamSpot*cs; // if(xBeamSpot != 0 && yBeamSpot != 0 && m_logLvl <= MSG::VERBOSE) -// m_log << MSG::VERBOSE << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endreq; +// m_log << MSG::VERBOSE << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endmsg; } else { double rc = fabs(pt)*(15.0/(9.0*1.042)); @@ -236,7 +236,7 @@ void T2IDTauIPHelper::IPCorr(float d0, float z0, float& d0c, float& z0c, float p double yc = (fabs(d0)-spt*sd0*rc)*sin(phi0+M_PI/2*sd0) - yBeamSpot; // if(xBeamSpot != 0 && yBeamSpot != 0 && m_logLvl <= MSG::VERBOSE) -// m_log << MSG::VERBOSE << "Coordinates of the circle center in transverse plane = (" << xc << "," << yc << ")" << endreq; +// m_log << MSG::VERBOSE << "Coordinates of the circle center in transverse plane = (" << xc << "," << yc << ")" << endmsg; double newphi; double xd01,yd01,xd02,yd02; @@ -279,9 +279,9 @@ void T2IDTauIPHelper::IPCorr(float d0, float z0, float& d0c, float& z0c, float p z0c = z0 + deltaz0; // if(xBeamSpot != 0 && yBeamSpot != 0 && m_logLvl <= MSG::VERBOSE) -// m_log << MSG::VERBOSE << "z0 (shifted) = " << z0c << " , z0 (referred to origin) = " << z0 << endreq; +// m_log << MSG::VERBOSE << "z0 (shifted) = " << z0c << " , z0 (referred to origin) = " << z0 << endmsg; // if(xBeamSpot != 0 && yBeamSpot != 0 && m_logLvl <= MSG::VERBOSE) -// m_log << MSG::VERBOSE << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endreq; +// m_log << MSG::VERBOSE << "d0 (shifted) = " << d0c << " , d0 (referred to origin) = " << d0 << endmsg; } } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsFex.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsFex.cxx index fe7721bd59f..ece8d2e79d9 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsFex.cxx @@ -85,7 +85,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement // First check whether we executed this instance before: if(m_useCachedResult) { if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endreq; + m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endmsg; } // Get all input TEs (for seeding relation of navigation structure) @@ -111,7 +111,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement } if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this T2MbtsFex as " << name() << endreq; + m_log << MSG::DEBUG << "Executing this T2MbtsFex as " << name() << endmsg; } // start monitoring @@ -121,12 +121,12 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement const xAOD::EventInfo* evinfo(0); StatusCode sc = store()->retrieve(evinfo); if( sc.isFailure() ){ - m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG." << endreq; + m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG." << endmsg; return HLT::SG_ERROR; } else { m_BCID = evinfo->bcid(); - m_log << MSG::DEBUG << "BCID is " << m_BCID << endreq; + m_log << MSG::DEBUG << "BCID is " << m_BCID << endmsg; } // Reset errors @@ -145,7 +145,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement if(msgLvl() <= MSG::WARNING) { if(m_itBegin == m_itEnd) { - m_log << MSG::WARNING << "The MBTS TileCellCollection has no elements!" << endreq; + m_log << MSG::WARNING << "The MBTS TileCellCollection has no elements!" << endmsg; } } @@ -178,27 +178,27 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement unsigned int module_id = m_tileTBID->module(id); if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "type_id = " << type_id << endreq; - m_log << MSG::DEBUG << "channel_id = " << channel_id << endreq; - m_log << MSG::DEBUG << "module_id = " << module_id << endreq; + m_log << MSG::DEBUG << "type_id = " << type_id << endmsg; + m_log << MSG::DEBUG << "channel_id = " << channel_id << endmsg; + m_log << MSG::DEBUG << "module_id = " << module_id << endmsg; } // Catch errors if(abs(type_id) != 1) { if(msgLvl() <= MSG::WARNING) { - m_log << MSG::WARNING << "MBTS identifier type is out of range" << endreq; + m_log << MSG::WARNING << "MBTS identifier type is out of range" << endmsg; } continue; } if( channel_id > 1 ){ if(msgLvl() <= MSG::WARNING) { - m_log << MSG::WARNING << "MBTS identifier channel is out of range" << endreq; + m_log << MSG::WARNING << "MBTS identifier channel is out of range" << endmsg; } continue; } if( module_id > 7 ){ if(msgLvl() <= MSG::WARNING) { - m_log << MSG::WARNING << "MBTS identifier module is out of range" << endreq; + m_log << MSG::WARNING << "MBTS identifier module is out of range" << endmsg; } continue; } @@ -214,24 +214,24 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement unsigned int nTriggerEnergies = m_triggerEnergies.size(); if(bit_pos > (nTriggerEnergies-1)) { - m_log << MSG::ERROR << "Bit pos " << bit_pos << " is greater than the size of the energy vector " << nTriggerEnergies << endreq; + m_log << MSG::ERROR << "Bit pos " << bit_pos << " is greater than the size of the energy vector " << nTriggerEnergies << endmsg; } else { m_triggerEnergies[bit_pos] = (*m_itt)->energy(); m_triggerID[bit_pos] = bit_pos; if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Counter id = " << bit_pos << ", energy = " << m_triggerEnergies[bit_pos] << " pC" << endreq; + m_log << MSG::DEBUG << "Counter id = " << bit_pos << ", energy = " << m_triggerEnergies[bit_pos] << " pC" << endmsg; } } unsigned int nTriggerTimes = m_triggerTimes.size(); if(bit_pos > (nTriggerTimes-1)) { - m_log << MSG::ERROR << "Bit pos " << bit_pos << " is greater than the size of the time vector " << nTriggerTimes << endreq; + m_log << MSG::ERROR << "Bit pos " << bit_pos << " is greater than the size of the time vector " << nTriggerTimes << endmsg; } else { m_triggerTimes[bit_pos] = (*m_itt)->time(); if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Counter id = " << bit_pos << ", time = " << m_triggerTimes[bit_pos] << " ns" << endreq; + m_log << MSG::DEBUG << "Counter id = " << bit_pos << ", time = " << m_triggerTimes[bit_pos] << " ns" << endmsg; } } } @@ -248,7 +248,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement // Calculate the multiplicities to fill the monitoring variables if(!calculateMultiplicities(m_t2MbtsBits,0,m_log,msgLvl())) { - m_log << MSG::DEBUG << "calculateMultiplicities failed" << endreq; + m_log << MSG::DEBUG << "calculateMultiplicities failed" << endmsg; return HLT::OK; } @@ -265,7 +265,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement HLT::TEVec::const_iterator inner_itEnd = (*it).end(); for(HLT::TEVec::const_iterator inner_it = (*it).begin(); inner_it != inner_itEnd; ++inner_it ){ if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endreq; + m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endmsg; } allTEs.push_back(*inner_it); } @@ -278,7 +278,7 @@ HLT::ErrorCode T2MbtsFex::hltExecute(std::vector<std::vector<HLT::TriggerElement HLT::ErrorCode hltStatus = attachFeature(outputTE, m_t2MbtsBits, "T2Mbts"); if(hltStatus != HLT::OK) { if(msgLvl() <= MSG::ERROR) { - m_log << MSG::ERROR << "Write of TrigEMCluster into outputTE failed" << endreq; + m_log << MSG::ERROR << "Write of TrigEMCluster into outputTE failed" << endmsg; } return hltStatus; } @@ -302,18 +302,18 @@ HLT::ErrorCode T2MbtsFex::hltInitialize() { m_log.setLevel(outputLevel()); if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "in T2MbtsFex::initialize()" << endreq; + m_log << MSG::INFO << "in T2MbtsFex::initialize()" << endmsg; } if(m_data.retrieve().isFailure()) { - m_log << MSG::ERROR << "Could not get m_data" << endreq; + m_log << MSG::ERROR << "Could not get m_data" << endmsg; return StatusCode::FAILURE; } // Connect to the Detector Store to retrieve TileTBID. if(m_detStore.retrieve().isFailure()) { m_log << MSG::ERROR << "Couldn't connect to " << m_detStore.typeAndName() - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -321,7 +321,7 @@ HLT::ErrorCode T2MbtsFex::hltInitialize() { // (The MBTS was added to the Test Beam (TB) list.) if(m_detStore->retrieve(m_tileTBID).isFailure()) { m_log << MSG::ERROR - << "Unable to retrieve TileTBID helper from DetectorStore" << endreq; + << "Unable to retrieve TileTBID helper from DetectorStore" << endmsg; return StatusCode::FAILURE; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsHypo.cxx index 0aabf8d49fa..91809beb058 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsHypo.cxx @@ -76,32 +76,32 @@ T2MbtsHypo::T2MbtsHypo(const std::string &name, HLT::ErrorCode T2MbtsHypo::hltInitialize() { m_log.setLevel(outputLevel()); if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "Initialising this T2MbtsFex: " << name() << endreq; + m_log << MSG::INFO << "Initialising this T2MbtsFex: " << name() << endmsg; - m_log << MSG::INFO << "================ Hypo Settings ================" << endreq; - m_log << MSG::INFO << " AcceptAll ------------------- " << (m_acceptAll==true ? "True" : "False") << endreq; - m_log << MSG::INFO << " MbtsCounters required ------- " << m_mbtsCounters << endreq; - m_log << MSG::INFO << " Coincidence requirement ----- " << (m_coincidence==true ? "True" : "False") << endreq; - m_log << MSG::INFO << " Veto requirement ------------ " << (m_veto==true ? "True" : "False") << endreq; - m_log << MSG::INFO << " MBTS mode ------------------- " << (m_mbtsmode==0 ? "All" : ( m_mbtsmode==1 ? "Inner" : "Outer")) << endreq; - m_log << MSG::INFO << " Threshold ------------------- " << m_threshold << " pC" << endreq; + m_log << MSG::INFO << "================ Hypo Settings ================" << endmsg; + m_log << MSG::INFO << " AcceptAll ------------------- " << (m_acceptAll==true ? "True" : "False") << endmsg; + m_log << MSG::INFO << " MbtsCounters required ------- " << m_mbtsCounters << endmsg; + m_log << MSG::INFO << " Coincidence requirement ----- " << (m_coincidence==true ? "True" : "False") << endmsg; + m_log << MSG::INFO << " Veto requirement ------------ " << (m_veto==true ? "True" : "False") << endmsg; + m_log << MSG::INFO << " MBTS mode ------------------- " << (m_mbtsmode==0 ? "All" : ( m_mbtsmode==1 ? "Inner" : "Outer")) << endmsg; + m_log << MSG::INFO << " Threshold ------------------- " << m_threshold << " pC" << endmsg; m_log << MSG::INFO << " TimeCut -------------------- "; if(m_timeCut<0) { - m_log << MSG::INFO << "Off" << endreq; + m_log << MSG::INFO << "Off" << endmsg; } else { - m_log << MSG::INFO << m_timeCut << " ns" << endreq; - m_log << MSG::INFO << " GlobalTimeOffset ----------- " << m_globalTimeOffset << " ns" << endreq; + m_log << MSG::INFO << m_timeCut << " ns" << endmsg; + m_log << MSG::INFO << " GlobalTimeOffset ----------- " << m_globalTimeOffset << " ns" << endmsg; m_log << MSG::INFO << " TimeOffsets (A0 to C16) ----- "; for(int i=0; i<32; i++) m_log << MSG::INFO << m_timeOffsets[i] << " "; - m_log << MSG::INFO << " ns" << endreq; + m_log << MSG::INFO << " ns" << endmsg; } - m_log << MSG::INFO << "===============================================" << endreq; + m_log << MSG::INFO << "===============================================" << endmsg; } // little consistency checker if ( m_or && m_coincidence ) { - m_log << MSG::ERROR << "The Or and Coincidence logics can not be used together" << endreq; + m_log << MSG::ERROR << "The Or and Coincidence logics can not be used together" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } @@ -113,7 +113,7 @@ HLT::ErrorCode T2MbtsHypo::hltInitialize() { HLT::ErrorCode T2MbtsHypo::hltExecute(const HLT::TriggerElement* outputTE, bool& pass) { if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this T2MbtsHypo " << name() << endreq; + m_log << MSG::DEBUG << "Executing this T2MbtsHypo " << name() << endmsg; } pass = false; @@ -121,14 +121,14 @@ HLT::ErrorCode T2MbtsHypo::hltExecute(const HLT::TriggerElement* outputTE, // Try to retrieve the TrigT2MbtsBits object produced by the Fex if(getFeature(outputTE, m_t2MbtsBits, "T2Mbts") != HLT::OK){ if(msgLvl() <= MSG::WARNING){ - m_log << MSG::WARNING << "Failed to retrieve features from TE." << endreq; + m_log << MSG::WARNING << "Failed to retrieve features from TE." << endmsg; } return HLT::OK; } // If the object is not available the trigger fails without complaint. if(!m_t2MbtsBits){ - m_log << MSG::DEBUG << "No trigger bits formed." << endreq; + m_log << MSG::DEBUG << "No trigger bits formed." << endmsg; return HLT::OK; } @@ -139,7 +139,7 @@ HLT::ErrorCode T2MbtsHypo::hltExecute(const HLT::TriggerElement* outputTE, // Calculate MBTS counter multiplicities after energy and an optional time cut. if(!calculateMultiplicities(m_t2MbtsBits,m_mbtsmode, m_log,msgLvl())) { - m_log << MSG::DEBUG << "calculateMultiplicities failed" << endreq; + m_log << MSG::DEBUG << "calculateMultiplicities failed" << endmsg; return HLT::OK; } @@ -150,7 +150,7 @@ HLT::ErrorCode T2MbtsHypo::hltExecute(const HLT::TriggerElement* outputTE, m_selMultEBA = m_mult.first; m_selMultEBC = m_mult.second; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endmsg; return HLT::OK; } @@ -185,7 +185,7 @@ HLT::ErrorCode T2MbtsHypo::hltExecute(const HLT::TriggerElement* outputTE, } if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "REGTEST: event " << (pass?"accepted":"failed") << " with EBA(" << m_mult.first << ") + EBC(" << m_mult.second << ") hits above threshold." << endreq; + m_log << MSG::DEBUG << "REGTEST: event " << (pass?"accepted":"failed") << " with EBA(" << m_mult.first << ") + EBC(" << m_mult.second << ") hits above threshold." << endmsg; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsUtils.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsUtils.cxx index 41cf865172e..e71c1088f02 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsUtils.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2MbtsUtils.cxx @@ -28,17 +28,17 @@ int T2MbtsUtils::calculateMultiplicities(const xAOD::TrigT2MbtsBits *t2mbtsBits, return 0; } - if(msgLvl <= MSG::DEBUG) mlog << MSG::DEBUG << "Getting energy and time values." << endreq; + if(msgLvl <= MSG::DEBUG) mlog << MSG::DEBUG << "Getting energy and time values." << endmsg; std::vector<float> triggerEnergies = t2mbtsBits->triggerEnergies(); std::vector<float> triggerTimes = t2mbtsBits->triggerTimes(); if(triggerEnergies.size() != xAOD::TrigT2MbtsBits::NUM_MBTS || triggerTimes.size() != xAOD::TrigT2MbtsBits::NUM_MBTS ) { - if(msgLvl <= MSG::WARNING) mlog << MSG::WARNING << "Vector sizes are not equal to number of MBTS counters." << endreq; + if(msgLvl <= MSG::WARNING) mlog << MSG::WARNING << "Vector sizes are not equal to number of MBTS counters." << endmsg; return 0; } - if(msgLvl <= MSG::DEBUG) mlog << MSG::DEBUG << "Forming hit multiplicities." << endreq; + if(msgLvl <= MSG::DEBUG) mlog << MSG::DEBUG << "Forming hit multiplicities." << endmsg; std::bitset<16> ebaTriggerBits; std::bitset<16> ebcTriggerBits; @@ -103,10 +103,10 @@ int T2MbtsUtils::calculateMultiplicities(const xAOD::TrigT2MbtsBits *t2mbtsBits, mlog << MSG::DEBUG << "average MBTS trigger time side A: " << m_timeMean_A << ", side C: " << m_timeMean_C - << ", difference A-C: "<< m_timeDiff_A_C << endreq; + << ", difference A-C: "<< m_timeDiff_A_C << endmsg; - mlog << MSG::DEBUG << "MBTS EBA trigger bits: " << ebaTriggerBits << endreq; - mlog << MSG::DEBUG << "MBTS EBC trigger bits: " << ebcTriggerBits << endreq; + mlog << MSG::DEBUG << "MBTS EBA trigger bits: " << ebaTriggerBits << endmsg; + mlog << MSG::DEBUG << "MBTS EBC trigger bits: " << ebcTriggerBits << endmsg; } m_mult = std::make_pair(ebaTriggerBits.count(),ebcTriggerBits.count()); diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx index e6f4bd1e712..27d856735c7 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx @@ -40,7 +40,7 @@ HLT::ErrorCode T2ZdcFex::hltExecute(std::vector<std::vector<HLT::TriggerElement* // First check whether we executed this instance before: if(m_useCachedResult) { if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endreq; + m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endmsg; } // Get all input TEs (for seeding relation of navigation structure) @@ -66,7 +66,7 @@ HLT::ErrorCode T2ZdcFex::hltExecute(std::vector<std::vector<HLT::TriggerElement* } if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this T2ZdcFex as " << name() << endreq; + m_log << MSG::DEBUG << "Executing this T2ZdcFex as " << name() << endmsg; } // start monitoring @@ -165,7 +165,7 @@ HLT::ErrorCode T2ZdcFex::hltExecute(std::vector<std::vector<HLT::TriggerElement* HLT::TEVec::const_iterator inner_itEnd = (*it).end(); for(HLT::TEVec::const_iterator inner_it = (*it).begin(); inner_it != inner_itEnd; ++inner_it ){ if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endreq; + m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endmsg; } allTEs.push_back(*inner_it); } @@ -178,7 +178,7 @@ HLT::ErrorCode T2ZdcFex::hltExecute(std::vector<std::vector<HLT::TriggerElement* HLT::ErrorCode hltStatus = attachFeature(outputTE, m_zdcSignals, "zdcsignals"); if(hltStatus != HLT::OK) { if(msgLvl() <= MSG::ERROR) { - m_log << MSG::ERROR << "Write of TrigEMCluster into outputTE failed" << endreq; + m_log << MSG::ERROR << "Write of TrigEMCluster into outputTE failed" << endmsg; } return hltStatus; } @@ -202,24 +202,24 @@ HLT::ErrorCode T2ZdcFex::hltInitialize() { m_log.setLevel(outputLevel()); if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "in T2ZdcFex::initialize()" << endreq; + m_log << MSG::INFO << "in T2ZdcFex::initialize()" << endmsg; } if(m_data.retrieve().isFailure()) { - m_log << MSG::ERROR << "Could not get m_data" << endreq; + m_log << MSG::ERROR << "Could not get m_data" << endmsg; return StatusCode::FAILURE; } StoreGateSvc* detStore(0); if ( service("DetectorStore",detStore).isFailure() ) { - m_log << MSG::ERROR << "Could not get detStore" << endreq; + m_log << MSG::ERROR << "Could not get detStore" << endmsg; return StatusCode::FAILURE; } const ZdcID* zdcID = 0; if ( detStore->retrieve( zdcID ).isFailure() ) { //if ( detSvc()->retrieve( zdcID ).isFailure() ) { - m_log << MSG::ERROR << "Could not get ZdcIDs" << endreq; + m_log << MSG::ERROR << "Could not get ZdcIDs" << endmsg; return StatusCode::FAILURE; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcHypo.cxx index c173168fbda..5dd0b0586ce 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcHypo.cxx @@ -59,20 +59,20 @@ T2ZdcHypo::T2ZdcHypo(const std::string &name, HLT::ErrorCode T2ZdcHypo::hltInitialize() { m_log.setLevel(outputLevel()); if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "Initialising this T2ZdcFex: " << name() << endreq; + m_log << MSG::INFO << "Initialising this T2ZdcFex: " << name() << endmsg; - m_log << MSG::INFO << "================ Hypo Settings ================" << endreq; - m_log << MSG::INFO << " AcceptAll ------------------- " << (m_acceptAll==true ? "True" : "False") << endreq; - m_log << MSG::INFO << " SelectionLogic -------------- Time: " << m_timeLogic << " Energy:" << m_energyLogic << " Multi:" << m_multiLogic << endreq; + m_log << MSG::INFO << "================ Hypo Settings ================" << endmsg; + m_log << MSG::INFO << " AcceptAll ------------------- " << (m_acceptAll==true ? "True" : "False") << endmsg; + m_log << MSG::INFO << " SelectionLogic -------------- Time: " << m_timeLogic << " Energy:" << m_energyLogic << " Multi:" << m_multiLogic << endmsg; for(int ic=0;ic< ZDC_MOD*2 ;++ic){ - m_log << MSG::INFO << " TimeOffset[" << ic << " ] " << m_timeOffset[ic] << " Pedestal" << m_EnergyPed[ic] << " EnergyModuleCalibrations: " << m_EnergyCal[ic] << endreq; + m_log << MSG::INFO << " TimeOffset[" << ic << " ] " << m_timeOffset[ic] << " Pedestal" << m_EnergyPed[ic] << " EnergyModuleCalibrations: " << m_EnergyCal[ic] << endmsg; } - m_log << MSG::INFO << " TimeModuleCut" << m_timeModuleCut << endreq; - m_log << MSG::INFO << " TimeDiffCut" << m_timeCut << endreq; - m_log << MSG::INFO << " EnergyCut: SideA " << m_SumEn[0] << " " << m_SumEn[1] << endreq; - m_log << MSG::INFO << " EnergyCut: SideC " << m_SumEn[2] << " " << m_SumEn[3] << endreq; - m_log << MSG::INFO << " MultiCut: SideA " << m_Mult[0] << " SideC " << m_Mult[1] << endreq; - m_log << MSG::INFO << "===============================================" << endreq; + m_log << MSG::INFO << " TimeModuleCut" << m_timeModuleCut << endmsg; + m_log << MSG::INFO << " TimeDiffCut" << m_timeCut << endmsg; + m_log << MSG::INFO << " EnergyCut: SideA " << m_SumEn[0] << " " << m_SumEn[1] << endmsg; + m_log << MSG::INFO << " EnergyCut: SideC " << m_SumEn[2] << " " << m_SumEn[3] << endmsg; + m_log << MSG::INFO << " MultiCut: SideA " << m_Mult[0] << " SideC " << m_Mult[1] << endmsg; + m_log << MSG::INFO << "===============================================" << endmsg; } return HLT::OK; @@ -83,7 +83,7 @@ HLT::ErrorCode T2ZdcHypo::hltInitialize() { HLT::ErrorCode T2ZdcHypo::hltExecute(const HLT::TriggerElement* outputTE, bool& pass) { if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this T2ZdcHypo " << name() << endreq; + m_log << MSG::DEBUG << "Executing this T2ZdcHypo " << name() << endmsg; } pass = false; @@ -94,14 +94,14 @@ HLT::ErrorCode T2ZdcHypo::hltExecute(const HLT::TriggerElement* outputTE, // Try to retrieve the TrigT2ZdcSignals object produced by the Fex if(getFeature(outputTE, m_t2ZdcSignals, "zdcsignals") != HLT::OK){ if(msgLvl() <= MSG::WARNING){ - m_log << MSG::WARNING << "Failed to retrieve features from TE." << endreq; + m_log << MSG::WARNING << "Failed to retrieve features from TE." << endmsg; } return HLT::OK; } // If the object is not available the trigger fails without complaint. if(!m_t2ZdcSignals){ - m_log << MSG::DEBUG << "No trigger bits formed." << endreq; + m_log << MSG::DEBUG << "No trigger bits formed." << endmsg; return HLT::OK; } @@ -112,13 +112,13 @@ HLT::ErrorCode T2ZdcHypo::hltExecute(const HLT::TriggerElement* outputTE, // Calculate ZDC counter multiplicities, time mean and energy sums after energy and an optional time cut. if(!calculateSumMean()) { - m_log << MSG::DEBUG << "calculateSumMean failed" << endreq; + m_log << MSG::DEBUG << "calculateSumMean failed" << endmsg; return HLT::OK; } if(m_acceptAll){ - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endmsg; pass=true; m_selMult_A = m_mult.first; m_selMult_C = m_mult.second; @@ -198,7 +198,7 @@ int T2ZdcHypo::calculateSumMean(){ m_meanTime = std::make_pair(0.,0.); m_sumEn = std::make_pair(0.,0.); if(!m_t2ZdcSignals){ - m_log << MSG::WARNING << "Cannot access T2ZdcSignals " << endreq; + m_log << MSG::WARNING << "Cannot access T2ZdcSignals " << endmsg; return 0; } std::vector<float> triggerEnergies = m_t2ZdcSignals->triggerEnergies(); @@ -217,7 +217,7 @@ int T2ZdcHypo::calculateSumMean(){ #endif if(triggerEnergies.size() != ZDC_MOD*2 || triggerTimes.size() != ZDC_MOD*2 ) { - m_log << MSG::WARNING << "Vector sizes " << triggerEnergies.size() << " / " << triggerTimes.size() << " are not equal to number of ZDC counters: " << ZDC_MOD*2 << endreq; + m_log << MSG::WARNING << "Vector sizes " << triggerEnergies.size() << " / " << triggerTimes.size() << " are not equal to number of ZDC counters: " << ZDC_MOD*2 << endmsg; // return 0; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx index f99fcd1aa23..05abefa5ba7 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx @@ -168,30 +168,30 @@ TrigCountSpacePoints::~TrigCountSpacePoints() { HLT::ErrorCode TrigCountSpacePoints::hltInitialize() { m_log.setLevel(outputLevel()); - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Initialize this TrigCountSpacePoints: " << name() << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Initialize this TrigCountSpacePoints: " << name() << endmsg; // Retrieving Region Selector Tool if ( m_regionSelector.retrieve().isFailure() ) { msg() << MSG::FATAL << "Unable to retrieve RegionSelector tool " - << m_regionSelector.type() << endreq; + << m_regionSelector.type() << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } // get detector store if(m_detStore.retrieve().isFailure()) { - if (msgLvl() <= MSG::FATAL) m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endreq; + if (msgLvl() <= MSG::FATAL) m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endmsg; return StatusCode::FAILURE; } else { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised DetectorStore !" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised DetectorStore !" << endmsg; } // Only get the Pixel helper if Pixel spacepoints are requested if(m_doPixelSp) { StatusCode sc_pixH = m_detStore->retrieve(m_pixHelper, "PixelID"); if( sc_pixH.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain pix helper!" << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain pix helper!" << endmsg; return StatusCode::FAILURE; } } @@ -200,7 +200,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltInitialize() { if(m_doSctSp) { StatusCode sc_sctH = m_detStore->retrieve(m_sctHelper, "SCT_ID"); if( sc_sctH.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain sct helper!" << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain sct helper!" << endmsg; return StatusCode::FAILURE; } } @@ -239,7 +239,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltInitialize() { m_pixelClusEndcapA_Tot.resize((m_hPixelClusTotBins+2),0); m_pixelClusEndcapA_Size.resize((m_hPixelClusSizeBins+2),0); - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << " TrigCountSpacePoints initialized successfully" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << " TrigCountSpacePoints initialized successfully" << endmsg; return HLT::OK; } @@ -248,18 +248,18 @@ HLT::ErrorCode TrigCountSpacePoints::hltInitialize() { HLT::ErrorCode TrigCountSpacePoints::hltBeginRun() { // This initialisation has been moved into the event loop. // @see TrigCountSpacePoints::checkDetectorMask - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountSpacePoints will be initialized in hltExecute" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountSpacePoints will be initialized in hltExecute" << endmsg; return HLT::OK; } //--------------------------------------------------------------------------------------------------------------------------------------------- HLT::ErrorCode TrigCountSpacePoints::checkDetectorMask() { m_hltExecuteInitialisationRun = true; - m_log << MSG::DEBUG << "[TrigCountSpacePoints::checkDetectorMask] beginning run with this " << name() << endreq; + m_log << MSG::DEBUG << "[TrigCountSpacePoints::checkDetectorMask] beginning run with this " << name() << endmsg; const xAOD::EventInfo* evinfo = 0; if (store()->retrieve(evinfo).isFailure()) { - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endmsg; return HLT::SG_ERROR; } else { @@ -271,13 +271,13 @@ HLT::ErrorCode TrigCountSpacePoints::checkDetectorMask() { << ":" << evinfo->timeStampNSOffset() << "," << evinfo->bcid() << ",0x" << std::hex << evinfo->detectorMask() << std::dec - << "]" << endreq; + << "]" << endmsg; uint64_t mask = evinfo->detectorMask(); eformat::helper::DetectorMask decoder(mask); if (mask == 0) { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endmsg; m_sct_barrel_a_side = true; m_sct_barrel_c_side = true; m_sct_endcap_a_side = true; @@ -296,14 +296,14 @@ HLT::ErrorCode TrigCountSpacePoints::checkDetectorMask() { } if( msgLvl() <= MSG::INFO ){ - m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! ") << endreq; + m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! ") << endmsg; - m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! ") << endreq; + m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! ") << endmsg; } } return HLT::OK; @@ -317,14 +317,14 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri } if ( msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this TrigCountSpacePoints " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigCountSpacePoints " << name() << endmsg; } // Caching. // First check whether we executed this instance before: if (m_useCachedResult) { if (msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endreq; + m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endmsg; } // Get all input TEs (for seeding relation of navigation structure) @@ -356,7 +356,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri // ------ PIXEL PART --------------------------------------------- if( !(m_pixel_barrel && m_pixel_b_layer && m_pixel_disk) ) { - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO pixel detector present." << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO pixel detector present." << endmsg; } if( timerSvc() ){ @@ -407,11 +407,11 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri const SpacePointContainer* pixCont = 0; sc = store()->retrieve( pixCont, m_pixelSpName ); if(sc.isFailure() || !pixCont){ - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR<< "Trig Pixel SP container " << m_pixelSpName <<" not found"<<endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR<< "Trig Pixel SP container " << m_pixelSpName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } else{ - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Successfully retrieved pixel SP container!" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Successfully retrieved pixel SP container!" << endmsg; //sc = StatusCode::FAILURE; } @@ -477,40 +477,40 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri // Histogram time over threshold against pixel size {1,2,3+} if(bec == -2) { -// m_log << MSG::DEBUG << " AZ:: debug1 " << m_pixclToT << endreq; +// m_log << MSG::DEBUG << " AZ:: debug1 " << m_pixclToT << endmsg; m_pixelClusEndcapC->fill(m_pixclToT, m_pixClSize,1); -// m_log << MSG::DEBUG << " AZ:: debug2 " << m_pixclToT << endreq; +// m_log << MSG::DEBUG << " AZ:: debug2 " << m_pixclToT << endmsg; if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << " ECC pixel totalToT is " << m_pixclToT << endreq; - m_log << MSG::DEBUG << " ECC pixel size is " << m_pixclToT << endreq; + m_log << MSG::DEBUG << " ECC pixel totalToT is " << m_pixclToT << endmsg; + m_log << MSG::DEBUG << " ECC pixel size is " << m_pixclToT << endmsg; } } else if(bec == 0) { m_pixelClusBarrel->fill(m_pixclToT, m_pixClSize,1); - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " Barr pixel totalToT is " << m_pixclToT << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " Barr pixel totalToT is " << m_pixclToT << endmsg; } else if(bec == 2) { m_pixelClusEndcapA->fill(m_pixclToT, m_pixClSize,1); - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " ECA pixel totalToT is " << m_pixclToT << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " ECA pixel totalToT is " << m_pixclToT << endmsg; } } // barrel if( bec==0 ){ m_SPpixBarr = m_nPixSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX Barrel after ToT cut." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX Barrel after ToT cut." << endmsg; } // endcap A else if( bec==2 ){ m_SPpixECA = m_nPixSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX ECA after ToT cut." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX ECA after ToT cut." << endmsg; } // endcap C else if( bec==-2 ){ m_SPpixECC = m_nPixSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX ECC after ToT cut." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nPixSP << " PIX spacepoints in PIX ECC after ToT cut." << endmsg; } // total @@ -519,13 +519,13 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri // check if there is a hot module and monitor it if( (m_SPpixBarr > m_pixModuleThreshold) || (m_SPpixECA > m_pixModuleThreshold) || (m_SPpixECC > m_pixModuleThreshold) ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << " This pixel module : " << pixid << " produced " << m_nPixSP << " pix spacepoints. " << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << " This pixel module : " << pixid << " produced " << m_nPixSP << " pix spacepoints. " << endmsg; unsigned int nPixModId = droppedPixelModules.size(); if( nPixModId <= m_maxnid ) { droppedPixelModules.push_back(pixid); } else { - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " pixel modules are noisy, dump their id : " << pixid << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " pixel modules are noisy, dump their id : " << pixid << endmsg; } int layer_disk = m_pixHelper->layer_disk(pixid); @@ -539,8 +539,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " PIX module in the barrel in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nPixSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nPixSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } if( layer_disk==0 ){ m_pixBarrL0_clust_occ_eta.push_back( eta_module ); @@ -561,8 +561,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " PIX module in the ECA in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nPixSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nPixSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } m_pixECA_clust_occ_disk.push_back( layer_disk ); m_pixECA_clust_occ_phi.push_back( phi_module ); @@ -572,8 +572,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " PIX module in the ECC in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nPixSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nPixSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } m_pixECC_clust_occ_disk.push_back( layer_disk ); m_pixECC_clust_occ_phi.push_back( phi_module ); @@ -602,18 +602,18 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri } //end //if( m_pixListSize != 0 ){ else{ - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Data is ok, but pixel detector might be off or not a single pixel hit was produced." << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Data is ok, but pixel detector might be off or not a single pixel hit was produced." << endmsg; }// end of pixel data quality check if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_1 << " have cl size == 1 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_2 << " have cl size == 2 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCLmin3 << " have cl size >= 3 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints after ToT cut in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClBarrel << " SP in pixel barrel in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapA << " SP in pixel ECA in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapC << " SP in pixel ECC in total." << endreq; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_1 << " have cl size == 1 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_2 << " have cl size == 2 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCLmin3 << " have cl size >= 3 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints after ToT cut in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClBarrel << " SP in pixel barrel in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapA << " SP in pixel ECA in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapC << " SP in pixel ECC in total." << endmsg; } // Monitor the data stored in TrigSpacePointCounts @@ -645,7 +645,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri // ------ SCT PART ------------------------------------------------ if( !(m_sct_barrel_a_side && m_sct_barrel_c_side && m_sct_endcap_a_side && m_sct_endcap_c_side) ) - m_log << MSG::DEBUG << "NO sct detector present." << endreq ; + m_log << MSG::DEBUG << "NO sct detector present." << endmsg ; if( timerSvc() ) m_sctSPCTimer->start(); @@ -678,7 +678,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri const SpacePointContainer* sctCont; sc = store()->retrieve( sctCont, m_sctSpName ); if( sc.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Trig SP SCT container " << m_sctSpName <<" not found"<<endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Trig SP SCT container " << m_sctSpName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } @@ -723,25 +723,25 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri if( msgLvl() <= MSG::VERBOSE ){ m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " sct spacepoints" ; - m_log << MSG::VERBOSE << " with sctid module " << sctid << endreq; + m_log << MSG::VERBOSE << " with sctid module " << sctid << endmsg; } // barrel if( bec==0 ){ m_SPsctBarr = m_nSctSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT barrel spacepoints ." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT barrel spacepoints ." << endmsg; } // endcap, side A else if( bec==2 ){ m_SPsctECA = m_nSctSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT ECA spacepoints." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT ECA spacepoints." << endmsg; } // endcap, side C else if( bec==-2 ){ m_SPsctECC = m_nSctSP; - if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT ECC spacepoints." << endreq; + if (msgLvl() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " SCT ECC spacepoints." << endmsg; } // total @@ -754,7 +754,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri if( nSctModIds <= m_maxnid ) { droppedSctModules.push_back(sctid); } else { - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " sct modules are noisy, dump their id : " << sctid << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " sct modules are noisy, dump their id : " << sctid << endmsg; } int layer_disk = m_sctHelper->layer_disk(sctid); // reference table in SCT_ID.h @@ -762,9 +762,9 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri int eta_module = m_sctHelper->eta_module(sctid); if( msgLvl() <= MSG::VERBOSE ){ - m_log << MSG::VERBOSE << " SCT layer_disk = " << layer_disk << endreq; - m_log << MSG::VERBOSE << " SCT phi_module = " << phi_module << endreq; - m_log << MSG::VERBOSE << " SCT eta_module = " << eta_module << endreq; + m_log << MSG::VERBOSE << " SCT layer_disk = " << layer_disk << endmsg; + m_log << MSG::VERBOSE << " SCT phi_module = " << phi_module << endmsg; + m_log << MSG::VERBOSE << " SCT eta_module = " << eta_module << endmsg; } if( m_SPsctBarr > m_sctModuleThreshold ){ @@ -772,8 +772,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " SCT module in the barrel in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nSctSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nSctSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } if( layer_disk == 0 ){ m_sctBarrL1_sp_occ_eta.push_back( eta_module ); @@ -797,8 +797,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " SCT module in the ECA in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nSctSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nSctSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } m_sctECA_sp_occ_disk.push_back( layer_disk ); m_sctECA_sp_occ_phi.push_back( phi_module ); @@ -808,8 +808,8 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_log << MSG::DEBUG << " SCT module in the ECC in disk " << layer_disk << " with eta index " << eta_module << " and phi_module " << phi_module - << " produced " << m_nSctSP << " spacepoints!" << endreq; - m_log << MSG::DEBUG << " Will not account them. " <<endreq; + << " produced " << m_nSctSP << " spacepoints!" << endmsg; + m_log << MSG::DEBUG << " Will not account them. " <<endmsg; } m_sctECC_sp_occ_disk.push_back( layer_disk ); m_sctECC_sp_occ_phi.push_back( phi_module ); @@ -829,10 +829,10 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri m_totNumSctSP = m_sctSpEndcapC + m_sctSpBarrel + m_sctSpEndcapA; if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumSctSP << " sct spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapC << " sct ECC spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpBarrel << " sct Barr spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapA << " sct ECA spacepoints in total." << endreq; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumSctSP << " sct spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapC << " sct ECC spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpBarrel << " sct Barr spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapA << " sct ECA spacepoints in total." << endmsg; } } // end of doSctSp @@ -877,7 +877,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri for( HLT::TEVec::const_iterator inner_it = (*it).begin(); inner_it != inner_itEnd; ++inner_it ){ if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endreq; + m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endmsg; } allTEs.push_back(*inner_it); } @@ -886,13 +886,13 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri HLT::TriggerElement* outputTE = config()->getNavigation()->addNode(allTEs, type_out); outputTE->setActiveState(true); -// m_log << MSG::DEBUG << "AZ: debug 4: trying to attachFeature m_spacePointCounts"<<endreq; +// m_log << MSG::DEBUG << "AZ: debug 4: trying to attachFeature m_spacePointCounts"<<endmsg; HLT::ErrorCode hltStatus = attachFeature( outputTE, m_spacePointCounts, "spacepoints"); -// m_log << MSG::DEBUG << "AZ: debug 5: AM i here? m_spacePointCounts"<<endreq; +// m_log << MSG::DEBUG << "AZ: debug 5: AM i here? m_spacePointCounts"<<endmsg; if( timerSvc() ) m_attachFTimer->stop(); if(hltStatus != HLT::OK) { - m_log << MSG::ERROR << "Unable to attach HLT feature spacepoints to output TE." << endreq; + m_log << MSG::ERROR << "Unable to attach HLT feature spacepoints to output TE." << endmsg; return hltStatus; } @@ -909,7 +909,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri //--------------------------------------------------------------------------------------------------------------------------------------------- HLT::ErrorCode TrigCountSpacePoints::hltFinalize() { - m_log << MSG::DEBUG << " finalizing TrigCountSpacePoints : "<< name() << endreq; + m_log << MSG::DEBUG << " finalizing TrigCountSpacePoints : "<< name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx index 5d67fac906f..aaac85413f2 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx @@ -82,87 +82,87 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltInitialize() { m_log.setLevel(outputLevel()); if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "Initialising this TrigCountSpacePointsHypo: " << name() << endreq; - m_log << MSG::INFO << "================ Hypo Settings ================" << endreq; + m_log << MSG::INFO << "Initialising this TrigCountSpacePointsHypo: " << name() << endmsg; + m_log << MSG::INFO << "================ Hypo Settings ================" << endmsg; m_log << MSG::INFO << " AcceptAll ------------------- " - << (m_acceptAll==true ? "True" : "False") << endreq; + << (m_acceptAll==true ? "True" : "False") << endmsg; m_log << MSG::INFO << " TriggerTypeAND -------------- " - << (m_triggerTypeAND==true ? "True" : "False") << endreq; + << (m_triggerTypeAND==true ? "True" : "False") << endmsg; m_log << MSG::INFO << " TotalPixelClus ------------- "; - if(m_totalPixelClus_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_totalPixelClus_cut << endreq; + if(m_totalPixelClus_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_totalPixelClus_cut << endmsg; m_log << MSG::INFO << " PixelClusRatioA ------------ "; - if(m_pixelClusRatioA_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusRatioA_cut << endreq; + if(m_pixelClusRatioA_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusRatioA_cut << endmsg; m_log << MSG::INFO << " PixelClusRatioB ------------ "; - if(m_pixelClusRatioB_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusRatioB_cut << endreq; + if(m_pixelClusRatioB_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusRatioB_cut << endmsg; m_log << MSG::INFO << " PixelClusEndcapC ----------- "; - if(m_pixelClusEndcapC_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusEndcapC_cut << endreq; + if(m_pixelClusEndcapC_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusEndcapC_cut << endmsg; m_log << MSG::INFO << " PixelClusBarrel ------------ "; - if(m_pixelClusBarrel_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusBarrel_cut << endreq; + if(m_pixelClusBarrel_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusBarrel_cut << endmsg; m_log << MSG::INFO << " PixelClusEndcapA ----------- "; - if(m_pixelClusEndcapA_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusEndcapA_cut << endreq; + if(m_pixelClusEndcapA_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusEndcapA_cut << endmsg; m_log << MSG::INFO << " PixelClusEndcapC_max ------- "; - if(m_pixelClusEndcapC_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusEndcapC_max << endreq; + if(m_pixelClusEndcapC_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusEndcapC_max << endmsg; m_log << MSG::INFO << " PixelClusBarrel_max -------- "; - if(m_pixelClusBarrel_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusBarrel_max << endreq; + if(m_pixelClusBarrel_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusBarrel_max << endmsg; m_log << MSG::INFO << " PixelClusEndcapA_max ------- "; - if(m_pixelClusEndcapA_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusEndcapA_max << endreq; + if(m_pixelClusEndcapA_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusEndcapA_max << endmsg; m_log << MSG::INFO << " PixelClusEndcaps_cut ------- "; - if(m_pixelClusEndcaps_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_pixelClusEndcaps_cut << endreq; + if(m_pixelClusEndcaps_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_pixelClusEndcaps_cut << endmsg; m_log << MSG::INFO << " TotalSctSp ----------------- "; - if(m_totalSctSp_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_totalSctSp_cut << endreq; + if(m_totalSctSp_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_totalSctSp_cut << endmsg; m_log << MSG::INFO << " SctSpEndcapC --------------- "; - if(m_sctSpEndcapC_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpEndcapC_cut << endreq; + if(m_sctSpEndcapC_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpEndcapC_cut << endmsg; m_log << MSG::INFO << " SctSpBarrel ---------------- "; - if(m_sctSpBarrel_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpBarrel_cut << endreq; + if(m_sctSpBarrel_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpBarrel_cut << endmsg; m_log << MSG::INFO << " SctSpEndcapA --------------- "; - if(m_sctSpEndcapA_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpEndcapA_cut << endreq; + if(m_sctSpEndcapA_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpEndcapA_cut << endmsg; m_log << MSG::INFO << " SctSpEndcapC_max ----------- "; - if(m_sctSpEndcapC_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpEndcapC_max << endreq; + if(m_sctSpEndcapC_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpEndcapC_max << endmsg; m_log << MSG::INFO << " SctSpBarrel_max ------------ "; - if(m_sctSpBarrel_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpBarrel_max << endreq; + if(m_sctSpBarrel_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpBarrel_max << endmsg; m_log << MSG::INFO << " SctSpEndcapA_max ----------- "; - if(m_sctSpEndcapA_max < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpEndcapA_max << endreq; + if(m_sctSpEndcapA_max < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpEndcapA_max << endmsg; m_log << MSG::INFO << " SctSpEndcaps_cut ----------- "; - if(m_sctSpEndcaps_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_sctSpEndcaps_cut << endreq; + if(m_sctSpEndcaps_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_sctSpEndcaps_cut << endmsg; - m_log << MSG::INFO << "===============================================" << endreq; + m_log << MSG::INFO << "===============================================" << endmsg; } // Create timers @@ -177,18 +177,18 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltInitialize() { HLT::ErrorCode TrigCountSpacePointsHypo::hltBeginRun() { // This initialisation has been moved into the event loop. // @see TrigCountSpacePointsHypo::checkDetectorMask - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountSpacePointsHypo will be initialized in hltExecute" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountSpacePointsHypo will be initialized in hltExecute" << endmsg; return HLT::OK; } //--------------------------------------------------------------------------------------------------------------------------------------------- HLT::ErrorCode TrigCountSpacePointsHypo::checkDetectorMask() { m_hltExecuteInitialisationRun = true; - m_log << MSG::DEBUG << "[TrigCountSpacePointsHypo::checkDetectorMask] beginning run with this " << name() << endreq; + m_log << MSG::DEBUG << "[TrigCountSpacePointsHypo::checkDetectorMask] beginning run with this " << name() << endmsg; const xAOD::EventInfo* evinfo = 0; if (store()->retrieve(evinfo).isFailure()) { - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endmsg; return HLT::SG_ERROR; } else { @@ -200,13 +200,13 @@ HLT::ErrorCode TrigCountSpacePointsHypo::checkDetectorMask() { << ":" << evinfo->timeStampNSOffset() << "," << evinfo->bcid() << ",0x" << std::hex << evinfo->detectorMask() << std::dec - << "]" << endreq; + << "]" << endmsg; uint64_t mask = evinfo->detectorMask(); eformat::helper::DetectorMask decoder(mask); if (mask == 0) { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endmsg; m_sct_barrel_a_side = true; m_sct_barrel_c_side = true; m_sct_endcap_a_side = true; @@ -225,14 +225,14 @@ HLT::ErrorCode TrigCountSpacePointsHypo::checkDetectorMask() { } if( msgLvl() <= MSG::INFO ){ - m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; + m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; - m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; + m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; } } return HLT::OK; @@ -258,7 +258,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o m_totNumSctSP = -999; if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this TrigCountSpacePointsHypo " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigCountSpacePointsHypo " << name() << endmsg; } if( timerSvc() ) m_formFeaturesTimer->start(); @@ -268,7 +268,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o HLT::ErrorCode hltStatus = getFeature(outputTE, trigSpacePointCounts, m_trigSpacePointCountsKey); if(hltStatus != HLT::OK || !trigSpacePointCounts) { if( msgLvl() <= MSG::WARNING ){ - m_log << MSG::WARNING << "Failed to retrieve features from TE." << endreq; + m_log << MSG::WARNING << "Failed to retrieve features from TE." << endmsg; } return HLT::OK; } @@ -288,7 +288,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o m_pixelClusEndcaps_cut > 0. ); if( !(m_pixel_barrel && m_pixel_b_layer && m_pixel_disk) ) { - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO pixel detector present, proceeding to SCT." << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO pixel detector present, proceeding to SCT." << endmsg; } @@ -328,7 +328,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o ratioA = (m_multiplicity[PIXEL_CLUS_SZ_2] + m_multiplicity[PIXEL_CLUS_SZ_3])/m_totNumPixSP; } else { - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "ratioA not defined, m_totNumPixSP =" << m_totNumPixSP << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "ratioA not defined, m_totNumPixSP =" << m_totNumPixSP << endmsg; ratioA = -1.; } @@ -336,13 +336,13 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o ratioB = m_multiplicity[PIXEL_CLUS_SZ_2]/m_multiplicity[PIXEL_CLUS_SZ_1]; } else { - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "ratioB not defined, m_multiplicity[PIXEL_CLUS_SZ_1] =" << m_multiplicity[PIXEL_CLUS_SZ_1] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "ratioB not defined, m_multiplicity[PIXEL_CLUS_SZ_1] =" << m_multiplicity[PIXEL_CLUS_SZ_1] << endmsg; ratioB = -1.; } } } else{ - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Won't use pixel." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Won't use pixel." << endmsg; // do not decide on pixel features pixelClusPass = false; } @@ -359,7 +359,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o m_sctSpEndcaps_cut > 0.); if( !(m_sct_barrel_a_side && m_sct_barrel_c_side && m_sct_endcap_a_side && m_sct_endcap_c_side) ){ - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO sct detector present." << endreq ; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "NO sct detector present." << endmsg ; } if( useSCT ){ @@ -376,7 +376,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o } else{ - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Won't use SCT." << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Won't use SCT." << endmsg; // do not decide on sct features and use OR mode sctSpPass = false; @@ -390,7 +390,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o // move here to have meaningful monitoring if( m_acceptAll ){ pass=true; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endmsg; return HLT::OK; } @@ -399,91 +399,91 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o if( ((m_totNumPixSP <= m_totalPixelClus_cut)&&!m_vetoLargeSP) || (((m_totNumPixSP >= m_totalPixelClus_cut) || (m_totNumPixSP <= m_totalPixelClus_cut_min)) && m_vetoLargeSP)) { pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails TotalPixelNClus, value = " << m_totNumPixSP << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails TotalPixelNClus, value = " << m_totNumPixSP << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes TotalPixelNClus, value = " << m_totNumPixSP << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes TotalPixelNClus, value = " << m_totNumPixSP << endmsg; } if(m_pixelClusEndcapC_cut >= 0.){ if( m_multiplicity[PIXEL_CLUS_EC] <= m_pixelClusEndcapC_cut ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapC, value = " << m_multiplicity[PIXEL_CLUS_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapC, value = " << m_multiplicity[PIXEL_CLUS_EC] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapC, value = " << m_multiplicity[PIXEL_CLUS_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapC, value = " << m_multiplicity[PIXEL_CLUS_EC] << endmsg; } if(m_pixelClusBarrel_cut >= 0.){ if( m_multiplicity[PIXEL_CLUS_BL] <= m_pixelClusBarrel_cut ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusBarrel, value = " << m_multiplicity[PIXEL_CLUS_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusBarrel, value = " << m_multiplicity[PIXEL_CLUS_BL] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusBarrel, value = " << m_multiplicity[PIXEL_CLUS_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusBarrel, value = " << m_multiplicity[PIXEL_CLUS_BL] << endmsg; } if(m_pixelClusEndcapA_cut >= 0.){ if( m_multiplicity[PIXEL_CLUS_EA] <= m_pixelClusEndcapA_cut ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapA, value = " << m_multiplicity[PIXEL_CLUS_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapA, value = " << m_multiplicity[PIXEL_CLUS_EA] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapA, value = " << m_multiplicity[PIXEL_CLUS_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapA, value = " << m_multiplicity[PIXEL_CLUS_EA] << endmsg; } if(m_pixelClusEndcapC_max >= 0.){ if( m_multiplicity[PIXEL_CLUS_EC] > m_pixelClusEndcapC_max ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapC_max, value = " << m_multiplicity[PIXEL_CLUS_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapC_max, value = " << m_multiplicity[PIXEL_CLUS_EC] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapC_max, value = " << m_multiplicity[PIXEL_CLUS_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapC_max, value = " << m_multiplicity[PIXEL_CLUS_EC] << endmsg; } if(m_pixelClusBarrel_max >= 0.){ if( m_multiplicity[PIXEL_CLUS_BL] > m_pixelClusBarrel_max ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusBarrel_max, value = " << m_multiplicity[PIXEL_CLUS_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusBarrel_max, value = " << m_multiplicity[PIXEL_CLUS_BL] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusBarrel_max, value = " << m_multiplicity[PIXEL_CLUS_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusBarrel_max, value = " << m_multiplicity[PIXEL_CLUS_BL] << endmsg; } if(m_pixelClusEndcapA_max >= 0.){ if( m_multiplicity[PIXEL_CLUS_EA] > m_pixelClusEndcapA_max) { pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapA_max, value = " << m_multiplicity[PIXEL_CLUS_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcapA_max, value = " << m_multiplicity[PIXEL_CLUS_EA] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapA_max, value = " << m_multiplicity[PIXEL_CLUS_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcapA_max, value = " << m_multiplicity[PIXEL_CLUS_EA] << endmsg; } if( m_pixelClusRatioA_cut >= 0.){ if( ratioA < m_pixelClusRatioA_cut ){ pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusRatioA, value = " << ratioA << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusRatioA, value = " << ratioA << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusRatioA, value = " << ratioA << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusRatioA, value = " << ratioA << endmsg; } if(m_pixelClusRatioB_cut >= 0.){ if( ratioB < m_pixelClusRatioB_cut) { pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusRatioB, value = " << ratioB << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusRatioB, value = " << ratioB << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusRatioB, value = " << ratioB << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusRatioB, value = " << ratioB << endmsg; } if(m_pixelClusEndcaps_cut >= 0.){ if( m_maxNumPixClusEC < m_pixelClusEndcaps_cut) { pixelClusPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcaps, value = " << m_maxNumPixClusEC << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails PixelClusEndcaps, value = " << m_maxNumPixClusEC << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcaps, value = " << m_maxNumPixClusEC << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes PixelClusEndcaps, value = " << m_maxNumPixClusEC << endmsg; } // SCT trigger logic @@ -491,97 +491,97 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o if( ((m_totNumSctSP <= m_totalSctSp_cut) && !m_vetoLargeSP ) || (((m_totNumSctSP >= m_totalSctSp_cut) || (m_totNumSctSP <= m_totalSctSp_cut_min)) && m_vetoLargeSP)) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails TotalSctSp, value = " << m_totNumSctSP << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails TotalSctSp, value = " << m_totNumSctSP << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes TotalSctSp, value = " << m_totNumSctSP << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes TotalSctSp, value = " << m_totNumSctSP << endmsg; } if(m_sctSpEndcapC_cut >= 0.){ if( m_multiplicity[SCT_SP_EC] <= m_sctSpEndcapC_cut) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapC, value = " << m_multiplicity[SCT_SP_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapC, value = " << m_multiplicity[SCT_SP_EC] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapC, value = " << m_multiplicity[SCT_SP_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapC, value = " << m_multiplicity[SCT_SP_EC] << endmsg; } if(m_sctSpBarrel_cut >= 0.){ if( m_multiplicity[SCT_SP_BL] <= m_sctSpBarrel_cut) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpBarrel, value = " << m_multiplicity[SCT_SP_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpBarrel, value = " << m_multiplicity[SCT_SP_BL] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel, value = " << m_multiplicity[SCT_SP_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel, value = " << m_multiplicity[SCT_SP_BL] << endmsg; } if(m_sctSpEndcapA_cut >= 0.){ if( m_multiplicity[SCT_SP_EA] <= m_sctSpEndcapA_cut) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapA, value = " << m_multiplicity[SCT_SP_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapA, value = " << m_multiplicity[SCT_SP_EA] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapA, value = " << m_multiplicity[SCT_SP_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapA, value = " << m_multiplicity[SCT_SP_EA] << endmsg; } if(m_sctSpEndcapC_max >= 0.){ if( m_multiplicity[SCT_SP_EC] > m_sctSpEndcapC_max) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapC_max, value = " << m_multiplicity[SCT_SP_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapC_max, value = " << m_multiplicity[SCT_SP_EC] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapC_max, value = " << m_multiplicity[SCT_SP_EC] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcapC_max, value = " << m_multiplicity[SCT_SP_EC] << endmsg; } if(m_sctSpBarrel_max >= 0.){ if( m_multiplicity[SCT_SP_BL] > m_sctSpBarrel_max) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_BL] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_BL] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_BL] << endmsg; } if(m_sctSpEndcapA_max >= 0.){ if( m_multiplicity[SCT_SP_EA] > m_sctSpEndcapA_max) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapA_max, value = " << m_multiplicity[SCT_SP_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcapA_max, value = " << m_multiplicity[SCT_SP_EA] << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_EA] << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpBarrel_max, value = " << m_multiplicity[SCT_SP_EA] << endmsg; } if(m_sctSpEndcaps_cut >= 0.){ if( m_maxNumSctSpEC < m_sctSpEndcaps_cut ) { sctSpPass = false; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcaps, value = " << m_maxNumSctSpEC << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails SctSpEndcaps, value = " << m_maxNumSctSpEC << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcaps, value = " << m_maxNumSctSpEC << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes SctSpEndcaps, value = " << m_maxNumSctSpEC << endmsg; } // Check the trigger decision. if( m_triggerTypeAND ){ if( pixelClusPass && sctSpPass ){ pass = true; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes Pixel AND SCT " << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes Pixel AND SCT " << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails Pixel AND SCT " << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails Pixel AND SCT " << endmsg; } else{ if( pixelClusPass || sctSpPass ) { pass = true; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes Pixel OR SCT " << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event passes Pixel OR SCT " << endmsg; } else - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails Pixel OR SCT " << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails Pixel OR SCT " << endmsg; } // Veto if (m_veto == true) { pass = !pass; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Using inverted/VETO logic, final decision is " << (pass ? "PASS" : "FAIL") << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Using inverted/VETO logic, final decision is " << (pass ? "PASS" : "FAIL") << endmsg; } // for monitoring @@ -600,7 +600,7 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o //----------------------------------------------------------------------------- HLT::ErrorCode TrigCountSpacePointsHypo::hltFinalize() { - m_log << MSG::DEBUG << " finalizing this TrigCountSpacePointsHypo : " << name() << endreq; + m_log << MSG::DEBUG << " finalizing this TrigCountSpacePointsHypo : " << name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx index fbcefc6f2ca..27ce2dcc3b6 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx @@ -60,37 +60,37 @@ TrigCountTrtHits::~TrigCountTrtHits() { //--------------------------------------------------------------------------------- HLT::ErrorCode TrigCountTrtHits::hltInitialize() { - m_log << MSG::DEBUG << "Initialising this TrigCountTrtHits: " << name() << endreq; + m_log << MSG::DEBUG << "Initialising this TrigCountTrtHits: " << name() << endmsg; StatusCode sc = StatusCode::FAILURE; m_log.setLevel(outputLevel()); // Get storegate svc if(m_detStore.retrieve().isFailure()) { - m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endreq; + m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endmsg; return StatusCode::FAILURE; } else - m_log << MSG::INFO << "Retrieved service " << m_detStore.typeAndName() << endreq; + m_log << MSG::INFO << "Retrieved service " << m_detStore.typeAndName() << endmsg; if(m_storeGate.retrieve().isFailure()) { - m_log << MSG::FATAL << "Failed to connect to " << m_storeGate.typeAndName() << endreq; + m_log << MSG::FATAL << "Failed to connect to " << m_storeGate.typeAndName() << endmsg; return StatusCode::FAILURE; } else - m_log << MSG::INFO << "Retrieved service " << m_storeGate.typeAndName() << endreq; + m_log << MSG::INFO << "Retrieved service " << m_storeGate.typeAndName() << endmsg; // Get a TRT identifier helper sc = m_detStore->retrieve(m_trtHelper, "TRT_ID"); if(sc.isFailure()) { - m_log << MSG::ERROR << "Failed to retrieve " << m_trtHelper << endreq; // fatal? + m_log << MSG::ERROR << "Failed to retrieve " << m_trtHelper << endmsg; // fatal? return StatusCode::FAILURE; } else - m_log << MSG::INFO << "Retrieved service " << m_trtHelper << endreq; + m_log << MSG::INFO << "Retrieved service " << m_trtHelper << endmsg; // Get TrigTRT_DriftCircleProviderTool if( m_rawDataTool.retrieve().isFailure() ){ - m_log << MSG::FATAL << "Failed to retrieve " << m_rawDataTool << endreq; + m_log << MSG::FATAL << "Failed to retrieve " << m_rawDataTool << endmsg; return StatusCode::FAILURE; } else - m_log << MSG::INFO << "Retrieved service " << m_rawDataTool << endreq; + m_log << MSG::INFO << "Retrieved service " << m_rawDataTool << endmsg; // Create timer if ( timerSvc() ) { @@ -99,7 +99,7 @@ HLT::ErrorCode TrigCountTrtHits::hltInitialize() { m_attachFTimer = addTimer("attachingFeatures"); } - m_log << MSG::INFO << " TrigCountTrtHits initialized successfully" << endreq; + m_log << MSG::INFO << " TrigCountTrtHits initialized successfully" << endmsg; // Create empty histograms. m_endcapC = new TrigHisto1D(m_hTotBins, m_hTotMin, m_hTotMax); @@ -119,18 +119,18 @@ HLT::ErrorCode TrigCountTrtHits::hltInitialize() { HLT::ErrorCode TrigCountTrtHits::hltBeginRun() { // This initialisation has been moved into the event loop. // @see TrigCountTrtHitsHypo::checkDetectorMask - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountTrtHits will be initialized in hltExecute" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountTrtHits will be initialized in hltExecute" << endmsg; return HLT::OK; } //--------------------------------------------------------------------------------------------------------------------------------------------- HLT::ErrorCode TrigCountTrtHits::checkDetectorMask() { m_hltExecuteInitialisationRun = true; - m_log << MSG::DEBUG << "[TrigCountTrtHits::checkDetectorMask] beginning run with this " << name() << endreq; + m_log << MSG::DEBUG << "[TrigCountTrtHits::checkDetectorMask] beginning run with this " << name() << endmsg; const xAOD::EventInfo* evinfo = 0; if (store()->retrieve(evinfo).isFailure()) { - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endmsg; return HLT::SG_ERROR; } else { @@ -142,13 +142,13 @@ HLT::ErrorCode TrigCountTrtHits::checkDetectorMask() { << ":" << evinfo->timeStampNSOffset() << "," << evinfo->bcid() << ",0x" << std::hex << evinfo->detectorMask() << std::dec - << "]" << endreq; + << "]" << endmsg; uint64_t mask = evinfo->detectorMask(); eformat::helper::DetectorMask decoder(mask); if (mask == 0) { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endmsg; m_trt_barrel_a_side = true; m_trt_barrel_c_side = true; m_trt_endcap_a_side = true; @@ -161,10 +161,10 @@ HLT::ErrorCode TrigCountTrtHits::checkDetectorMask() { } if( msgLvl() <= MSG::INFO ){ - m_log << MSG::INFO << "trt_barrel_a_side is " << (m_trt_barrel_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "trt_barrel_c_side is " << (m_trt_barrel_c_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "trt_endcap_a_side is " << (m_trt_endcap_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "trt_endcap_c_side is " << (m_trt_endcap_c_side==true? "present" : "OFF! ") << endreq; + m_log << MSG::INFO << "trt_barrel_a_side is " << (m_trt_barrel_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "trt_barrel_c_side is " << (m_trt_barrel_c_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "trt_endcap_a_side is " << (m_trt_endcap_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "trt_endcap_c_side is " << (m_trt_endcap_c_side==true? "present" : "OFF! ") << endmsg; } } return HLT::OK; @@ -178,12 +178,12 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger if (ec != HLT::OK) return ec; } - m_log << MSG::DEBUG << "Executing this TrigCountTrtHits " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigCountTrtHits " << name() << endmsg; // Caching. // First check whether we executed this instance before: if( m_useCachedResult ){ - m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endreq; + m_log << MSG::DEBUG << "Executing " << name() << " in cached mode" << endmsg; // Get all input TEs (for seeding relation of navigation structure) HLT::TEVec allTEs; @@ -210,7 +210,7 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger beforeExecMonitors().ignore(); if( !(m_trt_barrel_a_side && m_trt_barrel_c_side && m_trt_endcap_a_side && m_trt_endcap_c_side) ){ - m_log << MSG::DEBUG << "Trt detector is not present. " << endreq; + m_log << MSG::DEBUG << "Trt detector is not present. " << endmsg; // currently dont return since only old data without detector flags exsist } // Clear TrigHisto1d histograms @@ -235,14 +235,14 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger TrigRoiDescriptor fsroi(true); StatusCode sc_fc = m_rawDataTool->fillCollections(fsroi); if( sc_fc.isRecoverable() ){ - m_log << MSG::DEBUG << "Recoverable error(s) during TRT data preparation" << endreq; + m_log << MSG::DEBUG << "Recoverable error(s) during TRT data preparation" << endmsg; // error monitoring const std::vector<int>* errVect = m_rawDataTool->fillTRT_DataErrors(); std::copy(errVect->begin(),errVect->end(),std::back_inserter(m_trtDataErrors)); } else if(sc_fc.isFailure()){ - m_log << MSG::ERROR << "BS conversion into RDOs failed" << endreq; + m_log << MSG::ERROR << "BS conversion into RDOs failed" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::CORRUPTED_ROD); } @@ -255,11 +255,11 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger StatusCode sc_sg = m_storeGate->retrieve( trtContainer, m_trtRdoContainerName ); if( sc_sg.isFailure() ){ - m_log << MSG::ERROR << " Failed to retrieve trt data from SG. " << endreq; + m_log << MSG::ERROR << " Failed to retrieve trt data from SG. " << endmsg; return HLT::TOOL_FAILURE; } else - m_log << MSG::DEBUG << " Successfully retrieved trt data from SG. " << endreq; + m_log << MSG::DEBUG << " Successfully retrieved trt data from SG. " << endmsg; // loop over collections of container TRT_RDO_Container::const_iterator trthitsCollIt = trtContainer->begin(); @@ -306,7 +306,7 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger m_attachFTimer->start(); } - m_log << MSG::DEBUG << "REGTEST : number of TRT hits is " << m_nTrtHits << endreq; + m_log << MSG::DEBUG << "REGTEST : number of TRT hits is " << m_nTrtHits << endmsg; m_trtHitCounts = new TrigTrtHitCounts(*m_endcapC, *m_barrel, *m_endcapA); @@ -325,7 +325,7 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger HLT::TEVec::const_iterator inner_itEnd = (*it).end(); for( ; inner_it != inner_itEnd; ++inner_it ){ - m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endreq; + m_log << MSG::DEBUG << "Creating TE seeded from input TE " << (*inner_it)->getId() << endmsg; allTEs.push_back(*inner_it); } } @@ -336,7 +336,7 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger HLT::ErrorCode hltStatus = attachFeature( outputTE, m_trtHitCounts, "TrtHitCount"); if(hltStatus != HLT::OK) { - m_log << MSG::ERROR << "Unable to attach HLT feature TrtHitCount to output TE." << endreq; + m_log << MSG::ERROR << "Unable to attach HLT feature TrtHitCount to output TE." << endmsg; m_attachFTimer->stop(); return hltStatus; } @@ -357,7 +357,7 @@ HLT::ErrorCode TrigCountTrtHits::hltExecute(std::vector<std::vector<HLT::Trigger //--------------------------------------------------------------------------------- HLT::ErrorCode TrigCountTrtHits::hltFinalize() { - m_log << MSG::DEBUG << " finalizing TrigCountTrtHits : "<< name() << endreq; + m_log << MSG::DEBUG << " finalizing TrigCountTrtHits : "<< name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx index e32a5d2fc86..256be0db85e 100644 --- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx @@ -41,21 +41,21 @@ TrigCountTrtHitsHypo::~TrigCountTrtHitsHypo(){;} HLT::ErrorCode TrigCountTrtHitsHypo::hltInitialize() { m_log.setLevel(outputLevel()); if (msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << "Initialising this TrigCountTrtHitsHypo: " << name() << endreq; + m_log << MSG::INFO << "Initialising this TrigCountTrtHitsHypo: " << name() << endmsg; - m_log << MSG::INFO << "================ Hypo Settings ================" << endreq; - m_log << MSG::INFO << " AcceptAll --------------------- " << (m_acceptAll==true ? "True" : "False") << endreq; - m_log << MSG::INFO << " TimeOverThresholdCut --------- " << m_timeOverThresholdCut << endreq; + m_log << MSG::INFO << "================ Hypo Settings ================" << endmsg; + m_log << MSG::INFO << " AcceptAll --------------------- " << (m_acceptAll==true ? "True" : "False") << endmsg; + m_log << MSG::INFO << " TimeOverThresholdCut --------- " << m_timeOverThresholdCut << endmsg; m_log << MSG::INFO << " Requiring hits in ECA or ECC -- " ; - if( m_trtHitsEC_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_trtHitsEC_cut << endreq; + if( m_trtHitsEC_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_trtHitsEC_cut << endmsg; m_log << MSG::INFO << " Cutting on total Trt hits ----- "; - if( m_totalTrtHits_cut < 0.) m_log << MSG::INFO << "Off" << endreq; - else m_log << MSG::INFO << m_totalTrtHits_cut << endreq; + if( m_totalTrtHits_cut < 0.) m_log << MSG::INFO << "Off" << endmsg; + else m_log << MSG::INFO << m_totalTrtHits_cut << endmsg; - m_log << MSG::INFO << "===============================================" << endreq; + m_log << MSG::INFO << "===============================================" << endmsg; } return HLT::OK; @@ -65,18 +65,18 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltInitialize() { HLT::ErrorCode TrigCountTrtHitsHypo::hltBeginRun() { // This initialisation has been moved into the event loop. // @see TrigCountTrtHitsHypo::checkDetectorMask - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountTrtHitsHypo will be initialized in hltExecute" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << " TrigCountTrtHitsHypo will be initialized in hltExecute" << endmsg; return HLT::OK; } //----------------------------------------------------------------------------- HLT::ErrorCode TrigCountTrtHitsHypo::checkDetectorMask() { m_hltExecuteInitialisationRun = true; - m_log << MSG::DEBUG << "[TrigCountTrtHitsHypo::checkDetectorMask] beginning run with this " << name() << endreq; + m_log << MSG::DEBUG << "[TrigCountTrtHitsHypo::checkDetectorMask] beginning run with this " << name() << endmsg; const xAOD::EventInfo* evinfo = 0; if (store()->retrieve(evinfo).isFailure()) { - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endmsg; return HLT::SG_ERROR; } else { @@ -88,13 +88,13 @@ HLT::ErrorCode TrigCountTrtHitsHypo::checkDetectorMask() { << ":" << evinfo->timeStampNSOffset() << "," << evinfo->bcid() << ",0x" << std::hex << evinfo->detectorMask() << std::dec - << "]" << endreq; + << "]" << endmsg; uint64_t mask = evinfo->detectorMask(); eformat::helper::DetectorMask decoder(mask); if (mask == 0) { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0. Assuming MC file and setting all of ID to ON." << endmsg; m_trt_barrel_a_side = true; m_trt_barrel_c_side = true; m_trt_endcap_a_side = true; @@ -107,10 +107,10 @@ HLT::ErrorCode TrigCountTrtHitsHypo::checkDetectorMask() { } if( msgLvl() <= MSG::INFO ){ - m_log << MSG::INFO << "trt_barrel_a_side is " << (m_trt_barrel_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "trt_barrel_c_side is " << (m_trt_barrel_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "trt_endcap_a_side is " << (m_trt_endcap_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; - m_log << MSG::INFO << "trt_endcap_c_side is " << (m_trt_endcap_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endreq; + m_log << MSG::INFO << "trt_barrel_a_side is " << (m_trt_barrel_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "trt_barrel_c_side is " << (m_trt_barrel_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "trt_endcap_a_side is " << (m_trt_endcap_a_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; + m_log << MSG::INFO << "trt_endcap_c_side is " << (m_trt_endcap_c_side==true? "present" : "OFF! Warning: Check if this info is used in trigger decision!") << endmsg; } } return HLT::OK; @@ -125,17 +125,17 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltExecute(const HLT::TriggerElement* outpu } if(msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing this TrigCountTrtHitsHypo " << name() << endreq; + m_log << MSG::DEBUG << "Executing this TrigCountTrtHitsHypo " << name() << endmsg; } if(m_acceptAll){ pass=true; - if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endreq; + if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Accepting all events in " << name() << endmsg; return HLT::OK; } if( !(m_trt_barrel_a_side && m_trt_barrel_c_side && m_trt_endcap_a_side && m_trt_endcap_c_side) ){ - m_log << MSG::DEBUG << "Trt detector is not present. DEBUG will be a WARNING and all events will be rejected in future." << endreq; + m_log << MSG::DEBUG << "Trt detector is not present. DEBUG will be a WARNING and all events will be rejected in future." << endmsg; // pass=false; // return HLT::OK; @@ -152,7 +152,7 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltExecute(const HLT::TriggerElement* outpu if(hltStatus != HLT::OK || !trthits){ if(msgLvl() <= MSG::WARNING){ - m_log << MSG::WARNING << "Failed to retrieve features from TE." << endreq; + m_log << MSG::WARNING << "Failed to retrieve features from TE." << endmsg; } return HLT::OK; } @@ -166,23 +166,23 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltExecute(const HLT::TriggerElement* outpu if( m_trtHitsEC_cut >= 0. ){ if( m_nTrtHits_A > m_nTrtHits_C ){ m_maxTrtHitsEC = m_nTrtHits_A; - m_log << MSG::DEBUG << "More hits in trt endcap A" << endreq; + m_log << MSG::DEBUG << "More hits in trt endcap A" << endmsg; } else{ m_maxTrtHitsEC = m_nTrtHits_C; - m_log << MSG::DEBUG << "More hits in trt endcap C" << endreq; + m_log << MSG::DEBUG << "More hits in trt endcap C" << endmsg; } // trigger decision if( m_maxTrtHitsEC >= m_trtHitsEC_cut ){ pass=true; if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST: event passed with " << m_maxTrtHitsEC << endreq; + m_log << MSG::DEBUG << "REGTEST: event passed with " << m_maxTrtHitsEC << endmsg; } } else{ if( msgLvl() <= MSG::DEBUG ) - m_log << MSG::DEBUG << "REGTEST: event failed with " << m_maxTrtHitsEC << endreq; + m_log << MSG::DEBUG << "REGTEST: event failed with " << m_maxTrtHitsEC << endmsg; } } @@ -191,10 +191,10 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltExecute(const HLT::TriggerElement* outpu // trigger decision if( m_nTrtHits >= m_totalTrtHits_cut ) pass=true; - m_log << MSG::DEBUG << "REGTEST: event passed with " << m_nTrtHits << endreq; + m_log << MSG::DEBUG << "REGTEST: event passed with " << m_nTrtHits << endmsg; } else - m_log << MSG::DEBUG << "REGTEST: event failed with " << m_nTrtHits << endreq; + m_log << MSG::DEBUG << "REGTEST: event failed with " << m_nTrtHits << endmsg; return HLT::OK; } @@ -203,7 +203,7 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltExecute(const HLT::TriggerElement* outpu HLT::ErrorCode TrigCountTrtHitsHypo::hltFinalize() { if(msgLvl() <= MSG::INFO) { - m_log << MSG::INFO << " finalizing this TrigCountTrtHitsHypo : " << name() << endreq; + m_log << MSG::INFO << " finalizing this TrigCountTrtHitsHypo : " << name() << endmsg; } return HLT::OK; } diff --git a/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauFinal.cxx b/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauFinal.cxx index dc1a9be215c..0626f2f92c3 100755 --- a/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauFinal.cxx +++ b/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauFinal.cxx @@ -81,31 +81,31 @@ T2TauFinal::~T2TauFinal(){ HLT::ErrorCode T2TauFinal::hltInitialize() /*-------------------------------------------*/ { - if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Initialization set of tools" << endreq;} + if(msgLvl() <= MSG::DEBUG){ msg() << MSG::DEBUG << "Initialization set of tools" << endmsg;} ToolHandleArray<IAlgToolTau>::iterator it = m_algTools.begin(); for (; it != m_algTools.end(); ++it) { StatusCode sc = it->retrieve(); if( sc.isFailure() ) { - msg() << MSG::ERROR << "Unable to initialize tool " << *it << endreq; + msg() << MSG::ERROR << "Unable to initialize tool " << *it << endmsg; return HLT::BAD_ALGO_CONFIG ; } if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: Created " << *it << " AlgTool" << endreq; + msg() << MSG::DEBUG << "REGTEST: Created " << *it << " AlgTool" << endmsg; } if( msgLvl() <= MSG::DEBUG ) { if( m_updateRoiDescriptor ) - msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endreq; + msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will be updated " << endmsg; else - msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endreq; + msg() << MSG::DEBUG << "REGTEST: TrigRoiDescriptor will NOT be updated " << endmsg; } if ( msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Initialization completed successfully" << endreq; + msg() << MSG::DEBUG << "Initialization completed successfully" << endmsg; return HLT::OK; } @@ -115,7 +115,7 @@ HLT::ErrorCode T2TauFinal::hltFinalize() /*-------------------------------------------*/ { - msg() << MSG::DEBUG << "in finalize()" << endreq; + msg() << MSG::DEBUG << "in finalize()" << endmsg; return HLT::OK; } @@ -139,7 +139,7 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, m_trkAvgDist = -99; m_etOverPtLeadTrk = -99; - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "in execute()" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "in execute()" << endmsg; //--------- 1. get RoI descriptor //const TrigRoiDescriptor* roiDescriptor = 0; @@ -153,9 +153,9 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, << " word " << roiDescriptor->roiWord() << " LVL1 id " << roiDescriptor->l1Id() << " located at eta=" << roiDescriptor->eta() - << ", phi=" << roiDescriptor->phi() << endreq; + << ", phi=" << roiDescriptor->phi() << endmsg; } else { - msg() << MSG::ERROR << " No RoI for this Trigger Element! " << endreq; + msg() << MSG::ERROR << " No RoI for this Trigger Element! " << endmsg; return hltStatus; } @@ -165,10 +165,10 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, if(hltStatus== HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got TrigTauCluster" << endreq; + msg() << MSG::DEBUG << "Got TrigTauCluster" << endmsg; }else{ if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No TrigTauCluster is found in RoI! " << endreq; + msg() << MSG::DEBUG << "REGTEST: No TrigTauCluster is found in RoI! " << endmsg; } @@ -179,10 +179,10 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, if(hltStatus== HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got TrigTauTracksInfo" << endreq; + msg() << MSG::DEBUG << "Got TrigTauTracksInfo" << endmsg; }else{ if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No TrigTauTracksInfo is found in RoI! " << endreq; + msg() << MSG::DEBUG << "REGTEST: No TrigTauTracksInfo is found in RoI! " << endmsg; } //-------- 3. Get vector of tracks @@ -193,10 +193,10 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = getFeature(inputTE, pTrackColl ); if(hltStatus== HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got TrigInDetTrackCollection as well " << endreq; + msg() << MSG::DEBUG << "Got TrigInDetTrackCollection as well " << endmsg; }else{ if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI but TrigTauTracksInfo exists! " << endreq; + msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI but TrigTauTracksInfo exists! " << endmsg; } } @@ -216,17 +216,17 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, if(hltStatus== HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got TrigInDetTrackCollection " << endreq; + msg() << MSG::DEBUG << "Got TrigInDetTrackCollection " << endmsg; }else{ if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI! " << endreq; + msg() << MSG::DEBUG << "REGTEST: No TrigInDetTrackCollection is found in RoI! " << endmsg; } //-------- 4. Make new object if( pClus== 0 && pTracksInfo == 0 ) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << " Nor TrigTauCluster neither TrigInDetTrackCollection is found in RoI! Wrong configuration!" << endreq; + msg() << MSG::DEBUG << " Nor TrigTauCluster neither TrigInDetTrackCollection is found in RoI! Wrong configuration!" << endmsg; return HLT::OK; } @@ -242,7 +242,7 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, ToolHandleArray<IAlgToolTau>::iterator it = m_algTools.begin(); for (; it < m_algTools.end(); it++) { if ((*it)->execute(pClus,pTracksInfo, *pTrigTau).isFailure() ) { - msg() << MSG::WARNING << "T2TauFinal AlgTool "<<*it<< " returned Failure" << endreq; + msg() << MSG::WARNING << "T2TauFinal AlgTool "<<*it<< " returned Failure" << endmsg; delete pTrigTau; pTrigTau=0; return HLT::TOOL_FAILURE; @@ -252,7 +252,7 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = attachFeature(outputTE, pTrigTau ); if (hltStatus != HLT::OK ){ - msg() << MSG::ERROR << "Write of TrigTau into outputTE failed" << endreq; + msg() << MSG::ERROR << "Write of TrigTau into outputTE failed" << endmsg; pTrigTau=0; return hltStatus; } @@ -264,7 +264,7 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, /// found objects actually is. /// Temporarily create an INCORRECT 0 size RoiDescriptor - msg() << MSG::WARNING << "Creating an RoiDescriptor with NO SIZE !!!! this is not allowed" << endreq; + msg() << MSG::WARNING << "Creating an RoiDescriptor with NO SIZE !!!! this is not allowed" << endmsg; TrigRoiDescriptor* newRoiDescriptor = new TrigRoiDescriptor( roiDescriptor->roiWord(), roiDescriptor->l1Id(), @@ -274,24 +274,24 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = attachFeature(outputTE, newRoiDescriptor, "T2TauFinal"); if (hltStatus != HLT::OK ){ - msg() << MSG::ERROR << "Can not attach new RoI descriptor" << endreq; + msg() << MSG::ERROR << "Can not attach new RoI descriptor" << endmsg; delete newRoiDescriptor; return hltStatus; } if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: Recorded an RoiDescriptor " << newRoiDescriptor->roiWord() << " eta=" << newRoiDescriptor->eta() << - ", phi=" << newRoiDescriptor->phi() << endreq; + ", phi=" << newRoiDescriptor->phi() << endmsg; } if(msgLvl() <= MSG::DEBUG){ // msg() << MSG::DEBUG << "REGTEST: Recorded an RoiDescriptor " << newRoiDescriptor->roiWord() << //" eta=" << newRoiDescriptor->eta() << - //", phi=" << newRoiDescriptor->phi() << endreq; + //", phi=" << newRoiDescriptor->phi() << endmsg; msg() << MSG::DEBUG << "REGTEST: TrigTau::pt,eta,phi = " << pTrigTau->pt() <<", " << - pTrigTau->eta() <<", " << pTrigTau->phi() << endreq; - msg() << MSG::DEBUG << "REGTEST: TrigTau::m_nMatchedTracks; = " << pTrigTau->nMatchedTracks() << endreq; - //msg() << MSG::DEBUG << "REGTEST: TrigTau::etCalibCluster = " << pTrigTau->etCalibCluster() << endreq; - msg() << MSG::DEBUG << "REGTEST: TrigTau::simpleEtFlow = " << pTrigTau->simpleEtFlow() << endreq; + pTrigTau->eta() <<", " << pTrigTau->phi() << endmsg; + msg() << MSG::DEBUG << "REGTEST: TrigTau::m_nMatchedTracks; = " << pTrigTau->nMatchedTracks() << endmsg; + //msg() << MSG::DEBUG << "REGTEST: TrigTau::etCalibCluster = " << pTrigTau->etCalibCluster() << endmsg; + msg() << MSG::DEBUG << "REGTEST: TrigTau::simpleEtFlow = " << pTrigTau->simpleEtFlow() << endmsg; } // @@ -321,7 +321,7 @@ HLT::ErrorCode T2TauFinal::hltExecute(const HLT::TriggerElement* inputTE, // Reach this point successfully if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "REGTEST: always accept RoI " << endreq; + msg() << MSG::DEBUG << "REGTEST: always accept RoI " << endmsg; return HLT::OK; diff --git a/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauTrkRadiusTool.cxx b/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauTrkRadiusTool.cxx index b75cb7fc65b..b00160d3989 100644 --- a/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauTrkRadiusTool.cxx +++ b/Trigger/TrigAlgorithms/TrigT2Tau/src/T2TauTrkRadiusTool.cxx @@ -120,7 +120,7 @@ StatusCode T2TauTrkRadiusTool::execute(const TrigTauCluster *pTrigTauCluster, double dEta = (*itr)->param()->eta() - eta; double dr = sqrt( dEta*dEta + dPhi*dPhi ); if ( (dr < m_coneCut) ) { - //log << MSG::DEBUG << "REGTEST: track accepted!!" << endreq; + //log << MSG::DEBUG << "REGTEST: track accepted!!" << endmsg; dRPtWeighted += pt * dr; scalarPtSum += pt; } diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx index df2cd37649f..9e4b6e413bc 100755 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx @@ -211,7 +211,7 @@ TrigTauRecMerged::~TrigTauRecMerged() HLT::ErrorCode TrigTauRecMerged::hltInitialize() { - msg() << MSG::INFO << "TrigTauRecMerged::initialize()" << endreq; + msg() << MSG::INFO << "TrigTauRecMerged::initialize()" << endmsg; m_tauEventData.setInTrigger(true); //////////////////// @@ -219,7 +219,7 @@ HLT::ErrorCode TrigTauRecMerged::hltInitialize() //////////////////// // check tool names if ( m_tools.begin() == m_tools.end() ) { - msg() << MSG::ERROR << " no tools given for this algorithm." << endreq; + msg() << MSG::ERROR << " no tools given for this algorithm." << endmsg; return HLT::BAD_JOB_SETUP; } @@ -227,43 +227,43 @@ HLT::ErrorCode TrigTauRecMerged::hltInitialize() //------------------------------------------------------------------------- ToolHandleArray<ITauToolBase> ::iterator p_itT = m_tools.begin(); ToolHandleArray<ITauToolBase> ::iterator p_itTE = m_tools.end(); - msg() << MSG::INFO << "List of tools in execution sequence:" << endreq; - msg() << MSG::INFO << "------------------------------------" << endreq; + msg() << MSG::INFO << "List of tools in execution sequence:" << endmsg; + msg() << MSG::INFO << "------------------------------------" << endmsg; for(; p_itT != p_itTE; ++p_itT ) { StatusCode p_sc = p_itT->retrieve(); if( p_sc.isFailure() ) { msg() << MSG::WARNING << "Cannot find tool named <"; - msg() << *p_itT << ">" << endreq; + msg() << *p_itT << ">" << endmsg; return HLT::BAD_JOB_SETUP; } else { msg() << MSG::INFO << "REGTEST "; - msg() <<" add timer for tool "<< ( *p_itT )->type() <<" "<< ( *p_itT )->name() << endreq; + msg() <<" add timer for tool "<< ( *p_itT )->type() <<" "<< ( *p_itT )->name() << endmsg; if( doTiming() ) m_mytimers.push_back(addTimer((*p_itT)->name())) ; (*p_itT)->setTauEventData(&m_tauEventData); } } - msg() << MSG::INFO << " " << endreq; - msg() << MSG::INFO << "------------------------------------" << endreq; + msg() << MSG::INFO << " " << endmsg; + msg() << MSG::INFO << "------------------------------------" << endmsg; ToolHandleArray<ITauToolBase> ::iterator p_itTe = m_endtools.begin(); ToolHandleArray<ITauToolBase> ::iterator p_itTEe = m_endtools.end(); - msg() << MSG::INFO << "List of end tools in execution sequence:" << endreq; - msg() << MSG::INFO << "------------------------------------" << endreq; + msg() << MSG::INFO << "List of end tools in execution sequence:" << endmsg; + msg() << MSG::INFO << "------------------------------------" << endmsg; for(; p_itTe != p_itTEe; ++p_itTe ) { StatusCode p_sc = p_itTe->retrieve(); if( p_sc.isFailure() ) { msg() << MSG::WARNING << "Cannot find tool named <"; - msg() << *p_itTe << ">" << endreq; + msg() << *p_itTe << ">" << endmsg; return HLT::BAD_JOB_SETUP; } else { msg() << MSG::INFO << "REGTEST "; - msg() <<" add time for end tool "<< ( *p_itTe )->type() <<" "<< ( *p_itTe )->name() << endreq; + msg() <<" add time for end tool "<< ( *p_itTe )->type() <<" "<< ( *p_itTe )->name() << endmsg; if( doTiming() ) m_mytimers.push_back(addTimer((*p_itTe)->name())) ; ( *p_itTe )->setTauEventData(&m_tauEventData); } @@ -271,26 +271,26 @@ HLT::ErrorCode TrigTauRecMerged::hltInitialize() // // Try to retrieve the lumi tool // if (m_lumiTool.retrieve().isFailure()) { - // msg() << MSG::WARNING << "Unable to retrieve Luminosity Tool" << endreq; + // msg() << MSG::WARNING << "Unable to retrieve Luminosity Tool" << endmsg; // } else { - // msg() << MSG::DEBUG << "Successfully retrieved Luminosity Tool" << endreq; + // msg() << MSG::DEBUG << "Successfully retrieved Luminosity Tool" << endmsg; // } if (m_lumiBlockMuTool.retrieve().isFailure()) { - msg() << MSG::WARNING << "Unable to retrieve LumiBlockMuTool" << endreq; + msg() << MSG::WARNING << "Unable to retrieve LumiBlockMuTool" << endmsg; } else { - msg() << MSG::DEBUG << "Successfully retrieved LumiBlockMuTool" << endreq; + msg() << MSG::DEBUG << "Successfully retrieved LumiBlockMuTool" << endmsg; } // Retrieve beam conditions if(m_beamSpotSvc.retrieve().isFailure()) { - msg() << MSG::WARNING << "Unable to retrieve Beamspot service" << endreq; + msg() << MSG::WARNING << "Unable to retrieve Beamspot service" << endmsg; } else { - msg() << MSG::DEBUG << "Successfully retrieved Beamspot service" << endreq; + msg() << MSG::DEBUG << "Successfully retrieved Beamspot service" << endmsg; } - msg() << MSG::INFO << " " << endreq; - msg() << MSG::INFO << "------------------------------------" << endreq; + msg() << MSG::INFO << " " << endmsg; + msg() << MSG::INFO << "------------------------------------" << endmsg; return HLT::OK; } @@ -298,7 +298,7 @@ HLT::ErrorCode TrigTauRecMerged::hltInitialize() ///////////////////////////////////////////////////////////////// HLT::ErrorCode TrigTauRecMerged::hltFinalize() { - //msg() << MSG::DEBUG << "Finalizing TrigTauRecMerged" << endreq; + //msg() << MSG::DEBUG << "Finalizing TrigTauRecMerged" << endmsg; return HLT::OK; } @@ -357,7 +357,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, m_PhiEF = -99; // Retrieve store. - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Executing TrigTauRecMerged" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Executing TrigTauRecMerged" << endmsg; // Get RoiDescriptor const TrigRoiDescriptor* roiDescriptor = 0; @@ -365,10 +365,10 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, if ( hltStatus==HLT::OK && roiDescriptor!= NULL ) { if( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "REGTEST: RoI " << *roiDescriptor<< endreq; + msg() << MSG::DEBUG << "REGTEST: RoI " << *roiDescriptor<< endmsg; } else { - msg() << MSG::ERROR << "Failed to find RoiDescriptor " << endreq; + msg() << MSG::ERROR << "Failed to find RoiDescriptor " << endmsg; m_calo_errors.push_back(NoROIDescr); return hltStatus; } @@ -379,7 +379,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = getFeatures(inputTE, vectorCaloCellContainer); if(hltStatus!=HLT::OK ) { - msg() << MSG::ERROR << " No CaloCellContainers retrieved for the trigger element" << endreq; + msg() << MSG::ERROR << " No CaloCellContainers retrieved for the trigger element" << endmsg; m_calo_errors.push_back(NoCellCont); return hltStatus; } @@ -388,7 +388,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::ERROR << "Size of vector CaloCell container is not 1. Is" << vectorCaloCellContainer.size() - << endreq; + << endmsg; m_calo_errors.push_back(NoCellCont); return HLT::ERROR; } @@ -401,18 +401,18 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << "REGTEST: Size of vector CaloCell container is " << RoICaloCellContainer->size() - << endreq; + << endmsg; if(RoICaloCellContainer->size()==0) { msg() << MSG::INFO << "Cannot proceed, size of vector CaloCell container is " << RoICaloCellContainer->size() - << endreq; + << endmsg; m_calo_errors.push_back(EmptyCellCont); return HLT::OK; } } else { - msg() << MSG::ERROR << "no CaloCell container found "<< endreq; + msg() << MSG::ERROR << "no CaloCell container found "<< endmsg; m_calo_errors.push_back(NoCellCont); return HLT::ERROR; } @@ -422,7 +422,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = getFeatures(inputTE, vectorCaloClusterContainer); if(hltStatus!=HLT::OK ) { - msg() << MSG::ERROR << " No CaloClusterContainers retrieved for the trigger element" << endreq; + msg() << MSG::ERROR << " No CaloClusterContainers retrieved for the trigger element" << endmsg; m_calo_errors.push_back(NoClustCont); return hltStatus; } @@ -430,13 +430,13 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, if (vectorCaloClusterContainer.size() < 1) { msg() << MSG::ERROR << " CaloCluster container is empty" - << endreq; + << endmsg; m_calo_errors.push_back(NoClustCont); return HLT::ERROR; } if( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << " CaloCluster container size is " << vectorCaloClusterContainer.size() << endreq; + msg() << MSG::DEBUG << " CaloCluster container size is " << vectorCaloClusterContainer.size() << endmsg; // Grab the last cluster collection attached const xAOD::CaloClusterContainer* RoICaloClusterContainer = vectorCaloClusterContainer.back(); @@ -445,13 +445,13 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, hltStatus = getStoreGateKey( RoICaloClusterContainer, collKey ); if(hltStatus!=HLT::OK ) { - msg() << MSG::ERROR << "Cluster has no key " << endreq; + msg() << MSG::ERROR << "Cluster has no key " << endmsg; m_calo_errors.push_back(NoClustKey); return HLT::ERROR; } if( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << " cluster key for back cluster is " << collKey << endreq; + msg() << MSG::DEBUG << " cluster key for back cluster is " << collKey << endmsg; // Not necessary anymore @@ -460,7 +460,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, StatusCode sc = store()->retrieve(RoICaloClusterContainer,collKey); if(sc.isFailure()) { - msg() << MSG :: ERROR << "failed to find Cluster container"<< endreq; + msg() << MSG :: ERROR << "failed to find Cluster container"<< endmsg; m_calo_errors.push_back(NoClustCont); return HLT :: ERROR; } @@ -469,18 +469,18 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << "REGTEST: Size of vector CaloCluster container is " << RoICaloClusterContainer->size() - << endreq; + << endmsg; if(RoICaloClusterContainer->size()==0) { msg() << MSG::DEBUG << "Cannot proceed, size of vector CaloCluster container is " << RoICaloClusterContainer->size() - << endreq; + << endmsg; m_calo_errors.push_back(EmptyClustCont); return HLT::OK; } } else { - msg() << MSG::ERROR << "no CaloCluster container found "<< endreq; + msg() << MSG::ERROR << "no CaloCluster container found "<< endmsg; m_calo_errors.push_back(NoClustCont); return HLT::ERROR; } @@ -494,19 +494,19 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, const xAOD::TrackParticleContainer* RoITrackContainer=NULL; if (hltStatus!=HLT::OK) { - msg() << MSG::INFO << "REGTEST: No Track container found." << endreq; + msg() << MSG::INFO << "REGTEST: No Track container found." << endmsg; m_track_errors.push_back(NoTrkCont); } else { if (vectorTrackContainer.size()<1) { - msg() << MSG::DEBUG << "Size of vector Track container is not 1. Is " << vectorTrackContainer.size() << endreq; + msg() << MSG::DEBUG << "Size of vector Track container is not 1. Is " << vectorTrackContainer.size() << endmsg; m_track_errors.push_back(NoTrkCont); } if(vectorTrackContainer.size()>0) { RoITrackContainer = vectorTrackContainer.back(); if( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "REGTEST: Size of vector Track container is " << RoITrackContainer->size() << endreq; + msg() << MSG::DEBUG << "REGTEST: Size of vector Track container is " << RoITrackContainer->size() << endmsg; } if(RoITrackContainer != NULL) m_nTracks = RoITrackContainer->size(); } @@ -517,19 +517,19 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, const xAOD::VertexContainer* RoIVxContainer = NULL; if(hltStatus!=HLT::OK) { - msg() << MSG::INFO << "No VxContainers retrieved for the trigger element" << endreq; + msg() << MSG::INFO << "No VxContainers retrieved for the trigger element" << endmsg; m_track_errors.push_back(NoVtxCont); } else { if (vectorVxContainer.size() < 1) { - msg() << MSG::DEBUG << "Size of vector Vertex container is not 1. Is " << vectorVxContainer.size() << endreq; + msg() << MSG::DEBUG << "Size of vector Vertex container is not 1. Is " << vectorVxContainer.size() << endmsg; m_track_errors.push_back(NoVtxCont); } if(vectorVxContainer.size() >0) { RoIVxContainer = vectorVxContainer.back(); if( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "REGTEST: Size of vector Vertex container " << RoIVxContainer->size() << endreq; + msg() << MSG::DEBUG << "REGTEST: Size of vector Vertex container " << RoIVxContainer->size() << endmsg; } } @@ -540,10 +540,10 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, // double avg_mu = 0.0; // mu = m_lumiTool->lbLuminosityPerBCID() / m_lumiTool->muToLumi(); // (retrieve mu for the current BCID) // avg_mu = m_lumiTool->lbAverageInteractionsPerCrossing(); - // msg() << MSG::DEBUG << "REGTEST: lbLuminosityPerBCID : " << m_lumiTool->lbLuminosityPerBCID() << endreq; - // msg() << MSG::DEBUG << "REGTEST: muToLumi : " << m_lumiTool->muToLumi() << endreq; - // msg() << MSG::DEBUG << "REGTEST: Retrieved Mu Value : " << mu << endreq; - // msg() << MSG::DEBUG << "REGTEST: Average Mu Value : " << avg_mu << endreq; + // msg() << MSG::DEBUG << "REGTEST: lbLuminosityPerBCID : " << m_lumiTool->lbLuminosityPerBCID() << endmsg; + // msg() << MSG::DEBUG << "REGTEST: muToLumi : " << m_lumiTool->muToLumi() << endmsg; + // msg() << MSG::DEBUG << "REGTEST: Retrieved Mu Value : " << mu << endmsg; + // msg() << MSG::DEBUG << "REGTEST: Average Mu Value : " << avg_mu << endmsg; double mu = 0.0; double avg_mu = 0.0; @@ -553,8 +553,8 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, avg_mu = m_lumiBlockMuTool->averageInteractionsPerCrossing(); m_ActualInteractions = mu; m_AvgInteractions = avg_mu; - msg() << MSG::DEBUG << "REGTEST: Retrieved Mu Value : " << mu << endreq; - msg() << MSG::DEBUG << "REGTEST: Average Mu Value : " << avg_mu << endreq; + msg() << MSG::DEBUG << "REGTEST: Retrieved Mu Value : " << mu << endmsg; + msg() << MSG::DEBUG << "REGTEST: Average Mu Value : " << avg_mu << endmsg; } @@ -622,12 +622,12 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, xAOD::CaloClusterContainer::const_iterator clusterIt; for (clusterIt=RoICaloClusterContainer->begin(); clusterIt != RoICaloClusterContainer->end(); ++clusterIt) { if( msgLvl() <= MSG::DEBUG ) - msg()<< MSG::DEBUG <<" Cluster (e, eta, phi) : ("<< (*clusterIt)->e() << " , " <<(*clusterIt)->eta()<<" , "<<(*clusterIt)->phi()<< " )" << endreq; + msg()<< MSG::DEBUG <<" Cluster (e, eta, phi) : ("<< (*clusterIt)->e() << " , " <<(*clusterIt)->eta()<<" , "<<(*clusterIt)->phi()<< " )" << endmsg; if((*clusterIt)->e() < 0) { if( msgLvl() <= MSG::DEBUG ) - msg()<< MSG::DEBUG <<" Negative energy cluster is rejected" << endreq; + msg()<< MSG::DEBUG <<" Negative energy cluster is rejected" << endmsg; continue; } @@ -639,17 +639,17 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, aJet->setJetP4(xAOD::JetFourMom_t(TauBarycenter.Pt(), TauBarycenter.Eta(), TauBarycenter.Phi(), TauBarycenter.M() ) ); - if( msgLvl() <= MSG::DEBUG ) msg() << MSG :: DEBUG << "jet formed"<< aJet->eta() <<" , " << aJet->phi() <<" , " << aJet->pt() << " , "<< aJet->e() << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG :: DEBUG << "jet formed"<< aJet->eta() <<" , " << aJet->phi() <<" , " << aJet->pt() << " , "<< aJet->e() << endmsg; hltStatus=attachFeature(outputTE, theJetCollection, "TrigTauJet"); if (hltStatus!=HLT::OK ) { - msg() << MSG::ERROR << "Unable to record JetCollection in TDS" << endreq; + msg() << MSG::ERROR << "Unable to record JetCollection in TDS" << endmsg; m_calo_errors.push_back(NoJetAttach); return hltStatus; } else { - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " JetCollection is recorded with key " << "HLT_" << "_" << "TrigTauJet" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << " JetCollection is recorded with key " << "HLT_" << "_" << "TrigTauJet" << endmsg; } @@ -697,11 +697,11 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, processStatus = (*firstTool)->eventInitialize(); if( processStatus != StatusCode :: SUCCESS ) { - msg() << MSG :: ERROR << "tool "<<(*firstTool)->name()<< "failed in eventInitialize" << endreq; + msg() << MSG :: ERROR << "tool "<<(*firstTool)->name()<< "failed in eventInitialize" << endmsg; return HLT :: TOOL_FAILURE; } } - if( msgLvl() <= MSG::DEBUG ) msg() << MSG ::DEBUG << " initialize all good " << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG ::DEBUG << " initialize all good " << endmsg; //------------------------------------------------------------------------- // using Jet collection @@ -716,15 +716,15 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, m_tauEventData.seedContainer = theJetCollection; if(p_seed->e()<=0) { - msg() << MSG::DEBUG << " Roi: changing eta due to energy " << p_seed->e() << endreq; + msg() << MSG::DEBUG << " Roi: changing eta due to energy " << p_seed->e() << endmsg; p_tau->setP4(p_tau->pt(), roiDescriptor->eta(), roiDescriptor->phi(), p_tau->m()); msg() << MSG::DEBUG << "Roi: " << roiDescriptor->roiId() << " Tau eta: " << p_tau->eta() << " Tau phi: " << p_tau->phi() - << endreq; + << endmsg; } - if( msgLvl() <= MSG::DEBUG ) msg() << MSG ::DEBUG <<" roidescriptor roiword " << roiDescriptor->roiWord() << " saved " << p_tau->ROIWord() << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG ::DEBUG <<" roidescriptor roiword " << roiDescriptor->roiWord() << " saved " << p_tau->ROIWord() << endmsg; m_tauEventData.setObject("JetCollection", theJetCollection ); @@ -736,13 +736,13 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, lastTool = m_tools.end(); processStatus = StatusCode::SUCCESS; - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Starting tool loop with seed jet" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Starting tool loop with seed jet" << endmsg; std::vector<TrigTimer* >::iterator itimer = m_mytimers.begin(); while ( ! processStatus.isFailure() && firstTool != lastTool ) { // loop stops only when Failure indicated by one of the tools if( msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "Starting Tool: " << endreq; - msg() << MSG::DEBUG << (*firstTool)->name() << endreq; + msg() << MSG::DEBUG << "Starting Tool: " << endmsg; + msg() << MSG::DEBUG << (*firstTool)->name() << endmsg; } // time in the various tools ++toolnum; @@ -751,14 +751,14 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, processStatus = (*firstTool)->execute( *p_tau ); if ( !processStatus.isFailure() ) { if( msgLvl() <= MSG::DEBUG ) { - msg() << MSG::DEBUG << "REGTEST: "<< (*firstTool)->name() << " executed successfully " << endreq; + msg() << MSG::DEBUG << "REGTEST: "<< (*firstTool)->name() << " executed successfully " << endmsg; msg() << MSG::DEBUG << "REGTEST: Roi: " << roiDescriptor->roiId() << " Tau eta: " << p_tau->eta() << " Tau phi: " << p_tau->phi() - << " Tau pT : "<< p_tau->pt()<< endreq; + << " Tau pT : "<< p_tau->pt()<< endmsg; } } else { - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG <<"REGTEST: "<< (*firstTool)->name() << " execution failed " << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG <<"REGTEST: "<< (*firstTool)->name() << " execution failed " << endmsg; } ++firstTool; @@ -768,7 +768,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, //check status if ( !processStatus.isSuccess() ) { // some problem - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "the tau object has NOT been registered in the tau container" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "the tau object has NOT been registered in the tau container" << endmsg; // ToolHandleArray<ITauToolBase> ::iterator tool = m_tools.begin(); // for(; tool != firstTool; ++tool ) (*tool)->cleanup( &m_tauEventData ); @@ -780,16 +780,16 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, pContainer->pop_back(); - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "clean up done after jet seed" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "clean up done after jet seed" << endmsg; } else if( processStatus.isSuccess()) { float fJetEnergy = (*p_tau->jetLink())->e(); - msg() << MSG::DEBUG << " Roi: jet e "<< fJetEnergy <<endreq; + msg() << MSG::DEBUG << " Roi: jet e "<< fJetEnergy <<endmsg; if( fJetEnergy < 0.00001 ) { - msg() << MSG::DEBUG << " Roi: changing eta phi to L1 ones due to energy negative (PxPyPzE flips eta and phi)"<<endreq; - msg() << MSG::DEBUG << " Roi: this is probably not needed anymore, method PxPyPzE has been corrected"<<endreq; + msg() << MSG::DEBUG << " Roi: changing eta phi to L1 ones due to energy negative (PxPyPzE flips eta and phi)"<<endmsg; + msg() << MSG::DEBUG << " Roi: this is probably not needed anymore, method PxPyPzE has been corrected"<<endmsg; //p_tau->setEta(roiDescriptor->eta0()); //p_tau->setPhi(roiDescriptor->phi0()); @@ -799,7 +799,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << " Roi: " << roiDescriptor->roiId() << " Tau eta: " << p_tau->eta() << " Tau phi: " << p_tau->phi() - << " Tau pT : "<< p_tau->pt()<< endreq; + << " Tau pT : "<< p_tau->pt()<< endmsg; } // loop over end tools @@ -807,7 +807,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, ToolHandleArray<ITauToolBase> ::iterator p_itETE = m_endtools.end(); for (; p_itET != p_itETE; ++p_itET ) { msg() << MSG::VERBOSE << "Invoking endTool "; - msg() << ( *p_itET )->name() << endreq; + msg() << ( *p_itET )->name() << endmsg; processStatus = ( *p_itET )->execute( *p_tau); if( processStatus.isFailure() ) break; @@ -872,11 +872,11 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << "REGTEST: deltaZ0 for core trk "; for ( unsigned int i=0; i<m_deltaZ0coreTrks.size(); ++i) msg() << MSG::DEBUG << i << ": " << m_deltaZ0coreTrks[i] << ", "; - msg() << MSG::DEBUG << endreq; + msg() << MSG::DEBUG << endmsg; msg() << MSG::DEBUG << "REGTEST: deltaZ0 for wide trk "; for ( unsigned int i=0; i<m_deltaZ0wideTrks.size(); ++i) msg() << MSG::DEBUG << i << ": " << m_deltaZ0wideTrks[i] << ", "; - msg() << MSG::DEBUG << endreq; + msg() << MSG::DEBUG << endmsg; } */ @@ -889,11 +889,11 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, if( tmpCaloOnlyStatus != HLT::OK){ - msg() << MSG::DEBUG << "Can't get container TrigTauRecCaloOnly to copy four-vector" << endreq; + msg() << MSG::DEBUG << "Can't get container TrigTauRecCaloOnly to copy four-vector" << endmsg; } else { - msg() << MSG::DEBUG << "Got container TrigTauRecCaloOnly size :" << tempCaloOnlyContVec.size() << endreq; + msg() << MSG::DEBUG << "Got container TrigTauRecCaloOnly size :" << tempCaloOnlyContVec.size() << endmsg; if ( tempCaloOnlyContVec.size() != 0 ) { @@ -904,7 +904,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, for(xAOD::TauJetContainer::const_iterator tauIt = tempCaloOnlyContVec.back()->begin(); tauIt != tempCaloOnlyContVec.back()->end(); tauIt++){ - msg() << MSG::DEBUG << "pT(tau) = " << (*tauIt)->pt() << " pT(caloOnly) = " << (*tauIt)->ptTrigCaloOnly() << endreq; + msg() << MSG::DEBUG << "pT(tau) = " << (*tauIt)->pt() << " pT(caloOnly) = " << (*tauIt)->ptTrigCaloOnly() << endmsg; p_tau->setP4(xAOD::TauJetParameters::TrigCaloOnly, (*tauIt)->ptTrigCaloOnly(), (*tauIt)->etaTrigCaloOnly(), (*tauIt)->phiTrigCaloOnly(), (*tauIt)->mTrigCaloOnly()); @@ -927,7 +927,7 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, msg() << MSG::DEBUG << "REGTEST: Roi: " << roiDescriptor->roiId() << " Tau being saved eta: " << m_EtaEF << " Tau phi: " << m_PhiEF << " wrt L1 dEta "<< m_dEta<<" dPhi "<<m_dPhi - << " Tau Et (GeV): "<< m_EtFinal << endreq; + << " Tau Et (GeV): "<< m_EtFinal << endmsg; ++m_Ncand; } @@ -937,18 +937,18 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, pTrackContainer->erase(pTrackContainer->end()-bad_tau->nAllTracks(), pTrackContainer->end()); pContainer->pop_back(); - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "deleted tau done after jet seed" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "deleted tau done after jet seed" << endmsg; } // call eventFinalize on the booked tau tools for ( firstTool = m_tools.begin(); firstTool != lastTool; firstTool++ ) { processStatus = (*firstTool)->eventFinalize(); if( processStatus != StatusCode :: SUCCESS ) { - msg() << MSG :: INFO << "tool "<<(*firstTool)->name()<< "failed in eventFinalize" << endreq; + msg() << MSG :: INFO << "tool "<<(*firstTool)->name()<< "failed in eventFinalize" << endmsg; return HLT :: TOOL_FAILURE; } } - msg() << MSG :: DEBUG << "tools succeed in eventFinalize" << endreq; + msg() << MSG :: DEBUG << "tools succeed in eventFinalize" << endmsg; //------------------------------------------------------------------------- @@ -958,15 +958,15 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, hltStatus=attachFeature(outputTE, pContainer, m_outputName); hltStatus=attachFeature(outputTE, pTrackContainer, m_outputName+"Tracks"); if (hltStatus!=HLT::OK ) { - msg() << MSG::ERROR << "Unable to record tau Container in TDS" << endreq; + msg() << MSG::ERROR << "Unable to record tau Container in TDS" << endmsg; m_calo_errors.push_back(NoHLTtauAttach); return hltStatus; } else { - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Recorded a tau container: " << "HLT_" << "TrigTauRecMerged" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "Recorded a tau container: " << "HLT_" << "TrigTauRecMerged" << endmsg; } - if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "the tau object has been registered in the tau container" << endreq; + if( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "the tau object has been registered in the tau container" << endmsg; // set status of TE to always true for FE algorithms return HLT::OK; diff --git a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx index f7ac49ccdfc..179ac2bf1ad 100755 --- a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx +++ b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx @@ -81,9 +81,9 @@ muIso::~muIso() HLT::ErrorCode muIso::hltInitialize() { - msg() << MSG::DEBUG << "on initialize()" << endreq; + msg() << MSG::DEBUG << "on initialize()" << endmsg; - msg() << MSG::INFO << "Initializing " << name() << " - package version " << PACKAGE_VERSION << endreq; + msg() << MSG::INFO << "Initializing " << name() << " - package version " << PACKAGE_VERSION << endmsg; m_pStoreGate = store(); // Timer Service @@ -91,7 +91,7 @@ HLT::ErrorCode muIso::hltInitialize() msg() << MSG::DEBUG << "Initialization completed successfully" - << endreq; + << endmsg; return HLT::OK; } @@ -99,7 +99,7 @@ HLT::ErrorCode muIso::hltInitialize() HLT::ErrorCode muIso::hltFinalize() { - msg() << MSG::DEBUG << "in finalize()" << endreq; + msg() << MSG::DEBUG << "in finalize()" << endmsg; return HLT::OK; } @@ -108,7 +108,7 @@ HLT::ErrorCode muIso::hltBeginRun() { msg() << MSG::INFO << "At BeginRun of " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; return HLT::OK; } @@ -116,7 +116,7 @@ HLT::ErrorCode muIso::hltBeginRun() HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE) { - msg() << MSG::DEBUG << "in execute()" << endreq; + msg() << MSG::DEBUG << "in execute()" << endmsg; //Initalize Monitored variables m_ErrorFlagMI = 0; @@ -136,7 +136,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge StatusCode sc = m_pStoreGate->retrieve(pEvent); if (sc.isFailure()) { m_ErrorFlagMI = 1; - msg() << MSG::ERROR << "Could not find xAOD::EventInfo object" << endreq; + msg() << MSG::ERROR << "Could not find xAOD::EventInfo object" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::NAV_ERROR); } @@ -146,25 +146,25 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge if (msgLvl() <= MSG::DEBUG) { msg() << MSG::DEBUG << " ---> Run Number : " - << m_current_run_id << endreq; + << m_current_run_id << endmsg; msg() << MSG::DEBUG << " ---> Event Number : " << std::hex - << m_current_event_id << std::dec << endreq; + << m_current_event_id << std::dec << endmsg; msg() << MSG::DEBUG << " ---> Bunch Crossing ID: " << std::hex - << m_current_bcg_id << std::dec << endreq; + << m_current_bcg_id << std::dec << endmsg; } if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Configured to fex ID: " << endreq; - msg() << MSG::DEBUG << "R ID: " << m_RID << endreq; - msg() << MSG::DEBUG << "PtMin ID: " << m_PtMinTrk << endreq; - msg() << MSG::DEBUG << "AbsEtaMax ID: " << m_EtaMaxTrk << endreq; - msg() << MSG::DEBUG << "AbsDeltaZeta Max ID: " << m_DzetaMax << endreq; + msg() << MSG::DEBUG << "Configured to fex ID: " << endmsg; + msg() << MSG::DEBUG << "R ID: " << m_RID << endmsg; + msg() << MSG::DEBUG << "PtMin ID: " << m_PtMinTrk << endmsg; + msg() << MSG::DEBUG << "AbsEtaMax ID: " << m_EtaMaxTrk << endmsg; + msg() << MSG::DEBUG << "AbsDeltaZeta Max ID: " << m_DzetaMax << endmsg; } // Some debug output: if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "inputTE->ID(): " << inputTE->getId() << endreq; - msg() << MSG::DEBUG << "outputTE->ID(): " << outputTE->getId() << endreq; + msg() << MSG::DEBUG << "inputTE->ID(): " << inputTE->getId() << endmsg; + msg() << MSG::DEBUG << "outputTE->ID(): " << outputTE->getId() << endmsg; } // Start Trigger Element Processing @@ -178,7 +178,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge HLT::ErrorCode status = getFeature(outputTE, const_muonColl); muonColl = const_cast<xAOD::L2CombinedMuonContainer*>(const_muonColl); if (status != HLT::OK || ! muonColl) { - msg() << MSG::ERROR << " L2CombinedMuonContainer not found --> ABORT" << endreq; + msg() << MSG::ERROR << " L2CombinedMuonContainer not found --> ABORT" << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::MISSING_FEATURE); } @@ -197,7 +197,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge if (muonCB->pt() == 0.) { m_ErrorFlagMI = 1; - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " L2CombinedMuon pt = 0 --> stop processing RoI" << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " L2CombinedMuon pt = 0 --> stop processing RoI" << endmsg; muonIS->setErrorFlag(m_ErrorFlagMI); muonISColl->push_back(muonIS); return muIsoSeed(outputTE, muonISColl); @@ -223,7 +223,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge << " / eta = " << eta << " / phi = " << phi << " / z = " << zeta - << endreq; + << endmsg; // ID tracks Decoding @@ -233,13 +233,13 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge if (status != HLT::OK) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << " Failed to get " << algoId << " xAOD::TrackParticleContainer --> ABORT" << endreq; + msg() << MSG::DEBUG << " Failed to get " << algoId << " xAOD::TrackParticleContainer --> ABORT" << endmsg; m_ErrorFlagMI = 2; return HLT::ErrorCode(HLT::Action::ABORT_CHAIN, HLT::Reason::MISSING_FEATURE); } if (!idTrackParticles) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Pointer to xAOD::TrackParticleContainer[" << algoId << "] = 0" << endreq; + msg() << MSG::DEBUG << "Pointer to xAOD::TrackParticleContainer[" << algoId << "] = 0" << endmsg; m_ErrorFlagMI = 2; muonIS->setErrorFlag(m_ErrorFlagMI); muonIS->setSumPt01(0.0); @@ -250,7 +250,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge return muIsoSeed(outputTE, muonISColl); } - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Got xAOD::TrackParticleContainer with size: " << idTrackParticles->size() << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Got xAOD::TrackParticleContainer with size: " << idTrackParticles->size() << endmsg; //ID based isolation float sumpt01 = 0.0; @@ -274,7 +274,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge << " with pt (GeV) = " << pt_id / CLHEP::GeV << ", eta =" << eta_id << ", phi =" << phi_id - << endreq; + << endmsg; if ((fabs(pt_id) / CLHEP::GeV) < m_PtMinTrk) continue; if (fabs(eta_id) > m_EtaMaxTrk) continue; @@ -282,7 +282,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge double dzeta = z_id - zeta; if (fabs(dzeta) > m_DzetaMax) continue; - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Track selected " << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Track selected " << endmsg; if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Found track: " @@ -292,7 +292,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge << ", phi = " << phi_id << ", Zid = " << z_id << ", DZeta = " << dzeta - << endreq; + << endmsg; //see if is in cone double deta = fabs(eta_id - eta); @@ -320,7 +320,7 @@ HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::Trigge << " / " << pt << " / " << sumpt02 << " / " << sumpt02 / pt - << endreq; + << endmsg; // updated monitored variables m_NTRK = ntrk; @@ -356,13 +356,13 @@ HLT::ErrorCode muIso::muIsoSeed(HLT::TriggerElement* outputTE, xAOD::L2IsoMuonCo delete muon_cont; msg() << MSG::ERROR << " Record of xAOD::L2IsoMuonContainer in TriggerElement failed" - << endreq; + << endmsg; return status; } else { if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " xAOD::L2IsoMuonContainer attached to the TriggerElement" - << endreq; + << endmsg; } outputTE->setActiveState(true); return HLT::OK; diff --git a/Trigger/TrigAlgorithms/TrigmuRoI/src/TrigmuRoI.cxx b/Trigger/TrigAlgorithms/TrigmuRoI/src/TrigmuRoI.cxx index 217673e74bc..d6df02455bc 100644 --- a/Trigger/TrigAlgorithms/TrigmuRoI/src/TrigmuRoI.cxx +++ b/Trigger/TrigAlgorithms/TrigmuRoI/src/TrigmuRoI.cxx @@ -62,57 +62,57 @@ HLT::ErrorCode TrigmuRoI::hltInitialize() { m_log.setLevel(outputLevel()); - m_log << MSG::INFO << "initialize()" << endreq; + m_log << MSG::INFO << "initialize()" << endmsg; #ifdef ATLAS_GAUDI_V21 SmartIF<IService> tmp_msgSvc(msgSvc()); if(tmp_msgSvc.isValid()) { m_log << MSG::INFO << " Algorithm = " << name() << " is connected to Message Service = " - << tmp_msgSvc->name() << endreq; + << tmp_msgSvc->name() << endmsg; } #else Service* tmp_msgSvc = dynamic_cast<Service*> (msgSvc()); if(tmp_msgSvc != 0) { m_log << MSG::INFO << " Algorithm = " << name() << " is connected to Message Service = " - << tmp_msgSvc->name() << endreq; + << tmp_msgSvc->name() << endmsg; } #endif m_log << MSG::INFO << " ROB ID: DAQ CTP = " << m_daqCTPROBid - << std::setw(6) << " (=0x" << MSG::hex << m_daqCTPROBid.value() << MSG::dec << ")" << endreq; + << std::setw(6) << " (=0x" << MSG::hex << m_daqCTPROBid.value() << MSG::dec << ")" << endmsg; m_log << MSG::INFO << " ROB ID: DAQ muCTPi = " << m_daqMuCTPiROBid - << std::setw(6) << " (=0x" << MSG::hex << m_daqMuCTPiROBid.value() << MSG::dec << ")" << endreq; + << std::setw(6) << " (=0x" << MSG::hex << m_daqMuCTPiROBid.value() << MSG::dec << ")" << endmsg; - m_log << MSG::INFO << m_minValueForOutOfTimeBC << endreq; - m_log << MSG::INFO << m_maxValueForOutOfTimeBC << endreq; + m_log << MSG::INFO << m_minValueForOutOfTimeBC << endmsg; + m_log << MSG::INFO << m_maxValueForOutOfTimeBC << endmsg; // Retrieve the MuonRoITool StatusCode sc = m_trigMuonRoITool.retrieve(); if ( sc.isFailure() ) { - m_log << MSG::ERROR << "Could not retrieve " << m_trigMuonRoITool << endreq; + m_log << MSG::ERROR << "Could not retrieve " << m_trigMuonRoITool << endmsg; return HLT::ERROR; } else { - m_log << MSG::INFO << "Retrieved tool " << m_trigMuonRoITool << endreq; + m_log << MSG::INFO << "Retrieved tool " << m_trigMuonRoITool << endmsg; } sc = m_recRPCRoiSvc.retrieve(); if ( sc.isFailure() ) { - m_log << MSG::ERROR << "Couldn't connect to " << m_recRPCRoiSvc << endreq; + m_log << MSG::ERROR << "Couldn't connect to " << m_recRPCRoiSvc << endmsg; return HLT::ERROR; } else { - m_log << MSG::INFO << "Retrieved Service " << m_recRPCRoiSvc << endreq; + m_log << MSG::INFO << "Retrieved Service " << m_recRPCRoiSvc << endmsg; } sc = m_recTGCRoiSvc.retrieve(); if ( sc.isFailure() ) { - m_log << MSG::ERROR << "Couldn't connect to " << m_recTGCRoiSvc << endreq; + m_log << MSG::ERROR << "Couldn't connect to " << m_recTGCRoiSvc << endmsg; return HLT::ERROR; } else { - m_log << MSG::INFO << "Retrieved Service " << m_recTGCRoiSvc << endreq; + m_log << MSG::INFO << "Retrieved Service " << m_recTGCRoiSvc << endmsg; } - m_log << MSG::DEBUG << "initialization - done" << endreq; + m_log << MSG::DEBUG << "initialization - done" << endmsg; return HLT::OK; } @@ -137,7 +137,7 @@ HLT::ErrorCode TrigmuRoI::hltExecute(std::vector<std::vector<HLT::TriggerElement if ( m_log.level() <= MSG::DEBUG) { msg() << MSG::DEBUG << "Executing TrigmuRoI (" << name() - << ")" << endreq; + << ")" << endmsg; } int roi_id = 0; @@ -148,42 +148,42 @@ HLT::ErrorCode TrigmuRoI::hltExecute(std::vector<std::vector<HLT::TriggerElement int BCID_diff = distance(m_trigMuonRoITool->begin_OutOfTimeRoIs(),m_trigMuonRoITool->end_OutOfTimeRoIs()); if(m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "=====================================================" << endreq; + m_log << MSG::DEBUG << "=====================================================" << endmsg; m_log << MSG::DEBUG << " RoIs out of time with event BCID: Number of RoIs = " - << BCID_diff << endreq; - m_log << MSG::DEBUG << "=====================================================" << endreq; + << BCID_diff << endmsg; + m_log << MSG::DEBUG << "=====================================================" << endmsg; } std::vector< std::pair<ROIB::MuCTPIRoI,int> >::const_iterator it_begin_ot, it_end_ot; if(m_log.level() <= MSG::DEBUG) - m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: get begin in time iterator" << endreq; + m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: get begin in time iterator" << endmsg; it_begin_ot = m_trigMuonRoITool->begin_OutOfTimeRoIs(); if(m_log.level() <= MSG::DEBUG) - m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: get end in time iterator" << endreq; + m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: get end in time iterator" << endmsg; it_end_ot = m_trigMuonRoITool->end_OutOfTimeRoIs(); if(m_log.level() <= MSG::DEBUG) - m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: print out of time RoIs" << endreq; + m_log << MSG::DEBUG << "===> execute() TrigMuonRoITool Test Algorithm: print out of time RoIs" << endmsg; for (std::vector< std::pair<ROIB::MuCTPIRoI,int> >::const_iterator it = m_trigMuonRoITool->begin_OutOfTimeRoIs(); it != m_trigMuonRoITool->end_OutOfTimeRoIs(); ++it) { if(m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << " Difference(RoI(BCID) - Event(BCID)) = " << (*it).second << endreq; - m_log << MSG::DEBUG << " ------------------------------------- " << endreq; - m_log << MSG::DEBUG << "RoIB word : 0x" << MSG::hex << ((*it).first).roIWord() << MSG::dec << endreq; - m_log << MSG::DEBUG << "Threshold : pt" << ((*it).first).pt() << endreq; - m_log << MSG::DEBUG << "Sector ID : " << ((*it).first).getSectorID() << endreq; - m_log << MSG::DEBUG << "Sector addr : 0x" << MSG::hex << ((*it).first).getSectorAddress() << MSG::dec << endreq; - m_log << MSG::DEBUG << "Sector overflow : " << ((*it).first).getSectorOverflow() << endreq; - m_log << MSG::DEBUG << "RoI overflow : " << ((*it).first).getRoiOverflow() << endreq; - m_log << MSG::DEBUG << "RoI number : " << ((*it).first).getRoiNumber() << endreq; - m_log << MSG::DEBUG << "IsHighestPt : " << ((*it).first).getCandidateIsHighestPt() << endreq; - m_log << MSG::DEBUG << "=================================================" << endreq; + m_log << MSG::DEBUG << " Difference(RoI(BCID) - Event(BCID)) = " << (*it).second << endmsg; + m_log << MSG::DEBUG << " ------------------------------------- " << endmsg; + m_log << MSG::DEBUG << "RoIB word : 0x" << MSG::hex << ((*it).first).roIWord() << MSG::dec << endmsg; + m_log << MSG::DEBUG << "Threshold : pt" << ((*it).first).pt() << endmsg; + m_log << MSG::DEBUG << "Sector ID : " << ((*it).first).getSectorID() << endmsg; + m_log << MSG::DEBUG << "Sector addr : 0x" << MSG::hex << ((*it).first).getSectorAddress() << MSG::dec << endmsg; + m_log << MSG::DEBUG << "Sector overflow : " << ((*it).first).getSectorOverflow() << endmsg; + m_log << MSG::DEBUG << "RoI overflow : " << ((*it).first).getRoiOverflow() << endmsg; + m_log << MSG::DEBUG << "RoI number : " << ((*it).first).getRoiNumber() << endmsg; + m_log << MSG::DEBUG << "IsHighestPt : " << ((*it).first).getCandidateIsHighestPt() << endmsg; + m_log << MSG::DEBUG << "=================================================" << endmsg; } unsigned int temp_sysID = @@ -233,7 +233,7 @@ HLT::ErrorCode TrigmuRoI::hltExecute(std::vector<std::vector<HLT::TriggerElement m_log << MSG::DEBUG << "New RoI descriptor for " << region << " created from word 0x" << MSG::hex << ((*it).first).roIWord() << MSG::dec - << endreq; + << endmsg; } } roi_id += 1; diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx index c9f2d1f4c90..d2e99d34f13 100644 --- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx +++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx @@ -353,7 +353,7 @@ char TrigDecisionMaker::getBGByte(int BCId) { // if(bgs->bunchGroups().size()!=8) { // (*m_log) << MSG::WARNING << " Did not find 8 bunchgroups in the set (actual number of BGs is " // << bgs->bunchGroups().size() - // << ")" << endreq; + // << ")" << endmsg; // return 0; // } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h index c131680a323..656ce045a5d 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h @@ -19,8 +19,6 @@ #include "TTree.h" #include "TFile.h" -#define endreq endmsg - class AnalysisConfig_Ntuple : public T_AnalysisConfig<IHLTMonTool> { public: diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h index 688c1517c41..a287fa942df 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h @@ -86,8 +86,6 @@ // the xAOD::TrackParticle header if it exists #include "TrkParticleCreator/TrackParticleCreatorTool.h" -#define endreq endmsg - template<typename T> void HighestPTOnly( std::vector<T*>& tracks ) { @@ -177,7 +175,7 @@ public: /// doesn't work yet // void verbose( std::ostream& s ) { - // if( m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << s << endreq; + // if( m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << s << endmsg; // } protected: @@ -201,7 +199,7 @@ protected: virtual void loop() { if( m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::loop() for " << T_AnalysisConfig<T>::m_analysisInstanceName << endreq; + m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::loop() for " << T_AnalysisConfig<T>::m_analysisInstanceName << endmsg; } // get (offline) beam position @@ -220,7 +218,7 @@ protected: # endif if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endreq; + m_provider->msg(MSG::VERBOSE) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endmsg; } } @@ -229,14 +227,14 @@ protected: if ( first ) { - m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endreq; + m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endmsg; if(m_provider->msg().level() <= MSG::VERBOSE) { std::vector<std::string> configuredChains = (*(m_tdt))->getListOfTriggers("L2_.*, EF_.*, HLT_.*"); for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) { - m_provider->msg(MSG::INFO) << "Chain " << configuredChains[i] << endreq; + m_provider->msg(MSG::INFO) << "Chain " << configuredChains[i] << endmsg; } } @@ -258,7 +256,7 @@ protected: /// get chain ChainString& chainName = (*chainitr); - m_provider->msg(MSG::INFO) << "process chain " << chainName << "\traw: " << chainitr->raw() << endreq; + m_provider->msg(MSG::INFO) << "process chain " << chainName << "\traw: " << chainitr->raw() << endmsg; /// check for wildcard ... // if ( chainName.head().find("*")!=std::string::npos ) { @@ -273,7 +271,7 @@ protected: // std::cout << "selected chains " << selectChains.size() << std::endl; - // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endreq; + // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endmsg; for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) { @@ -298,7 +296,7 @@ protected: chains.push_back( ChainString(selectChains[iselected]) ); if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << ")" << endreq; + m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << ")" << endmsg; } } // else { @@ -311,7 +309,7 @@ protected: // m_chainNames.insert( m_chainNames.end(), chains.begin(), chains.end() ); m_chainNames = chains; - for ( unsigned ic=0 ; ic<m_chainNames.size() ; ic++ ) m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endreq; + for ( unsigned ic=0 ; ic<m_chainNames.size() ; ic++ ) m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endmsg; } /// end of first event setup @@ -366,7 +364,7 @@ protected: double mu_val = 0; if ( m_provider->evtStore()->retrieve(pEventInfo).isFailure() ) { - m_provider->msg(MSG::WARNING) << "Failed to get EventInfo " << endreq; + m_provider->msg(MSG::WARNING) << "Failed to get EventInfo " << endmsg; } else { #ifndef XAODTRACKING_TRACKPARTICLE_H @@ -389,12 +387,12 @@ protected: if(m_provider->msg().level() <= MSG::VERBOSE){ m_provider->msg(MSG::VERBOSE) << "run " << run_number << "\tevent " << event_number - << "\tlb " << lumi_block << endreq; + << "\tlb " << lumi_block << endmsg; } // m_provider->msg(MSG::INFO) << "run " << run_number // << "\tevent " << event_number - // << "\tlb " << lumi_block << endreq; + // << "\tlb " << lumi_block << endmsg; // std::cout << "run " << run_number << "\tevent " << event_number << "\tlb " << lumi_block << std::endl; @@ -428,7 +426,7 @@ protected: if ( m_provider->msg().level() <= MSG::DEBUG ) { m_provider->msg(MSG::DEBUG) << "Chain " << chainname << "\tpass " << (*m_tdt)->isPassed(chainname) - << "\tpres " << (*m_tdt)->getPrescale(chainname) << endreq; + << "\tpres " << (*m_tdt)->getPrescale(chainname) << endmsg; } // std::cout << "Chain " << chainname << "\tpass " << (*m_tdt)->isPassed(chainname) @@ -445,14 +443,14 @@ protected: first = false; if ( (*m_tdt)->ExperimentalAndExpertMethods()->isHLTTruncated() ) { - m_provider->msg(MSG::WARNING) << "HLTResult truncated, skipping event" << endreq; + m_provider->msg(MSG::WARNING) << "HLTResult truncated, skipping event" << endmsg; return; } if ( !this->m_keepAllEvents && !analyse ) { - // m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endreq; + // m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endmsg; if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endreq; + m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endmsg; return; } @@ -461,21 +459,21 @@ protected: selectorTruth.clear(); if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endreq; + m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endmsg; const TrigInDetTrackTruthMap* truthMap = 0; if ( m_mcTruth ) { - if(m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq; + if(m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg; if ( m_provider->evtStore()->retrieve(truthMap, "TrigInDetTrackTruthMap").isFailure()) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap not found" << endreq; + m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap not found" << endmsg; m_hasTruthMap = false; } else { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap found" << endreq; + m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap found" << endmsg; m_hasTruthMap = true; } } @@ -499,7 +497,7 @@ protected: if ( m_provider->evtStore()->template contains<VxContainer>("VxPrimaryCandidate") ) { if ( m_provider->evtStore()->retrieve(primaryVtxCollection, "VxPrimaryCandidate").isFailure()) { if (m_provider->msg().level() <= MSG::WARNING) - m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endreq; + m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endmsg; } else { VxContainer::const_iterator vtxitr = primaryVtxCollection->begin(); @@ -522,17 +520,17 @@ protected: //std::vector<TIDA::Vertex> vertices; - m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endreq; + m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endmsg; const xAOD::VertexContainer* xaodVtxCollection = 0; if ( m_provider->evtStore()->retrieve( xaodVtxCollection, "PrimaryVertices" ).isFailure()) { - m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endreq; + m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endmsg; } if ( xaodVtxCollection!=0 ) { - m_provider->msg(MSG::VERBOSE) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endreq; + m_provider->msg(MSG::VERBOSE) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg; xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin(); for ( ; vtxitr != xaodVtxCollection->end(); vtxitr++ ) { @@ -571,7 +569,7 @@ protected: if ( m_doOffline ) { for ( unsigned i=0 ; i<vertices.size() ; i++ ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "vertex " << i << " " << vertices[i] << endreq; + m_provider->msg(MSG::VERBOSE) << "vertex " << i << " " << vertices[i] << endmsg; m_event->addVertex(vertices[i]); } } @@ -632,13 +630,13 @@ protected: if(m_provider->msg().level() <= MSG::VERBOSE){ m_provider->msg(MSG::VERBOSE) << "status for chain " << chainname << "\tpass " << (*m_tdt)->isPassed(chainname) - << "\tprescale " << (*m_tdt)->getPrescale(chainname) << endreq; + << "\tprescale " << (*m_tdt)->getPrescale(chainname) << endmsg; - m_provider->msg(MSG::VERBOSE) << "fetching features for chain " << chainname << endreq; + m_provider->msg(MSG::VERBOSE) << "fetching features for chain " << chainname << endmsg; } if(m_provider->msg().level() <= MSG::VERBOSE){ - m_provider->msg(MSG::VERBOSE) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << endreq; + m_provider->msg(MSG::VERBOSE) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << endmsg; } // std::cout << "\tstatus for chain " << chainname @@ -647,7 +645,7 @@ protected: // << "\tprescale " << (*m_tdt)->getPrescale( chainname ) << std::endl; - // m_provider->msg(MSG::INFO) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << "\t" << m_chainNames[ichain] << "\trun " << run_number << "\tevent " << event_number << endreq; + // m_provider->msg(MSG::INFO) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << "\t" << m_chainNames[ichain] << "\trun " << run_number << "\tevent " << event_number << endmsg; if ( !this->m_keepAllEvents && !(*m_tdt)->isPassed( chainname, decisiontype ) ) continue; @@ -667,13 +665,13 @@ protected: if ( c==cEnd ) { if(m_provider->msg().level() <= MSG::VERBOSE){ - m_provider->msg(MSG::VERBOSE) << "No combinations: skipping this chain " << chainname << endreq; + m_provider->msg(MSG::VERBOSE) << "No combinations: skipping this chain " << chainname << endmsg; } continue; } if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << "combinations for chain " << chainname << " " << (cEnd-c) << endreq; + m_provider->msg(MSG::VERBOSE) << "combinations for chain " << chainname << " " << (cEnd-c) << endmsg; } ChainString& chainConfig = m_chainNames[ichain]; @@ -724,7 +722,7 @@ protected: // Skip chains seeded by multiple RoIs: not yet implemented if(initRois.size()>1 && roi_key!="SuperRoi" ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << " More than one initial RoI found for seeded chain " << chainname << ": not yet supported" << endreq; + m_provider->msg(MSG::VERBOSE) << " More than one initial RoI found for seeded chain " << chainname << ": not yet supported" << endmsg; continue; } @@ -734,7 +732,7 @@ protected: const TrigRoiDescriptor* roid = initRois[0].cptr(); if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << " RoI descriptor for seeded chain " << chainname << " " << *roid << endreq; + m_provider->msg(MSG::VERBOSE) << " RoI descriptor for seeded chain " << chainname << " " << *roid << endmsg; roiInfo = new TIDARoiDescriptor(TIDARoiDescriptorBuilder(*roid)); // roiInfo->etaHalfWidth(m_roiInfo->etaHalfWidth()); @@ -744,7 +742,7 @@ protected: // roiInfo->zedHalfWidth(roid->zedHalfWidth()); if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "using chain roi " << *roid << endreq; + m_provider->msg(MSG::VERBOSE) << "using chain roi " << *roid << endmsg; } else { @@ -754,16 +752,16 @@ protected: // roiInfo->zedHalfWidth(m_roiInfo->zedHalfWidth()); if(m_provider->msg().level() <= MSG::WARNING) - m_provider->msg(MSG::WARNING) << "roi not found" << endreq; + m_provider->msg(MSG::WARNING) << "roi not found" << endmsg; } if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << *roiInfo << endreq; + m_provider->msg(MSG::VERBOSE) << *roiInfo << endmsg; m_selectorTest->clear(); - m_provider->msg(MSG::VERBOSE) << "Searching for collection " << key << endreq; + m_provider->msg(MSG::VERBOSE) << "Searching for collection " << key << endmsg; // std::cout << "Searching for collection " << key << std::endl; /// HLT and EF-like EDM @@ -781,7 +779,7 @@ protected: else if ( this->template selectTracks<TrackCollection>( m_selectorTest, c, key ) ); else if ( this->template selectTracks<TrigInDetTrackCollection>( m_selectorTest, c, truthMap, key, key_index ) ); else { - //m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endreq; + //m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endmsg; } } else { @@ -793,22 +791,22 @@ protected: # ifdef XAODTRACKING_TRACKPARTICLE_H else if ( this->template selectTracks<xAOD::TrackParticleContainer>( m_selectorTest, c, key ) ) testbeamspot = this->template getBeamspot<xAOD::TrackParticleContainer>( c, key ); # endif - else m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endreq; + else m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endmsg; } } const std::vector<TIDA::Track*>& testtracks = m_selectorTest->tracks(); - m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endreq; + m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endmsg; // std::cout << "test tracks.size() " << testtracks.size() << std::endl; // std::cout << "\ttest tracks.size() " << testtracks.size() << std::endl; if(m_provider->msg().level() <= MSG::VERBOSE){ - m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endreq; + m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endmsg; for ( int ii=testtracks.size() ; ii-- ; ) { - m_provider->msg(MSG::VERBOSE) << " test track " << ii << " " << *testtracks[ii] << endreq; + m_provider->msg(MSG::VERBOSE) << " test track " << ii << " " << *testtracks[ii] << endmsg; //test_tracks.push_back(testtracks.at(ii)); } } @@ -827,22 +825,22 @@ protected: if ( vtx_name!="" ) { - m_provider->msg(MSG::VERBOSE) << "\tFetch xAOD::VertexContainer for chain " << chainConfig << " with key " << vtx_name << endreq; + m_provider->msg(MSG::VERBOSE) << "\tFetch xAOD::VertexContainer for chain " << chainConfig << " with key " << vtx_name << endmsg; std::vector< Trig::Feature<xAOD::VertexContainer> > xaodtrigvertices = c->get<xAOD::VertexContainer>(vtx_name); if ( xaodtrigvertices.empty() ) { - m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainConfig << " for key " << vtx_name << endreq; + m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainConfig << " for key " << vtx_name << endmsg; } else { - m_provider->msg(MSG::VERBOSE) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endreq; + m_provider->msg(MSG::VERBOSE) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endmsg; for ( unsigned iv=0 ; iv<xaodtrigvertices.size() ; iv++ ) { const xAOD::VertexContainer* vert = xaodtrigvertices[iv].cptr(); - m_provider->msg(MSG::VERBOSE) << "\t" << iv << " xAOD VxContainer for " << chainConfig << " " << vert << " key " << vtx_name << endreq; + m_provider->msg(MSG::VERBOSE) << "\t" << iv << " xAOD VxContainer for " << chainConfig << " " << vert << " key " << vtx_name << endmsg; xAOD::VertexContainer::const_iterator vtxitr = vert->begin(); @@ -873,7 +871,7 @@ protected: } if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << "event: " << *m_event << endreq; + m_provider->msg(MSG::VERBOSE) << "event: " << *m_event << endmsg; } @@ -906,7 +904,7 @@ protected: /// will leave as it is for the time being if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endreq; + m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endmsg; bool foundTruth = false; @@ -918,7 +916,7 @@ protected: selectorTruth.clear(); if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq; + m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg; if (m_provider->evtStore()->template contains<TruthParticleContainer>("INav4MomTruthEvent")) { //ESD @@ -937,13 +935,13 @@ protected: } else if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "Truth not found - none whatsoever!" << endreq; + m_provider->msg(MSG::VERBOSE) << "Truth not found - none whatsoever!" << endmsg; } if ( !m_doOffline && m_mcTruth && !foundTruth ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq; + m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg; /// selectTracks<TruthParticleContainer>( &selectorTruth, "INav4MomTruthEvent" ); @@ -959,27 +957,27 @@ protected: for ( int ik=0 ; ik<4 ; ik++ ) { if( m_provider->msg().level() <= MSG::VERBOSE ) { - m_provider->msg(MSG::VERBOSE) << "Try McEventCollection: " << keys[ik] << endreq; + m_provider->msg(MSG::VERBOSE) << "Try McEventCollection: " << keys[ik] << endmsg; } if ( !m_provider->evtStore()->template contains<McEventCollection>(keys[ik]) ) { if( m_provider->msg().level() <= MSG::VERBOSE ) - m_provider->msg(MSG::VERBOSE) << "No McEventCollection: " << keys[ik] << endreq; + m_provider->msg(MSG::VERBOSE) << "No McEventCollection: " << keys[ik] << endmsg; continue; } if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "evtStore()->retrieve( mcevent, " << keys[ik] << " )" << endreq; + m_provider->msg(MSG::VERBOSE) << "evtStore()->retrieve( mcevent, " << keys[ik] << " )" << endmsg; if ( m_provider->evtStore()->template retrieve( mcevent, keys[ik] ).isFailure() ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "Failed to get McEventCollection: " << keys[ik] << endreq; + m_provider->msg(MSG::VERBOSE) << "Failed to get McEventCollection: " << keys[ik] << endmsg; } else { /// found this key key = keys[ik]; if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << endreq; + m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << endmsg; foundcollection = true; break; } @@ -988,7 +986,7 @@ protected: /// not found any truth collection if ( !foundcollection ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endreq; + m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endmsg; // m_tree->Fill(); // return StatusCode::FAILURE; @@ -997,7 +995,7 @@ protected: } if ( m_provider->msg().level() <= MSG::VERBOSE ) { - m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << "\tNevents " << mcevent->size() << endreq; + m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << "\tNevents " << mcevent->size() << endmsg; } McEventCollection::const_iterator evitr = mcevent->begin(); @@ -1035,15 +1033,15 @@ protected: if ( _ip>0 ) { /// if there were some particles in this interaction ... - // m_provider->msg(MSG::VERBOSE) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endreq; + // m_provider->msg(MSG::VERBOSE) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endmsg; ++ie_ip; ip += _ip; } } if(m_provider->msg().level() <= MSG::VERBOSE){ - m_provider->msg(MSG::VERBOSE) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endreq; - m_provider->msg(MSG::VERBOSE) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endreq; + m_provider->msg(MSG::VERBOSE) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endmsg; + m_provider->msg(MSG::VERBOSE) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg; } if(selectorTruth.size() > 0) foundTruth = true; @@ -1053,7 +1051,7 @@ protected: if ( !(ip>0) ) { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endreq; + m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endmsg; return; /// need to be careful here, if not requiring truth *only* should not return } @@ -1063,7 +1061,7 @@ protected: /// get offline tracks - // m_provider->msg(MSG::VERBOSE) << " Offline tracks " << endreq; + // m_provider->msg(MSG::VERBOSE) << " Offline tracks " << endmsg; if ( m_doOffline ) { # ifdef XAODTRACKING_TRACKPARTICLE_H @@ -1080,7 +1078,7 @@ protected: } # endif else if ( m_provider->msg().level() <= MSG::WARNING ) { - m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endreq; + m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endmsg; } // std::cout << "seeking (more?) offline tracks..." << std::endl; @@ -1092,9 +1090,9 @@ protected: // std::cout << "SUTT ref_tracks" << ref_tracks.size() << std::endl; if ( m_provider->msg().level() <= MSG::VERBOSE ) { - m_provider->msg(MSG::VERBOSE) << "ref tracks.size() " << m_selectorRef->tracks().size() << endreq; + m_provider->msg(MSG::VERBOSE) << "ref tracks.size() " << m_selectorRef->tracks().size() << endmsg; for ( int ii=m_selectorRef->tracks().size() ; ii-- ; ) - m_provider->msg(MSG::VERBOSE) << " ref track " << ii << " " << *m_selectorRef->tracks()[ii] << endreq; + m_provider->msg(MSG::VERBOSE) << " ref track " << ii << " " << *m_selectorRef->tracks()[ii] << endmsg; } } else { @@ -1119,7 +1117,7 @@ protected: if ( testbeamspot.size()>0 ) _analysis->setBeamTest( testbeamspot ); if ( first && m_NRois==0 && m_provider->msg().level() <= MSG::INFO) { - m_provider->msg(MSG::INFO) << m_provider->name() << " using highest pt reference track only " << this->getUseHighestPT() << endreq; + m_provider->msg(MSG::INFO) << m_provider->name() << " using highest pt reference track only " << this->getUseHighestPT() << endmsg; } /// if we want a purity, we need to swap round which tracks are the @@ -1181,14 +1179,14 @@ protected: m_provider->msg(MSG::INFO) << "Missing track for " << m_chainNames[ichain] << "\trun " << run_number << "\tevent " << event_number - << "\tlb " << lumi_block << endreq; + << "\tlb " << lumi_block << endmsg; } } } if ( m_provider->msg().level() <= MSG::VERBOSE ) { - m_provider->msg(MSG::VERBOSE) << "\n\nEvent " << *m_event << endreq; + m_provider->msg(MSG::VERBOSE) << "\n\nEvent " << *m_event << endmsg; } } @@ -1197,27 +1195,27 @@ protected: virtual void book() { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() " << name() << endreq; + m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() " << name() << endmsg; // get the beam condition services - one for online and one for offline m_iBeamCondSvc = 0; if ( m_provider->service( "BeamCondSvc", m_iBeamCondSvc ).isFailure() ) { if(m_provider->msg().level() <= MSG::ERROR) - m_provider->msg(MSG::ERROR) << " failed to retrieve BeamCondSvc " << endreq; + m_provider->msg(MSG::ERROR) << " failed to retrieve BeamCondSvc " << endmsg; } // get the TriggerDecisionTool if( m_tdt->retrieve().isFailure() ) { if(m_provider->msg().level() <= MSG::ERROR) - m_provider->msg(MSG::ERROR) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endreq; + m_provider->msg(MSG::ERROR) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endmsg; // return StatusCode::FAILURE; return; } if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << " Successfully retrived the TrigDecisionTool" << endreq; + m_provider->msg(MSG::VERBOSE) << " Successfully retrived the TrigDecisionTool" << endmsg; } @@ -1225,10 +1223,10 @@ protected: if (m_provider->msg().level() <= MSG::VERBOSE) { std::vector<std::string> configuredChains = (*(m_tdt))->getListOfTriggers("L2_.*, EF_.*, HLT_.*"); - m_provider->msg(MSG::VERBOSE) << "Configured chains" << endreq; + m_provider->msg(MSG::VERBOSE) << "Configured chains" << endmsg; for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) { if( m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << " Chain " << configuredChains[i] << endreq; + m_provider->msg(MSG::VERBOSE) << " Chain " << configuredChains[i] << endmsg; } } @@ -1248,7 +1246,7 @@ protected: /// get chain ChainString& chainName = (*chainitr); - // m_provider->msg(MSG::VERBOSE) << "process chain " << chainName << endreq; + // m_provider->msg(MSG::VERBOSE) << "process chain " << chainName << endmsg; /// check for wildcard ... // if ( chainName.head().find("*")!=std::string::npos ) { @@ -1264,7 +1262,7 @@ protected: // std::cout << "selected chains " << selectChains.size() << std::endl; - // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endreq; + // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endmsg; for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) { @@ -1279,7 +1277,7 @@ protected: chains.push_back( selectChains[iselected] ); if(m_provider->msg().level() <= MSG::VERBOSE) { - m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << endreq; + m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << endmsg; } } // else { @@ -1298,14 +1296,14 @@ protected: if ( ic>0 ) { - m_provider->msg(MSG::WARNING) << "more than one chain configured for this analysis - skipping " << m_chainNames[ic] << endreq; + m_provider->msg(MSG::WARNING) << "more than one chain configured for this analysis - skipping " << m_chainNames[ic] << endmsg; continue; } - m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endreq; + m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endmsg; - // m_provider->msg(MSG::VERBOSE) << "--------------------------------------------------" << endreq; + // m_provider->msg(MSG::VERBOSE) << "--------------------------------------------------" << endmsg; std::string folder_name = ""; @@ -1381,7 +1379,7 @@ protected: // std::cout << "SUTT chain " << "\tvtx " << m_chainNames.at(ic).vtx() << "\tmongroup " << mongroup << std::endl; - m_provider->msg(MSG::INFO) << " book mongroup " << mongroup << endreq; + m_provider->msg(MSG::INFO) << " book mongroup " << mongroup << endmsg; # ifdef ManagedMonitorToolBase_Uses_API_201401 m_provider->addMonGroup( new ManagedMonitorToolBase::MonGroup( m_provider, mongroup, ManagedMonitorToolBase::run ) ); @@ -1421,7 +1419,7 @@ protected: } if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() done" << endreq; + m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() done" << endmsg; } @@ -1432,14 +1430,14 @@ protected: virtual void finalize() { if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::finalise() " << m_provider->name() << endreq; + m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::finalise() " << m_provider->name() << endmsg; m_analysis->finalise(); - m_provider->msg(MSG::INFO) << m_provider->name() << " NRois processed: " << m_NRois << "\tRef tracks: " << m_NRefTracks << "\tTestTracks: " << m_NTestTracks << endreq; + m_provider->msg(MSG::INFO) << m_provider->name() << " NRois processed: " << m_NRois << "\tRef tracks: " << m_NRefTracks << "\tTestTracks: " << m_NTestTracks << endmsg; if(m_provider->msg().level() <= MSG::VERBOSE) - m_provider->msg(MSG::VERBOSE) << m_provider->name() << " finalised" << endreq; + m_provider->msg(MSG::VERBOSE) << m_provider->name() << " finalised" << endmsg; } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h index d5c795f3062..8588a158382 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h @@ -53,7 +53,7 @@ public: // histogram registration virtual void addHistogram( TH1* h ) { - msg(MSG::INFO) << "TrigTestMonToolAC::addHistogram() " << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::addHistogram() " << endmsg; IHLTMonTool::addHistogram( h ); } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h index 70c30d016da..04712271910 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h @@ -59,9 +59,9 @@ public: // histogram registration // Inheriting class independant histogram registration virtual void addHistogram(TH1* h, const std::string& system) { - msg(MSG::INFO) << "TrigTestPhysValMon::addHistogram() " << endreq; + msg(MSG::INFO) << "TrigTestPhysValMon::addHistogram() " << endmsg; if (regHist(h, m_sliceTag+system, run).isFailure()) { - msg(MSG::ERROR) << "TrigTestPhysValMon::addHistorgram() failed to add histogram" << endreq; + msg(MSG::ERROR) << "TrigTestPhysValMon::addHistorgram() failed to add histogram" << endmsg; } } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx index a8bc92e503c..6865b2d5609 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx @@ -63,7 +63,6 @@ #include "TrkParticleCreator/TrackParticleCreatorTool.h" -#define endreq endmsg bool tida_first = true; @@ -121,7 +120,7 @@ const HepMC::GenParticle* fromParent( int pdg_id, const HepMC::GenParticle* p, b void AnalysisConfig_Ntuple::loop() { m_provider->msg(MSG::INFO) << "[91;1m" << "AnalysisConfig_Ntuple::loop() for " << m_analysisInstanceName - << " compiled " << __DATE__ << " " << __TIME__ << "\t: " << date() << "[m" << endreq; + << " compiled " << __DATE__ << " " << __TIME__ << "\t: " << date() << "[m" << endmsg; // get (offline) beam position double xbeam = 0; @@ -141,14 +140,14 @@ void AnalysisConfig_Ntuple::loop() { ybeam = vertex.y(); zbeam = vertex.z(); #endif - m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam <<endreq; + m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam <<endmsg; beamline.push_back(xbeam); beamline.push_back(ybeam); beamline.push_back(zbeam); - m_provider->msg(MSG::INFO) << " beamline values : " << beamline[0] << "\t" << beamline[1] << "\t" << beamline[2] << endreq; + m_provider->msg(MSG::INFO) << " beamline values : " << beamline[0] << "\t" << beamline[1] << "\t" << beamline[2] << endmsg; } else { - m_provider->msg(MSG::INFO) << " could not find BeamCondSvc " << endreq; + m_provider->msg(MSG::INFO) << " could not find BeamCondSvc " << endmsg; } // get (online) beam position @@ -179,14 +178,14 @@ void AnalysisConfig_Ntuple::loop() { m_provider->msg(MSG::INFO) << " using online beam position" << "\tx=" << xbeam_online << "\ty=" << ybeam_online - << "\tz=" << zbeam_online << endreq; + << "\tz=" << zbeam_online << endmsg; } else { - m_provider->msg(MSG::INFO) << " could not find OnlineBeamCondSvc " << endreq; + m_provider->msg(MSG::INFO) << " could not find OnlineBeamCondSvc " << endmsg; } - m_provider->msg(MSG::INFO) << " offline beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam << endreq; - m_provider->msg(MSG::INFO) << " online beam position\tx=" << xbeam_online << "\ty=" << ybeam_online << "\tz=" << zbeam_online << endreq; + m_provider->msg(MSG::INFO) << " offline beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam << endmsg; + m_provider->msg(MSG::INFO) << " online beam position\tx=" << xbeam_online << "\ty=" << ybeam_online << "\tz=" << zbeam_online << endmsg; /// list the configured chains @@ -198,9 +197,9 @@ void AnalysisConfig_Ntuple::loop() { std::vector<std::string> configuredChains = (*m_tdt)->getListOfTriggers("L2_.*, EF_.*, HLT_.*"); - m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endreq; + m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endmsg; for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) { - m_provider->msg(MSG::INFO) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endreq; + m_provider->msg(MSG::INFO) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endmsg; configuredHLTChains.insert( configuredChains[i] ); } @@ -249,7 +248,7 @@ void AnalysisConfig_Ntuple::loop() { /// replace wildcard with actual matching chains ... chainNames.push_back( ChainString(selectChains[iselected]) ); - m_provider->msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endreq; + m_provider->msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endmsg; } @@ -311,7 +310,7 @@ void AnalysisConfig_Ntuple::loop() { double mu_val = 0; if ( m_provider->evtStore()->retrieve(pEventInfo).isFailure() ) { - m_provider->msg(MSG::DEBUG) << "Failed to get EventInfo " << endreq; + m_provider->msg(MSG::DEBUG) << "Failed to get EventInfo " << endmsg; } else { #if 0 @@ -333,7 +332,7 @@ void AnalysisConfig_Ntuple::loop() { m_provider->msg(MSG::INFO) << "run " << run_number << "\tevent " << event_number - << "\tlb " << lumi_block << endreq; + << "\tlb " << lumi_block << endmsg; m_event->run_number(run_number); m_event->event_number(event_number); @@ -364,26 +363,26 @@ void AnalysisConfig_Ntuple::loop() { << "L2 pass " << L2chain->isPassed() << "\t" << "EF pass " << EFchain->isPassed() << "\t" << "HLT pass " << HLTchain->isPassed() << "[m" - << endreq; + << endmsg; std::vector<std::string> _conf = (*m_tdt)->getListOfTriggers("HLT_.*"); - m_provider->msg(MSG::INFO) << endreq; - m_provider->msg(MSG::INFO) << "configured chains " << _conf.size() << endreq; + m_provider->msg(MSG::INFO) << endmsg; + m_provider->msg(MSG::INFO) << "configured chains " << _conf.size() << endmsg; #if 0 for ( unsigned ic=0 ; ic<_conf.size() ; ic++ ) { bool p = (*m_tdt)->isPassed( _conf[ic] ); - if ( p ) m_provider->msg(MSG::INFO) << "[91;1m" << " Configured Chain " << _conf[ic] << " " << p << "\tpassed <<<<" << "[m" << endreq; - else m_provider->msg(MSG::INFO) << " Configured Chain " << _conf[ic] << " " << p << "\t not passed" << endreq; + if ( p ) m_provider->msg(MSG::INFO) << "[91;1m" << " Configured Chain " << _conf[ic] << " " << p << "\tpassed <<<<" << "[m" << endmsg; + else m_provider->msg(MSG::INFO) << " Configured Chain " << _conf[ic] << " " << p << "\t not passed" << endmsg; } - m_provider->msg(MSG::INFO) << endreq; + m_provider->msg(MSG::INFO) << endmsg; #endif /////////////////////////////////////////////////////////////////////////////// @@ -408,7 +407,7 @@ void AnalysisConfig_Ntuple::loop() { std::cout << "SUTT status of all chains " << std::endl; std::vector<std::string> configuredChains = (*m_tdt)->getListOfTriggers("L2_.*, EF_.*, HLT_.*"); - m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endreq; + m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endmsg; int npassed = 0; @@ -486,10 +485,10 @@ void AnalysisConfig_Ntuple::loop() { int passed_chains = 0; - m_provider->msg(MSG::INFO) << "Checking " << m_chainNames.size() << " chains" << endreq; + m_provider->msg(MSG::INFO) << "Checking " << m_chainNames.size() << " chains" << endmsg; if ( m_chainNames.empty() ) { - m_provider->msg(MSG::WARNING) << "No chains to check" << endreq; + m_provider->msg(MSG::WARNING) << "No chains to check" << endmsg; // return; } @@ -498,7 +497,7 @@ void AnalysisConfig_Ntuple::loop() { // Only for trigger chains - // m_provider->msg(MSG::INFO) << "\tchain " << chainName << endreq; + // m_provider->msg(MSG::INFO) << "\tchain " << chainName << endmsg; if (chainName.find("L2") == std::string::npos && @@ -508,7 +507,7 @@ void AnalysisConfig_Ntuple::loop() { if ( configuredHLTChains.find(chainName)==configuredHLTChains.end() ) { m_provider->msg(MSG::WARNING) << "[91;1m" << "Chain " << chainName << " is not configured for this event" << "[m" - << endreq; + << endmsg; continue; } @@ -519,14 +518,14 @@ void AnalysisConfig_Ntuple::loop() { // const Trig::ChainGroup* _chain=(*m_tdt)->getChainGroup(chainName); // m_provider->msg(MSG::INFO) << "Chain " << chainName << "\troi " << roistring - // << "\tpass " << _chain->isPassed() << "\tCH FIXED" << endreq; + // << "\tpass " << _chain->isPassed() << "\tCH FIXED" << endmsg; bool passPhysics = (*m_tdt)->isPassed(chainName); m_provider->msg(MSG::INFO) << "Chain " << chainName << "\troi " << roistring << "\tpres " << (*m_tdt)->getPrescale(chainName) << ( passPhysics ? "[91;1m" : "" ) << "\tpass physics " << passPhysics << ( passPhysics ? "[m" : "" ) - << "\t: ( pass " << (*m_tdt)->isPassed(chainName, _decisiontype ) << "\tdec type " << _decisiontype << " ) " << endreq; + << "\t: ( pass " << (*m_tdt)->isPassed(chainName, _decisiontype ) << "\tdec type " << _decisiontype << " ) " << endmsg; // if ( (*m_tdt)->isPassed(chainName) ) { @@ -541,12 +540,12 @@ void AnalysisConfig_Ntuple::loop() { /// bomb out if no chains passed and not told to keep all events if ( !analyse && !m_keepAllEvents ) { - m_provider->msg(MSG::INFO) << "No chains passed unprescaled - not processing this event: " << run_number << " " << event_number << " " << lumi_block << endreq; + m_provider->msg(MSG::INFO) << "No chains passed unprescaled - not processing this event: " << run_number << " " << event_number << " " << lumi_block << endmsg; return; } - m_provider->msg(MSG::INFO) << "Chains passed " << passed_chains << endreq; + m_provider->msg(MSG::INFO) << "Chains passed " << passed_chains << endmsg; /// for Monte Carlo get the truth particles if requested to do so @@ -555,17 +554,17 @@ void AnalysisConfig_Ntuple::loop() { selectorTruth.clear(); - m_provider->msg(MSG::INFO) << "MC Truth flag " << m_mcTruth << endreq; + m_provider->msg(MSG::INFO) << "MC Truth flag " << m_mcTruth << endmsg; const TrigInDetTrackTruthMap* truthMap = 0; bool foundTruth = false; if ( m_mcTruth && m_TruthPdgId!=15) { - m_provider->msg(MSG::INFO) << "getting Truth" << endreq; + m_provider->msg(MSG::INFO) << "getting Truth" << endmsg; if ( m_provider->evtStore()->retrieve(truthMap, "TrigInDetTrackTruthMap").isFailure()) { - // m_provider->msg(MSG::WARNING) << "TrigInDetTrackTruthMap not found" << endreq; + // m_provider->msg(MSG::WARNING) << "TrigInDetTrackTruthMap not found" << endmsg; m_hasTruthMap = false; } else { - m_provider->msg(MSG::INFO) << "TrigInDetTrackTruthMap found" << endreq; + m_provider->msg(MSG::INFO) << "TrigInDetTrackTruthMap found" << endmsg; m_hasTruthMap = true; } if (m_provider->evtStore()->contains<TruthParticleContainer>("INav4MomTruthEvent")) { @@ -584,7 +583,7 @@ void AnalysisConfig_Ntuple::loop() { foundTruth = true; } else { - m_provider->msg(MSG::WARNING) << "Truth not found - none whatsoever!" << endreq; + m_provider->msg(MSG::WARNING) << "Truth not found - none whatsoever!" << endmsg; } } @@ -596,7 +595,7 @@ void AnalysisConfig_Ntuple::loop() { if ( m_mcTruth && !foundTruth ) { - m_provider->msg(MSG::INFO) << "getting Truth" << endreq; + m_provider->msg(MSG::INFO) << "getting Truth" << endmsg; /// selectTracks<TruthParticleContainer>( &selectorTruth, "INav4MomTruthEvent" ); @@ -612,22 +611,22 @@ void AnalysisConfig_Ntuple::loop() { for ( int ik=0 ; ik<4 ; ik++ ) { - m_provider->msg(MSG::INFO) << "Try McEventCollection: " << collectionNames[ik] << endreq; + m_provider->msg(MSG::INFO) << "Try McEventCollection: " << collectionNames[ik] << endmsg; if (!m_provider->evtStore()->contains<McEventCollection>(collectionNames[ik]) ) { - m_provider->msg(MSG::INFO) << "No McEventCollection: " << collectionNames[ik] << endreq; + m_provider->msg(MSG::INFO) << "No McEventCollection: " << collectionNames[ik] << endmsg; continue; } - m_provider->msg(MSG::INFO) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endreq; + m_provider->msg(MSG::INFO) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endmsg; if ( m_provider->evtStore()->retrieve( mcevent, collectionNames[ik] ).isFailure() ) { - m_provider->msg(MSG::INFO) << "Failed to get McEventCollection: " << collectionNames[ik] << endreq; + m_provider->msg(MSG::INFO) << "Failed to get McEventCollection: " << collectionNames[ik] << endmsg; } else { // found this collectionName collectionName = collectionNames[ik]; - m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << endreq; + m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << endmsg; foundcollection = true; break; } @@ -636,7 +635,7 @@ void AnalysisConfig_Ntuple::loop() { // not found any collection if ( !foundcollection ) { - m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endreq; + m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endmsg; // m_tree->Fill(); @@ -655,7 +654,7 @@ void AnalysisConfig_Ntuple::loop() { /// it's not at all tidy, and should be rewritten, /// but probably never will be - m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << "\tNevents " << mcevent->size() << endreq; + m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << "\tNevents " << mcevent->size() << endmsg; /// count the number of interactions of each sort /// this is actually *very stupid*, there are a *lot* @@ -714,20 +713,20 @@ void AnalysisConfig_Ntuple::loop() { if ( _ip>0 ) { /// if there were some particles in this interaction ... - // m_provider->msg(MSG::INFO) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endreq; + // m_provider->msg(MSG::INFO) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endmsg; ++ie_ip; ip += _ip; } } - m_provider->msg(MSG::INFO) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endreq; + m_provider->msg(MSG::INFO) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endmsg; - m_provider->msg(MSG::INFO) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endreq; + m_provider->msg(MSG::INFO) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg; //////////////////////////////////////////////////////////////////////////////////////// if ( !(ip>0) ) { - m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endreq; + m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endmsg; return; /// need to be careful here, if not requiring truth *only* should not return } @@ -743,7 +742,7 @@ void AnalysisConfig_Ntuple::loop() { /// get offline tracks - m_provider->msg(MSG::INFO) << " Offline tracks " << endreq; + m_provider->msg(MSG::INFO) << " Offline tracks " << endmsg; selectorRef.clear(); @@ -757,7 +756,7 @@ void AnalysisConfig_Ntuple::loop() { selectTracks<Rec::TrackParticleContainer>( &selectorRef, "TrackParticleCandidate" ); } else { - m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endreq; + m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endmsg; } @@ -769,7 +768,7 @@ void AnalysisConfig_Ntuple::loop() { const VxContainer* primaryVtxCollection; if ( m_provider->evtStore()->retrieve(primaryVtxCollection, "VxPrimaryCandidate").isFailure()) { - m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endreq; + m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endmsg; } else { VxContainer::const_iterator vtxitr = primaryVtxCollection->begin(); @@ -804,17 +803,17 @@ void AnalysisConfig_Ntuple::loop() { // std::vector<TIDA::Vertex> vertices; - m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endreq; + m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endmsg; const xAOD::VertexContainer* xaodVtxCollection = 0; if ( m_provider->evtStore()->retrieve( xaodVtxCollection, "PrimaryVertices" ).isFailure()) { - m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endreq; + m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endmsg; } if ( xaodVtxCollection!=0 ) { - m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endreq; + m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg; xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin(); for ( ; vtxitr != xaodVtxCollection->end(); vtxitr++ ) { @@ -858,7 +857,7 @@ void AnalysisConfig_Ntuple::loop() { // std::cout << "SUTT Nvertices " << vertices.size() << "\ttype 101 " << vertices_full.size() << std::endl; for ( unsigned i=0 ; i<vertices.size() ; i++ ) { - m_provider->msg(MSG::INFO) << "vertex " << i << " " << vertices[i] << endreq; + m_provider->msg(MSG::INFO) << "vertex " << i << " " << vertices[i] << endmsg; m_event->addVertex(vertices[i]); } @@ -904,8 +903,8 @@ void AnalysisConfig_Ntuple::loop() { Noff = selectorRef.tracks().size(); - m_provider->msg(MSG::DEBUG) << "ref tracks.size() " << selectorRef.tracks().size() << endreq; - for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " ref track " << ii << " " << *selectorRef.tracks()[ii] << endreq; + m_provider->msg(MSG::DEBUG) << "ref tracks.size() " << selectorRef.tracks().size() << endmsg; + for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " ref track " << ii << " " << *selectorRef.tracks()[ii] << endmsg; } @@ -913,7 +912,7 @@ void AnalysisConfig_Ntuple::loop() { for ( unsigned ichain=0 ; ichain<m_chainNames.size() ; ichain++ ) { - m_provider->msg(MSG::INFO)<< "chain:\t" << m_chainNames[ichain] << endreq; + m_provider->msg(MSG::INFO)<< "chain:\t" << m_chainNames[ichain] << endmsg; //std::cout << "chain:\t" << m_chainNames[ichain]; /// get the chain, collection and TE names and track index @@ -949,7 +948,7 @@ void AnalysisConfig_Ntuple::loop() { } #endif else { - m_provider->msg(MSG::WARNING) << "\tcollection " << collectionname << " not found" << endreq; + m_provider->msg(MSG::WARNING) << "\tcollection " << collectionname << " not found" << endmsg; } if ( found ) { @@ -970,8 +969,8 @@ void AnalysisConfig_Ntuple::loop() { int Ntest = selectorTest.tracks().size(); - m_provider->msg(MSG::INFO) << "collection " << collectionname << "\ttest tracks.size() " << Ntest << endreq; - for ( int ii=Ntest ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " test track " << ii << " " << *selectorTest.tracks()[ii] << endreq; + m_provider->msg(MSG::INFO) << "collection " << collectionname << "\ttest tracks.size() " << Ntest << endmsg; + for ( int ii=Ntest ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " test track " << ii << " " << *selectorTest.tracks()[ii] << endmsg; } } @@ -1049,11 +1048,11 @@ void AnalysisConfig_Ntuple::loop() { /// get muons if ( m_doMuons ) { - m_provider->msg(MSG::INFO) << "fetching offline muons " << endreq; + m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg; Nmu += processMuons( selectorRef ); - m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endreq; + m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg; m_event->addChain("Muons"); m_event->back().addRoi(TIDARoiDescriptor(true)); @@ -1069,8 +1068,8 @@ void AnalysisConfig_Ntuple::loop() { m_event->back().back().addUserData(beamline); } - m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endreq; - for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endreq; + m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endmsg; + for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg; } @@ -1079,18 +1078,18 @@ void AnalysisConfig_Ntuple::loop() { /// get muons if ( m_doMuonsSP ) { - m_provider->msg(MSG::INFO) << "fetching offline muons " << endreq; + m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg; Nmu += processMuons( selectorRef ); - m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endreq; + m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg; m_event->addChain("MuonsSP"); m_event->back().addRoi(TIDARoiDescriptor(true)); m_event->back().back().addTracks(selectorRef.tracks()); - m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endreq; - for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endreq; + m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endmsg; + for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg; } @@ -1124,7 +1123,7 @@ void AnalysisConfig_Ntuple::loop() { } - // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " one prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endreq; + // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " one prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endmsg; //} /// get three prong taus @@ -1157,13 +1156,13 @@ void AnalysisConfig_Ntuple::loop() { } } - // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " 3 prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endreq; + // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " 3 prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endmsg; // } if ( Nmu==0 && Noff==0 && Nel==0 && Ntau1==0 && Ntau3==0 ) { - m_provider->msg(MSG::INFO) << "No offline objects found " << endreq; + m_provider->msg(MSG::INFO) << "No offline objects found " << endmsg; } @@ -1192,7 +1191,7 @@ void AnalysisConfig_Ntuple::loop() { << "\tprescale " << (*m_tdt)->getPrescale(chainName) << "\tpass " << (*m_tdt)->isPassed(chainName) << " physics " << " (req dec " << (*m_tdt)->isPassed(chainName, _decisiontype ) << " dec type " << _decisiontype << ")" - << endreq; + << endmsg; /** @@ -1244,11 +1243,11 @@ void AnalysisConfig_Ntuple::loop() { Trig::FeatureContainer::combination_const_iterator combEnd(f.getCombinations().end()); if ( (*m_tdt)->isPassed(chainName, decisiontype ) ) { - m_provider->msg(MSG::INFO) << "\tfetching features for chain " << decisiontype << " " << chainName << "\t" << combEnd-comb << " combinations" << endreq; + m_provider->msg(MSG::INFO) << "\tfetching features for chain " << decisiontype << " " << chainName << "\t" << combEnd-comb << " combinations" << endmsg; } if ( (*m_tdt)->isPassed(chainName, _decisiontype ) ) { - m_provider->msg(MSG::INFO) << "\tfetching features for chain " << _decisiontype << "(RQ) " << chainName << "\t" << combEnd-comb << " combinations" << endreq; + m_provider->msg(MSG::INFO) << "\tfetching features for chain " << _decisiontype << "(RQ) " << chainName << "\t" << combEnd-comb << " combinations" << endmsg; } @@ -1260,12 +1259,12 @@ void AnalysisConfig_Ntuple::loop() { m_provider->msg(MSG::INFO) << "[91;1m" << "\tpassed combinations chain " << chainName << "\t" << combEnd-comb << " combinations" << "\tdecision " << (*m_tdt)->isPassed(chainName, _decisiontype ) << "[m" - << endreq; + << endmsg; } if ( comb==combEnd ) { - m_provider->msg(MSG::INFO) << "\tno features for chain " << chainName << endreq; + m_provider->msg(MSG::INFO) << "\tno features for chain " << chainName << endmsg; continue; } @@ -1280,7 +1279,7 @@ void AnalysisConfig_Ntuple::loop() { for( ; comb!=combEnd ; ++comb) { - m_provider->msg(MSG::INFO) << "Chain " << chainName << "\tcombination " << icomb << endreq; + m_provider->msg(MSG::INFO) << "Chain " << chainName << "\tcombination " << icomb << endmsg; // std::cout << "Chain " << chainName << "\tcombination " << icomb << std::endl;; icomb++; @@ -1299,9 +1298,9 @@ void AnalysisConfig_Ntuple::loop() { for ( unsigned iroi=0 ; iroi<5 ; iroi++ ) { std::vector< Trig::Feature<TrigRoiDescriptor> > rois = comb->get<TrigRoiDescriptor>(keys[iroi]); - m_provider->msg(MSG::INFO) << "\trois: " << keys[iroi] << "\tsize " << rois.size() << endreq; - for ( unsigned ij=0 ; ij<rois.size() ; ij++ ) m_provider->msg(MSG::INFO) << "\tRoi " <<keys[iroi] << "\t" << *rois[ij].cptr() << endreq; - for ( unsigned ij=0 ; ij<rois.size() ; ij++ ) m_provider->msg(MSG::INFO) << "\t\tRoi " <<keys[iroi] << "\t" << *rois[ij].cptr() << endreq; + m_provider->msg(MSG::INFO) << "\trois: " << keys[iroi] << "\tsize " << rois.size() << endmsg; + for ( unsigned ij=0 ; ij<rois.size() ; ij++ ) m_provider->msg(MSG::INFO) << "\tRoi " <<keys[iroi] << "\t" << *rois[ij].cptr() << endmsg; + for ( unsigned ij=0 ; ij<rois.size() ; ij++ ) m_provider->msg(MSG::INFO) << "\t\tRoi " <<keys[iroi] << "\t" << *rois[ij].cptr() << endmsg; } } #endif @@ -1322,10 +1321,10 @@ void AnalysisConfig_Ntuple::loop() { // std::cout << "roi_name " << roi_name << std::endl; if ( _rois.size()>0 ) { - for ( unsigned ir=0 ; ir<_rois.size() ; ir++ ) m_provider->msg(MSG::INFO) << "\t\tRetrieved roi " << roi_name << "\t" << *_rois[ir].cptr() << endreq; + for ( unsigned ir=0 ; ir<_rois.size() ; ir++ ) m_provider->msg(MSG::INFO) << "\t\tRetrieved roi " << roi_name << "\t" << *_rois[ir].cptr() << endmsg; } else { - m_provider->msg(MSG::WARNING) << "\t\tRequested roi " << roi_name << " not found" << endreq; + m_provider->msg(MSG::WARNING) << "\t\tRequested roi " << roi_name << " not found" << endmsg; } } else { @@ -1349,7 +1348,7 @@ void AnalysisConfig_Ntuple::loop() { // notify if have multiple RoIs (get this for FS chains) if( _rois.size()>1) { - m_provider->msg(MSG::INFO) << "\tMore than one RoI found for seeded chain " << chainName << ": not yet supported" << endreq; + m_provider->msg(MSG::INFO) << "\tMore than one RoI found for seeded chain " << chainName << ": not yet supported" << endmsg; //continue; } @@ -1360,14 +1359,14 @@ void AnalysisConfig_Ntuple::loop() { const TrigRoiDescriptor* roid = _rois[itmp].cptr(); - m_provider->msg(MSG::INFO) << "\tchain " << chainName << " RoI descriptor " << itmp << " " << *roid << endreq; + m_provider->msg(MSG::INFO) << "\tchain " << chainName << " RoI descriptor " << itmp << " " << *roid << endmsg; if ( itmp==0 ){ TIDARoiDescriptor* roi_tmp = new TIDARoiDescriptor(TIDARoiDescriptorBuilder(*roid)); - // m_provider->msg(MSG::INFO) << "using chain roi " << *roid << endreq; - m_provider->msg(MSG::INFO) << "TIDARoi " << *roi_tmp << endreq; + // m_provider->msg(MSG::INFO) << "using chain roi " << *roid << endmsg; + m_provider->msg(MSG::INFO) << "TIDARoi " << *roi_tmp << endmsg; /// this should *never* be the case, and we should only run this /// bit of code once the first time round the loop anyhow @@ -1383,7 +1382,7 @@ void AnalysisConfig_Ntuple::loop() { } else { - m_provider->msg(MSG::INFO) << "\troi not found" << endreq; + m_provider->msg(MSG::INFO) << "\troi not found" << endmsg; } // get the tracks from this roi @@ -1391,7 +1390,7 @@ void AnalysisConfig_Ntuple::loop() { selectorTest.clear(); - m_provider->msg(MSG::INFO) << "AC Ntple [91;1m" << endreq; + m_provider->msg(MSG::INFO) << "AC Ntple [91;1m" << endmsg; //EF and HLT track EDM @@ -1403,12 +1402,12 @@ void AnalysisConfig_Ntuple::loop() { else if ( selectTracks<TrigInDetTrackCollection>( &selectorTest, comb, truthMap, collectionName, collectionName_index ) ); #ifdef XAODTRACKING_TRACKPARTICLE_H else { - // m_provider->msg(MSG::INFO) << "\tsearch for xAOD::TrackParticle " << collectionName << endreq; - if ( selectTracks<xAOD::TrackParticleContainer>( &selectorTest, comb, collectionName ) ); //m_provider->msg(MSG::INFO) << "\tFound xAOD collection " << collectionName << " (Ntple)" << endreq; - else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endreq; + // m_provider->msg(MSG::INFO) << "\tsearch for xAOD::TrackParticle " << collectionName << endmsg; + if ( selectTracks<xAOD::TrackParticleContainer>( &selectorTest, comb, collectionName ) ); //m_provider->msg(MSG::INFO) << "\tFound xAOD collection " << collectionName << " (Ntple)" << endmsg; + else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg; } #else - else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endreq; + else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg; #endif } else { @@ -1420,11 +1419,11 @@ void AnalysisConfig_Ntuple::loop() { #ifdef XAODTRACKING_TRACKPARTICLE_H else if ( selectTracks<xAOD::TrackParticleContainer>( &selectorTest, comb, collectionName ) ); #endif - else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endreq; + else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg; } } - m_provider->msg(MSG::INFO) << "[m" << endreq; + m_provider->msg(MSG::INFO) << "[m" << endmsg; /// fetch vertices if available ... @@ -1435,12 +1434,12 @@ void AnalysisConfig_Ntuple::loop() { /// what is this doing? Why is it just fetching but not assigning to anything ????? who write this? - m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endmsg; std::vector< Trig::Feature<VxContainer> > trigvertices = comb->get<VxContainer>(vtx_name); if ( trigvertices.empty() ) { - m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endmsg; } else { @@ -1448,7 +1447,7 @@ void AnalysisConfig_Ntuple::loop() { const VxContainer* vert = trigvertices[iv].cptr(); - m_provider->msg(MSG::INFO) << "\t" << iv << " VxContainer for " << chainName << " " << vert << " " << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\t" << iv << " VxContainer for " << chainName << " " << vert << " " << vtx_name << endmsg; VxContainer::const_iterator vtxitr = vert->begin(); @@ -1473,7 +1472,7 @@ void AnalysisConfig_Ntuple::loop() { (*vtxitr)->recVertex().fitQuality().chiSquared(), (*vtxitr)->recVertex().fitQuality().numberDoF() ) ); - m_provider->msg(MSG::INFO)<< "\tvertex " << tidavertices.back() << endreq; + m_provider->msg(MSG::INFO)<< "\tvertex " << tidavertices.back() << endmsg; } } @@ -1483,22 +1482,22 @@ void AnalysisConfig_Ntuple::loop() { #else /// now also add xAOD vertices - m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer for chain " << chainName << " with key " << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer for chain " << chainName << " with key " << vtx_name << endmsg; std::vector< Trig::Feature<xAOD::VertexContainer> > xaodtrigvertices = comb->get<xAOD::VertexContainer>(vtx_name); if ( xaodtrigvertices.empty() ) { - m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainName << " for key " << vtx_name << endreq; + m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainName << " for key " << vtx_name << endmsg; } else { - m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endmsg; for ( unsigned iv=0 ; iv<xaodtrigvertices.size() ; iv++ ) { const xAOD::VertexContainer* vert = xaodtrigvertices[iv].cptr(); - m_provider->msg(MSG::INFO) << "\t" << iv << " xAOD VxContainer for " << chainName << " " << vert << " key " << vtx_name << endreq; + m_provider->msg(MSG::INFO) << "\t" << iv << " xAOD VxContainer for " << chainName << " " << vert << " key " << vtx_name << endmsg; xAOD::VertexContainer::const_iterator vtxitr = vert->begin(); @@ -1524,9 +1523,9 @@ void AnalysisConfig_Ntuple::loop() { const std::vector<TIDA::Track*>& testTracks = selectorTest.tracks(); - m_provider->msg(MSG::DEBUG) << "\ttest tracks.size() " << testTracks.size() << endreq; + m_provider->msg(MSG::DEBUG) << "\ttest tracks.size() " << testTracks.size() << endmsg; for (unsigned int ii=0; ii < testTracks.size(); ii++) { - m_provider->msg(MSG::DEBUG) << " test track " << ii << "for chain " << chainName + ":" + collectionName << " " << *testTracks[ii] << endreq; + m_provider->msg(MSG::DEBUG) << " test track " << ii << "for chain " << chainName + ":" + collectionName << " " << *testTracks[ii] << endmsg; } @@ -1540,7 +1539,7 @@ void AnalysisConfig_Ntuple::loop() { // chain.back().addUserData(beamline); // } // else { - if ( testTracks.size()>0 ) m_provider->msg(MSG::WARNING) << "\ttest tracks.size() " << testTracks.size() << "found but no roi!!!" << endreq; + if ( testTracks.size()>0 ) m_provider->msg(MSG::WARNING) << "\ttest tracks.size() " << testTracks.size() << "found but no roi!!!" << endmsg; roiInfo = new TIDARoiDescriptor(true); // roiInfo->phiHalfWidth(M_PI); // roiInfo->etaHalfWidth(3); @@ -1562,7 +1561,7 @@ void AnalysisConfig_Ntuple::loop() { } - // m_provider->msg(MSG::INFO) << " done" << endreq; + // m_provider->msg(MSG::INFO) << " done" << endmsg; if ( roiInfo ) delete roiInfo; roiInfo = 0; @@ -1570,7 +1569,7 @@ void AnalysisConfig_Ntuple::loop() { } - if ( m_printInfo ) m_provider->msg(MSG::INFO) << "FILL TREE\n" << (*m_event) << endreq; + if ( m_printInfo ) m_provider->msg(MSG::INFO) << "FILL TREE\n" << (*m_event) << endmsg; if ( mTree ) mTree->Fill(); } @@ -1582,13 +1581,13 @@ void AnalysisConfig_Ntuple::loop() { void AnalysisConfig_Ntuple::book() { - m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() name " << name() << endreq; + m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() name " << name() << endmsg; /// flag should be called m_fileIsNotOpen really, so is /// if m_fileIsNotOpen open file, /// if !m_fileIsNotOpen, then close file etc if ( !m_finalised ) { - m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() not booking " << name() << endreq; + m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() not booking " << name() << endmsg; return; } @@ -1597,31 +1596,31 @@ void AnalysisConfig_Ntuple::book() { m_iBeamCondSvc = 0; if ( m_provider->service( "BeamCondSvc", m_iBeamCondSvc ).isFailure() ) { - m_provider->msg(MSG::WARNING) << " failed to retrieve BeamCondSvc: " << "BeamCondSvc" << endreq; + m_provider->msg(MSG::WARNING) << " failed to retrieve BeamCondSvc: " << "BeamCondSvc" << endmsg; } else { - m_provider->msg(MSG::INFO) << " successfully retrieves BeamCondSvc: " << "BeamCondSvc" << endreq; + m_provider->msg(MSG::INFO) << " successfully retrieves BeamCondSvc: " << "BeamCondSvc" << endmsg; } m_iOnlineBeamCondSvc = 0; if ( m_provider->service( "InDetBeamSpotOnline", m_iOnlineBeamCondSvc ).isFailure() ) { - m_provider->msg(MSG::WARNING) << " failed to retrieve Online BeamCondSvc " << "InDetBeamSpotOnline" << endreq; + m_provider->msg(MSG::WARNING) << " failed to retrieve Online BeamCondSvc " << "InDetBeamSpotOnline" << endmsg; } else { - m_provider->msg(MSG::INFO) << " successfuly retrieved Online BeamCondSvc " << "InDetBeamSpotOnline" << endreq; + m_provider->msg(MSG::INFO) << " successfuly retrieved Online BeamCondSvc " << "InDetBeamSpotOnline" << endmsg; } // get the TriggerDecisionTool if( m_tdt->retrieve().isFailure() ) { - m_provider->msg(MSG::FATAL) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endreq; + m_provider->msg(MSG::FATAL) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endmsg; // return StatusCode::FAILURE; return; } - m_provider->msg(MSG::INFO) << "[91;1m" << " Successfully retrived the TrigDecisionTool" << "[m" << endreq; - m_provider->msg(MSG::INFO) << "[91;1m" << " booking ntuple" << "[m" << endreq; - m_provider->msg(MSG::INFO) << "[91;1m" << " trying to create new ntple file" << "[m" << endreq; + m_provider->msg(MSG::INFO) << "[91;1m" << " Successfully retrived the TrigDecisionTool" << "[m" << endmsg; + m_provider->msg(MSG::INFO) << "[91;1m" << " booking ntuple" << "[m" << endmsg; + m_provider->msg(MSG::INFO) << "[91;1m" << " trying to create new ntple file" << "[m" << endmsg; gDirectory->pwd(); @@ -1641,7 +1640,7 @@ void AnalysisConfig_Ntuple::book() { outputFileName += file_label; } - m_provider->msg(MSG::INFO) << "book() Writing to file " << outputFileName << endreq; + m_provider->msg(MSG::INFO) << "book() Writing to file " << outputFileName << endmsg; gDirectory->pwd(); @@ -1674,7 +1673,7 @@ void AnalysisConfig_Ntuple::book() { first_open = false; - m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << dir->GetName() << endreq; + m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << dir->GetName() << endmsg; // std::cout << "change directory " << name() << " " << dir->GetName() << std::endl; /// go back to original directory @@ -1686,7 +1685,7 @@ void AnalysisConfig_Ntuple::book() { tida_first = true; - m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() exiting" << endreq; + m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() exiting" << endmsg; } @@ -1702,17 +1701,17 @@ void AnalysisConfig_Ntuple::finalize() { /// NB: flag this round the other way for multiple files if ( m_finalised ) { - m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() flagged, not finalising " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endreq; + m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() flagged, not finalising " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endmsg; return; } - m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() writing " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endreq; + m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() writing " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endmsg; TDirectory* directory = gDirectory; // std::cout << "change directory " << name() << " " << mDir->GetName() << std::endl; - m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << mDir->GetName() << endreq; + m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << mDir->GetName() << endmsg; mDir->cd(); diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx index 1fc010d464c..10a9551819e 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx @@ -38,7 +38,7 @@ TrigTestBase::TrigTestBase(const std::string & type, const std::string & name, c m_shifterChains(1), m_sliceTag("") { - msg(MSG::INFO) << "TrigTestBase::TrigTestBase() compiled: " << __DATE__ << " " << __TIME__ << endreq; + msg(MSG::INFO) << "TrigTestBase::TrigTestBase() compiled: " << __DATE__ << " " << __TIME__ << endmsg; declareProperty( "SliceTag", m_sliceTag = "TIDAMonTool/" ); @@ -101,9 +101,9 @@ TrigTestBase::TrigTestBase(const std::string & type, const std::string & name, c declareProperty( "GenericFlag", m_genericFlag = true ); - msg(MSG::INFO) << "TrigTestBase::TrigTestBase() exiting " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestBase::TrigTestBase() exiting " << gDirectory->GetName() << endmsg; - // msg(MSG::INFO) << "TrigTestBase::TrigTestBase() returning: " << endreq; + // msg(MSG::INFO) << "TrigTestBase::TrigTestBase() returning: " << endmsg; } @@ -114,7 +114,7 @@ TrigTestBase::~TrigTestBase() { // m_sequences[i]->finalize(); if ( m_fileopen ) for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->finalize(); - // msg(MSG::INFO) << "TrigTestBase::~TrigTestBase()" << endreq; + // msg(MSG::INFO) << "TrigTestBase::~TrigTestBase()" << endmsg; // for ( unsigned i=m_filters.size() ; i-- ; ) delete m_filters[i]; // for ( unsigned i=m_associators.size() ; i-- ; ) delete m_associators[i]; @@ -124,9 +124,9 @@ TrigTestBase::~TrigTestBase() { StatusCode TrigTestBase::init() { - msg(MSG::DEBUG) << " ----- enter init() ----- " << endreq; + msg(MSG::DEBUG) << " ----- enter init() ----- " << endmsg; - msg(MSG::INFO) << "TrigTestBase::init() " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestBase::init() " << gDirectory->GetName() << endmsg; /// NB: Do NOT create the sequences here - leave it until the book() method, since /// we need to be automatically determine which chains to process, and so need @@ -136,7 +136,7 @@ StatusCode TrigTestBase::init() { // ATH_CHECK(IHLTMonTool::init()); - msg(MSG::DEBUG) << " ----- exit init() ----- " << endreq; + msg(MSG::DEBUG) << " ----- exit init() ----- " << endmsg; return StatusCode::SUCCESS; } @@ -153,9 +153,9 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu #endif //StatusCode TrigTestBase::bookHistograms() { - msg(MSG::DEBUG) << " ----- enter book() ----- " << endreq; + msg(MSG::DEBUG) << " ----- enter book() ----- " << endmsg; - msg(MSG::INFO) << "TrigTestBase::book() " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestBase::book() " << gDirectory->GetName() << endmsg; // MMTB_DEPRECATED(duff) @@ -174,7 +174,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu msg(MSG::DEBUG) << "TrigTestBase::book() SUTT buildNtuple " << m_buildNtuple << "\tNewEventBlock " << newEventsBlock << "\tNewLumiBlock " << newLumiBlock - << "\tNewRun " << newRun << endreq; + << "\tNewRun " << newRun << endmsg; /// create sequences if need be ... @@ -216,9 +216,9 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu // "^[[91;1m" // "^[[m" - msg(MSG::INFO) << "^[[91;1m" << "AnalysisConfig " << m_analysis_config << "^[[m" << endreq; + msg(MSG::INFO) << "^[[91;1m" << "AnalysisConfig " << m_analysis_config << "^[[m" << endmsg; - msg(MSG::DEBUG) << "configuring chains: " << m_ntupleChainNames.size() << endreq; + msg(MSG::DEBUG) << "configuring chains: " << m_ntupleChainNames.size() << endmsg; /// keep counters of how many efid or ftf chains have been created @@ -245,18 +245,18 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu /// get chain ChainString chainName = (*chainitr); - msg(MSG::DEBUG) << "configuring chain: " << chainName.head() << "\t: " << chainName.tail() << endreq; + msg(MSG::DEBUG) << "configuring chain: " << chainName.head() << "\t: " << chainName.tail() << endmsg; if ( chainName.roi()!="" ) { msg(MSG::INFO) << "configuring chain: " << chainName.head() << "\ttracks: " << chainName.tail() << "\troi: " << chainName.roi() - << endreq; + << endmsg; } else { msg(MSG::INFO) << "configuring chain: " << chainName.head() << "\ttracks: " << chainName.tail() - << endreq; + << endmsg; } /// check for configured chains only ... @@ -274,7 +274,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu // std::cout << "selected chains " << selectChains.size() << std::endl; if ( selectChains.size()==0 ) { - msg(MSG::INFO) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << " : " << chainName.tail() << "^[[m"<< endreq; + msg(MSG::INFO) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << " : " << chainName.tail() << "^[[m"<< endmsg; } @@ -302,7 +302,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu /// FTF chain shifter_ftf++; if ( shifter_ftf>m_shifterChains ) { - msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq; + msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg; continue; } } @@ -310,7 +310,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu /// EFID chain shifter_efid++; if ( shifter_efid>m_shifterChains ) { - msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq; + msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg; continue; } } @@ -318,7 +318,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu /// EFID chain shifter_efid_run1++; if ( shifter_efid_run1>m_shifterChains ) { - msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq; + msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg; continue; } } @@ -326,7 +326,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu /// EFID chain shifter_l2star++; if ( shifter_l2star>m_shifterChains ) { - msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq; + msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg; continue; } } @@ -336,7 +336,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu // chains.push_back( ChainString(selectChains[iselected]) ); chains.push_back( selectChains[iselected] ); - msg(MSG::VERBOSE) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << "^[[m" << endreq; + msg(MSG::VERBOSE) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << "^[[m" << endmsg; } @@ -362,16 +362,16 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu m_sequences.push_back( analysis ); - msg(MSG::INFO) << " ----- creating analysis " << m_sequences.back()->name() << " : " << m_chainNames[i] << " -----" << endreq; + msg(MSG::INFO) << " ----- creating analysis " << m_sequences.back()->name() << " : " << m_chainNames[i] << " -----" << endmsg; m_sequences.back()->releaseData(m_releaseMetaData); if ( m_useHighestPT ) { - msg(MSG::INFO) << " using highest PT only for chain " << m_chainNames[i] << endreq; + msg(MSG::INFO) << " using highest PT only for chain " << m_chainNames[i] << endmsg; m_sequences.back()->setUseHighestPT(true); } if ( !(m_vtxIndex<0) ) { - msg(MSG::INFO) << " searching for vertex index " << m_vtxIndex << endreq; + msg(MSG::INFO) << " searching for vertex index " << m_vtxIndex << endmsg; m_sequences.back()->setVtxIndex(m_vtxIndex); } @@ -390,7 +390,7 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu m_fileopen = true; for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) { - msg(MSG::VERBOSE) << " ----- booking for analysis " << m_sequences[i]->name() << " -----" << endreq; + msg(MSG::VERBOSE) << " ----- booking for analysis " << m_sequences[i]->name() << " -----" << endmsg; m_sequences[i]->initialize(this, &m_tdt); m_sequences[i]->setGenericFlag(m_genericFlag); m_sequences[i]->book(); @@ -398,9 +398,9 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu m_firstRun = false; } - msg(MSG::DEBUG) << " configured " << m_sequences.size() << " sequences" << endreq; + msg(MSG::DEBUG) << " configured " << m_sequences.size() << " sequences" << endmsg; - msg(MSG::DEBUG) << " ----- exit book() ----- " << endreq; + msg(MSG::DEBUG) << " ----- exit book() ----- " << endmsg; return StatusCode::SUCCESS; } @@ -412,12 +412,12 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu StatusCode TrigTestBase::fill() { if(msg().level() <= MSG::DEBUG) { - msg(MSG::DEBUG) << " ----- enter fill() ----- " << endreq; + msg(MSG::DEBUG) << " ----- enter fill() ----- " << endmsg; } std::vector<std::string> selectChains = m_tdt->getListOfTriggers( "HLT_.*" ); - msg(MSG::DEBUG) << " TDT selected chains " << selectChains.size() << endreq; + msg(MSG::DEBUG) << " TDT selected chains " << selectChains.size() << endmsg; int passed_count = 0; @@ -441,7 +441,7 @@ StatusCode TrigTestBase::fill() { if(msg().level() <= MSG::DEBUG) { - msg(MSG::DEBUG) << " ----- exit fill() ----- " << endreq; + msg(MSG::DEBUG) << " ----- exit fill() ----- " << endmsg; } return StatusCode::SUCCESS; @@ -467,12 +467,12 @@ StatusCode TrigTestBase::proc(bool /*endOfEventsBlock*/, bool /*endOfLumiBlock*/ #endif #endif - msg(MSG::INFO) << " ----- enter proc() ----- " << endreq; + msg(MSG::INFO) << " ----- enter proc() ----- " << endmsg; if ( m_initialisePerRun && endOfRun ) { for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->finalize(); m_fileopen = false; } - msg(MSG::DEBUG) << " ====== exit proc() ====== " << endreq; + msg(MSG::DEBUG) << " ====== exit proc() ====== " << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx index 35541cae053..983a996dd76 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx @@ -37,7 +37,7 @@ TrigTestMonToolAC::TrigTestMonToolAC(const std::string & type, const std::string m_fileopen(false), m_requireDecision(false) { - msg(MSG::WARNING) << "TrigTestMonToolAC::TrigTestMonToolAC() compiled: " << __DATE__ << " " << __TIME__ << endreq; + msg(MSG::WARNING) << "TrigTestMonToolAC::TrigTestMonToolAC() compiled: " << __DATE__ << " " << __TIME__ << endmsg; declareProperty( "pTCut", m_pTCut = 0 ); declareProperty( "etaCut", m_etaCut = 5 ); @@ -89,9 +89,9 @@ TrigTestMonToolAC::TrigTestMonToolAC(const std::string & type, const std::string declareProperty( "KeepAllEvents", m_keepAllEvents = false ); - msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() " << gDirectory->GetName() << endmsg; - msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() returning: " << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() returning: " << endmsg; } @@ -102,7 +102,7 @@ TrigTestMonToolAC::~TrigTestMonToolAC() { // m_sequences[i]->finalize(); if ( m_fileopen ) for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->finalize(); - msg(MSG::INFO) << "TrigTestMonToolAC::~TrigTestMonToolAC()" << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::~TrigTestMonToolAC()" << endmsg; for ( unsigned i=m_filters.size() ; i-- ; ) delete m_filters[i]; for ( unsigned i=m_associators.size() ; i-- ; ) delete m_associators[i]; @@ -112,9 +112,9 @@ TrigTestMonToolAC::~TrigTestMonToolAC() { StatusCode TrigTestMonToolAC::init() { - msg(MSG::DEBUG) << " ----- enter init() ----- " << endreq; + msg(MSG::DEBUG) << " ----- enter init() ----- " << endmsg; - msg(MSG::INFO) << "TrigTestMonToolAC::init() " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::init() " << gDirectory->GetName() << endmsg; // std::cout << "TrigTestMonToolAC::init() SUTT buildNtuple " << m_buildNtuple << std::endl; @@ -136,7 +136,7 @@ StatusCode TrigTestMonToolAC::init() { /// we need to be automatically determine which chains to process, and so need /// the TrigDecisionTool which is niot configured until we have an iov - msg(MSG::DEBUG) << " ----- exit init() ----- " << endreq; + msg(MSG::DEBUG) << " ----- exit init() ----- " << endmsg; return StatusCode::SUCCESS; } @@ -149,9 +149,9 @@ StatusCode TrigTestMonToolAC::book() { StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool newRun) { #endif - msg(MSG::INFO) << " ----- enter book() (athena) ----- " << endreq; + msg(MSG::INFO) << " ----- enter book() (athena) ----- " << endmsg; - msg(MSG::INFO) << "TrigTestMonToolAC::book() " << gDirectory->GetName() << endreq; + msg(MSG::INFO) << "TrigTestMonToolAC::book() " << gDirectory->GetName() << endmsg; #ifdef ManagedMonitorToolBase_Uses_API_201401 #if 0 @@ -203,11 +203,11 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool m_associators.push_back(dR_matcher); m_associators.push_back(phi_matcher); - msg(MSG::WARNING) << "[91;1m" << "m_analysis_config " << m_analysis_config << "[m" << endreq; + msg(MSG::WARNING) << "[91;1m" << "m_analysis_config " << m_analysis_config << "[m" << endmsg; if ( m_analysis_config=="Tier0" || !m_buildNtuple ) { - msg(MSG::INFO) << "[91;1m" << "setting up tier 0 analyses " << endreq; + msg(MSG::INFO) << "[91;1m" << "setting up tier 0 analyses " << endmsg; std::vector<std::string> chains; chains.reserve( m_ntupleChainNames.size() ); @@ -236,7 +236,7 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool // "[91;1m" // "[m" - if ( selectChains.size()==0 ) msg(MSG::WARNING) << "[91;1m"<< "No chains matched for requested input " << chainName << "[m" << endreq; + if ( selectChains.size()==0 ) msg(MSG::WARNING) << "[91;1m"<< "No chains matched for requested input " << chainName << "[m" << endmsg; for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) { @@ -250,7 +250,7 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool chains.push_back( selectChains[iselected] ); - msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endreq; + msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endmsg; } @@ -259,11 +259,11 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool m_chainNames = chains; - msg(MSG::INFO) << "[91;1m" << "Matching chains " << m_chainNames.size() << " init() [m" << endreq; + msg(MSG::INFO) << "[91;1m" << "Matching chains " << m_chainNames.size() << " init() [m" << endmsg; for ( unsigned i=0 ; i<m_chainNames.size() ; i++ ){ - msg(MSG::INFO) << "[91;1m" << "booking a Tier0 chain " << m_chainNames[i] << " [m" << endreq; + msg(MSG::INFO) << "[91;1m" << "booking a Tier0 chain " << m_chainNames[i] << " [m" << endmsg; m_sequences.push_back( new AnalysisConfig_Tier0(m_chainNames[i], m_chainNames[i], "", "", @@ -280,21 +280,21 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool } } - msg(MSG::DEBUG) << "[91;1m ----- File open? ----- [m" << endreq; + msg(MSG::DEBUG) << "[91;1m ----- File open? ----- [m" << endmsg; if ( !m_fileopen && newRun && ( m_initialisePerRun || m_firstRun ) ) { m_fileopen = true; for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) { - msg(MSG::INFO) << "[91;1m ----- booking for analysis " << m_sequences[i]->name() << " ----- [m" << endreq; + msg(MSG::INFO) << "[91;1m ----- booking for analysis " << m_sequences[i]->name() << " ----- [m" << endmsg; m_sequences[i]->initialize(this, &m_tdt); m_sequences[i]->setGenericFlag(m_genericFlag); m_sequences[i]->book(); - msg(MSG::INFO) << "[91;1m ----- booked for analysis " << m_sequences[i]->name() << " ----- [m" << endreq; + msg(MSG::INFO) << "[91;1m ----- booked for analysis " << m_sequences[i]->name() << " ----- [m" << endmsg; } m_firstRun = false; } - msg(MSG::DEBUG) << " ----- exit book() ----- " << endreq; + msg(MSG::DEBUG) << " ----- exit book() ----- " << endmsg; return StatusCode::SUCCESS; } @@ -304,20 +304,20 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool StatusCode TrigTestMonToolAC::fill() { - msg(MSG::INFO) << " ----- enter fill() (athena) ----- " << endreq; + msg(MSG::INFO) << " ----- enter fill() (athena) ----- " << endmsg; - msg(MSG::INFO) << "chains: " << m_chainNames.size() << endreq; + msg(MSG::INFO) << "chains: " << m_chainNames.size() << endmsg; for ( unsigned i=0 ; i<m_chainNames.size() ; i++ ) { ChainString s = m_chainNames[i]; //std::vector<std::string> triggers = m_tdt->getListOfTriggers( s.head() ); - msg(MSG::INFO) << "Trigger output " << s.head() << " " << s.tail() << "\tdecision " << m_tdt->isPassed( s.head() ) << endreq; + msg(MSG::INFO) << "Trigger output " << s.head() << " " << s.tail() << "\tdecision " << m_tdt->isPassed( s.head() ) << endmsg; } for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->execute(); - msg(MSG::INFO) << " ----- exit fill() ----- " << endreq; + msg(MSG::INFO) << " ----- exit fill() ----- " << endmsg; return StatusCode::SUCCESS; } @@ -337,18 +337,18 @@ StatusCode TrigTestMonToolAC::proc(bool /* endOfEventsBlock*/, bool /* endOfLumi #endif #endif - msg(MSG::DEBUG) << " ----- enter proc() ----- " << endreq; + msg(MSG::DEBUG) << " ----- enter proc() ----- " << endmsg; - msg(MSG::DEBUG) << " ----- initialisePerRun: " << m_initialisePerRun << "\tendOfRun: " << endOfRun << " -----" << endreq; + msg(MSG::DEBUG) << " ----- initialisePerRun: " << m_initialisePerRun << "\tendOfRun: " << endOfRun << " -----" << endmsg; if ( m_initialisePerRun && endOfRun) { for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) { - msg(MSG::INFO) << "[91;1m ----- finalize for analysis " << m_sequences[i]->name() << " ----- [m" << endreq; + msg(MSG::INFO) << "[91;1m ----- finalize for analysis " << m_sequences[i]->name() << " ----- [m" << endmsg; m_sequences[i]->finalize(); } m_fileopen = false; } - msg(MSG::DEBUG) << " ====== exit proc() ====== " << endreq; + msg(MSG::DEBUG) << " ====== exit proc() ====== " << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigAnalysis/TrigInDetTruthAlgs/src/TrigInDetTrackTruthMaker.cxx b/Trigger/TrigAnalysis/TrigInDetTruthAlgs/src/TrigInDetTrackTruthMaker.cxx index 3c107907b5e..b790508b845 100644 --- a/Trigger/TrigAnalysis/TrigInDetTruthAlgs/src/TrigInDetTrackTruthMaker.cxx +++ b/Trigger/TrigAnalysis/TrigInDetTruthAlgs/src/TrigInDetTrackTruthMaker.cxx @@ -114,48 +114,48 @@ StatusCode TrigInDetTrackTruthMaker::initialize() { // print out properties if (msgLvl(MSG::INFO)) { - msg() << MSG::INFO << "Initializing TrigInDetTrackTruthMaker..." << endreq; - msg() << MSG::INFO << "Storing truth map as "<<m_trackTruthMapKey<< endreq; - msg() << MSG::INFO << "PixelSDO_MapName is "<<m_pixel_SDO_Map<< endreq; - msg() << MSG::INFO << "SCT_SDO_MapName is "<<m_SCT_SDO_Map<< endreq; - msg() << MSG::INFO << "TRT_SDO_MapName is "<<m_TRT_SDO_Map<< endreq; - msg() << MSG::INFO << "Minimum nr.common hits = "<<m_minNrMatchHits<< endreq; + msg() << MSG::INFO << "Initializing TrigInDetTrackTruthMaker..." << endmsg; + msg() << MSG::INFO << "Storing truth map as "<<m_trackTruthMapKey<< endmsg; + msg() << MSG::INFO << "PixelSDO_MapName is "<<m_pixel_SDO_Map<< endmsg; + msg() << MSG::INFO << "SCT_SDO_MapName is "<<m_SCT_SDO_Map<< endmsg; + msg() << MSG::INFO << "TRT_SDO_MapName is "<<m_TRT_SDO_Map<< endmsg; + msg() << MSG::INFO << "Minimum nr.common hits = "<<m_minNrMatchHits<< endmsg; } // get pointer to Pixel ID helper if (detStore()->contains<PixelID>( "PixelID" )) { if (detStore()->retrieve( m_PIXid, "PixelID").isFailure()) { - msg() << MSG::ERROR << "Could not retrieve Pixel ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve Pixel ID helper" << endmsg; return StatusCode::FAILURE; } } else { - msg() << MSG::ERROR << "Could not retrieve Pixel ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve Pixel ID helper" << endmsg; return StatusCode::FAILURE; } // get pointer to SCT ID helper if (detStore()->contains<SCT_ID>( "SCT_ID" )) { if (detStore()->retrieve( m_SCTid, "SCT_ID").isFailure()) { - msg() << MSG::ERROR << "Could not retrieve SCT ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve SCT ID helper" << endmsg; return StatusCode::FAILURE; } } else { - msg() << MSG::ERROR << "Could not retrieve SCT ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve SCT ID helper" << endmsg; return StatusCode::FAILURE; } // get pointer to TRT ID helper if (detStore()->contains<TRT_ID>( "TRT_ID" )) { if (detStore()->retrieve( m_TRTid, "TRT_ID").isFailure()) { - msg() << MSG::ERROR << "Could not retrieve TRT ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve TRT ID helper" << endmsg; return StatusCode::FAILURE; } } else { - msg() << MSG::ERROR << "Could not retrieve TRT ID helper" << endreq; + msg() << MSG::ERROR << "Could not retrieve TRT ID helper" << endmsg; return StatusCode::FAILURE; } - if (msgLvl(MSG::INFO)) msg() << MSG::INFO << "TrigInDetTrackTruthMaker initialization done" << endreq; + if (msgLvl(MSG::INFO)) msg() << MSG::INFO << "TrigInDetTrackTruthMaker initialization done" << endmsg; return StatusCode::SUCCESS; } @@ -172,17 +172,17 @@ StatusCode TrigInDetTrackTruthMaker::execute() { // safeguard to avoid crashes when running from POOL // if ( !( m_havePIXmgr || m_haveSCTmgr || m_haveTRTmgr ) ) { -// if (msgLvl(MSG::ERROR)) msg() << MSG::ERROR << "Detector managers not available!" << endreq; +// if (msgLvl(MSG::ERROR)) msg() << MSG::ERROR << "Detector managers not available!" << endmsg; // return StatusCode::SUCCESS; // } // create truth-association maps for TrigInDetTracks and record to StoreGate if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "Recording truth map to StoreGate with key " - << m_trackTruthMapKey << endreq; + << m_trackTruthMapKey << endmsg; if (evtStore()->contains<TrigInDetTrackTruthMap>( m_trackTruthMapKey )) { if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << m_trackTruthMapKey << " already exists: stop!" - << endreq; + << endmsg; return StatusCode::SUCCESS; } @@ -190,7 +190,7 @@ StatusCode TrigInDetTrackTruthMaker::execute() { // declare StatusCode here instead so it is always checked StatusCode sc = evtStore()->record(trk_truth_map, m_trackTruthMapKey); if (sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg() << MSG::ERROR << "Failed recording truth map to StoreGate!" << endreq; + if (msgLvl(MSG::ERROR)) msg() << MSG::ERROR << "Failed recording truth map to StoreGate!" << endmsg; delete trk_truth_map; return StatusCode::SUCCESS; } @@ -198,7 +198,7 @@ StatusCode TrigInDetTrackTruthMaker::execute() { // get truth association maps and check some were found bool haveTruthMaps = this->GetTruthMaps(); if ( !haveTruthMaps ) { - if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << "No truth maps found in StoreGate!" << endreq; + if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << "No truth maps found in StoreGate!" << endmsg; return StatusCode::SUCCESS; } else { std::vector<std::string>::iterator firstKey = m_TrigInDetTrackCollectionKeys.begin(); @@ -211,16 +211,16 @@ StatusCode TrigInDetTrackTruthMaker::execute() { StatusCode sc = evtStore()->retrieve(trkColl, *firstKey); if (sc.isFailure()) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "No TrigInDetTrackCollection found with key " - << *firstKey << endreq; + << *firstKey << endmsg; continue; } } else { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "No TrigInDetTrackCollection found with key " - << *firstKey << endreq; + << *firstKey << endmsg; continue; } if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "TrigInDetTrackCollection retrieved with key " - << *firstKey << endreq; + << *firstKey << endmsg; // tracks TrigInDetTrackCollection::const_iterator trkIter = trkColl->begin(); @@ -228,7 +228,7 @@ StatusCode TrigInDetTrackTruthMaker::execute() { for (unsigned int iTrk=0; trkIter !=lastTrk; ++trkIter, ++iTrk) { - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Doing TrigInDetTrack " << iTrk << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Doing TrigInDetTrack " << iTrk << endmsg; // check if track has hit information if ((*trkIter)->siSpacePoints() || (*trkIter)->trtDriftCircles()) { @@ -238,21 +238,21 @@ StatusCode TrigInDetTrackTruthMaker::execute() { if ( this->TrackTruth(*trkIter, &trk_truth) ) { // check against null pointers and put in map - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Filling truth match family relations" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Filling truth match family relations" << endmsg; int nr_relations = trk_truth.updateFamilyTree(); - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << nr_relations << " family relations found" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << nr_relations << " family relations found" << endmsg; - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Adding truth match to map" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Adding truth match to map" << endmsg; // add truth-association object to map trk_truth_map->addMatch(trkColl,iTrk,trk_truth); } else { - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "No truth match found" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "No truth match found" << endmsg; } } else { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "TrigInDetTrack " << iTrk - << " in collection with key " << *firstKey << " has no hit information" << endreq; + << " in collection with key " << *firstKey << " has no hit information" << endmsg; } // any hits in track? } // loop over tracks } // loop over track collections @@ -265,14 +265,14 @@ StatusCode TrigInDetTrackTruthMaker::execute() { // lock truth map if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Locking TrigInDetTrackTruthMap with key " - << m_trackTruthMapKey << endreq; + << m_trackTruthMapKey << endmsg; sc = evtStore()->setConst(trk_truth_map); if (sc.isFailure()) { - if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << "Could not lock TrigInDetTrackTruthMap!" << endreq; + if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << "Could not lock TrigInDetTrackTruthMap!" << endmsg; } else if (evtStore()->contains<TrigInDetTrackTruthMap>( m_trackTruthMapKey )) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "TrigInDetTrackTruthMap \"" - << m_trackTruthMapKey << "\" in SG; done!" << endreq; + << m_trackTruthMapKey << "\" in SG; done!" << endmsg; return StatusCode::SUCCESS; } return StatusCode::SUCCESS; @@ -298,7 +298,7 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet if (p_sp_vec) { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TrackTruth() : TrigInDetTrack has " - << p_sp_vec->size() << " SiSpacePoints" << endreq; + << p_sp_vec->size() << " SiSpacePoints" << endmsg; std::vector<const TrigSiSpacePoint*>::iterator spIter = p_sp_vec->begin(); std::vector<const TrigSiSpacePoint*>::iterator lastSP = p_sp_vec->end(); @@ -314,9 +314,9 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet if (msgLvl(MSG::VERBOSE)) { msg() << MSG::VERBOSE << "TrackTruth() : Pixel Space Point " << iSP << " R: " << (*spIter)->r() << " phi: " << (*spIter)->phi() - << " z: " << (*spIter)->z() << endreq; + << " z: " << (*spIter)->z() << endmsg; msg() << MSG::VERBOSE << "TrackTruth() : SP-id: " - << m_PIXid->print_to_string((*spIter)->identify()) << endreq; + << m_PIXid->print_to_string((*spIter)->identify()) << endmsg; } // get all the GenParticles that contributed to SP @@ -331,11 +331,11 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet if (msgLvl(MSG::VERBOSE)) { msg() << MSG::VERBOSE << "TrackTruth() : SCT Space Point " << iSP << " R: " << (*spIter)->r() << " phi: " << (*spIter)->phi() - << " z: " << (*spIter)->z() << endreq; + << " z: " << (*spIter)->z() << endmsg; msg() << MSG::VERBOSE << "TrackTruth() : SP-id: " << m_SCTid->print_to_string((*spIter)->identify()) - << endreq; + << endmsg; } // get all the GenParticles that contributed to SP this->SCTspTruth(*spIter, p_gp_vec); @@ -359,7 +359,7 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet // check TRT_DriftCircles are there and if so carry on if (p_dc_vec) { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TrackTruth() : TrigInDetTrack has " - << p_dc_vec->size() << " TRT_DriftCircles" << endreq; + << p_dc_vec->size() << " TRT_DriftCircles" << endmsg; std::vector<const InDet::TRT_DriftCircle*>::iterator dcIter = p_dc_vec->begin(); std::vector<const InDet::TRT_DriftCircle*>::iterator lastSP = p_dc_vec->end(); @@ -374,9 +374,9 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet if ( m_TRTid->is_trt((*dcIter)->identify()) ) { if (msgLvl(MSG::VERBOSE)) { - msg() << MSG::VERBOSE << "TrackTruth() : TRT Drift Circle " << iDC << endreq; + msg() << MSG::VERBOSE << "TrackTruth() : TRT Drift Circle " << iDC << endmsg; msg() << MSG::VERBOSE << "TrackTruth() : DC-id: " - << m_TRTid->print_to_string((*dcIter)->identify()) << endreq; + << m_TRTid->print_to_string((*dcIter)->identify()) << endmsg; } // get all the GenParticles that contributed to SP this->TRTdcTruth(*dcIter, p_gp_vec); @@ -420,11 +420,11 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet // add matching GenParticle (and hits) to truth association object if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TrackTruth(): add match to track " << itrk << ": hits=" << pix_hits << "(pix), " << sct_hits << "(sct), " - << trt_hits << "(trt)"<<endreq; + << trt_hits << "(trt)"<<endmsg; // sanity check if ( (*mapIt).second != (pix_hits+sct_hits+trt_hits) ) { - msg() << MSG::WARNING << "TrackTruth(): ERROR counting hits" << endreq; + msg() << MSG::WARNING << "TrackTruth(): ERROR counting hits" << endmsg; } // if at least one match was found: update success flag @@ -439,7 +439,7 @@ bool TrigInDetTrackTruthMaker::TrackTruth(const TrigInDetTrack* p_trk, TrigInDet if (t_hits.total() > 2) { unsigned int indx = p_truth->addMatch( (*mapIt).first, t_hits); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << - "TrackTruth(): matching particle has match index " << indx << endreq; + "TrackTruth(): matching particle has match index " << indx << endmsg; } } return success; @@ -454,17 +454,17 @@ void TrigInDetTrackTruthMaker::updatePLmap(std::vector<HepMcParticleLink>* p_vec std::vector<HepMcParticleLink>::iterator gpIter = p_vec->begin(); std::vector<HepMcParticleLink>::iterator lastGP = p_vec->end(); - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLmap() : looping over GenParticles" << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLmap() : looping over GenParticles" << endmsg; for (int igp=0; gpIter != lastGP; ++gpIter, ++igp) { if(hits_map.count(*gpIter) == 0) { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLmap() : adding GenParticle " << igp - << " to local map for insertion in track truth" <<endreq; + << " to local map for insertion in track truth" <<endmsg; hits_map[(*gpIter)] = 1; } else { hits_map[(*gpIter)] = hits_map[(*gpIter)]+1; if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLmap() : GenParticle " << igp - << " already in local map : " << hits_map[(*gpIter)] << " common hits so far" << endreq; + << " already in local map : " << hits_map[(*gpIter)] << " common hits so far" << endmsg; } } return; @@ -491,20 +491,20 @@ void TrigInDetTrackTruthMaker::SCTspTruth(const TrigSiSpacePoint* p_SP, std::vec } if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "SCTspTruth() : cluster-id: " - << m_SCTid->print_to_string((*pSCTclus).identify()) << endreq; + << m_SCTid->print_to_string((*pSCTclus).identify()) << endmsg; // get list of Raw Data Objects identifiers in cluster const std::vector<Identifier> clusRDOids = pSCTclus->rdoList(); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "SCTspTruth() : cluster " << iClusInSP << " has " - << clusRDOids.size() << " RDO identifiers" << endreq; + << clusRDOids.size() << " RDO identifiers" << endmsg; std::vector<Identifier>::const_iterator rdoIter=clusRDOids.begin(); std::vector<Identifier>::const_iterator lastRDO=clusRDOids.end(); // loop over RDO identifiers and get collection of InDetSimData for (int iRDO=0; rdoIter != lastRDO; ++rdoIter, ++iRDO) { - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "SCTspTruth() : Doing RDO nr " << iRDO << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "SCTspTruth() : Doing RDO nr " << iRDO << endmsg; // find InDetSimData object corresponding to this RDO from the // SCT InDetSimDataCollection map; a InDetSimData is basically a @@ -515,7 +515,7 @@ void TrigInDetTrackTruthMaker::SCTspTruth(const TrigSiSpacePoint* p_SP, std::vec // check if the InDetSimData corresponding to the RDO was found if (clusSimData == m_id2SimDataMapSCT->end()) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "SCTspTruth() : Cannot find simulation info for " - << m_SCTid->print_to_string(*rdoIter) << endreq; + << m_SCTid->print_to_string(*rdoIter) << endmsg; continue; } else { // add all GenParticles which contributed to this cluster into vector @@ -538,13 +538,13 @@ void TrigInDetTrackTruthMaker::PIXspTruth(const TrigSiSpacePoint* p_SP, std::vec if (!pPIXclus) return; if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "PIXspTruth() : cluster-id: " - << m_PIXid->print_to_string((*pPIXclus).identify()) << endreq; + << m_PIXid->print_to_string((*pPIXclus).identify()) << endmsg; // get list of Raw Data Objects identifiers in cluster const std::vector<Identifier> clusRDOids = pPIXclus->rdoList(); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "PIXspTruth() : cluster has " - << clusRDOids.size() << " RDO identifiers" << endreq; + << clusRDOids.size() << " RDO identifiers" << endmsg; std::vector<Identifier>::const_iterator rdoIter = clusRDOids.begin(); std::vector<Identifier>::const_iterator lastRDO = clusRDOids.end(); @@ -552,15 +552,15 @@ void TrigInDetTrackTruthMaker::PIXspTruth(const TrigSiSpacePoint* p_SP, std::vec // loop over RDO identifiers and get collection of InDetSimData for (int iRDO=0; rdoIter != lastRDO; ++rdoIter, ++iRDO) { - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "PIXspTruth() : Doing RDO nr " << iRDO << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "PIXspTruth() : Doing RDO nr " << iRDO << endmsg; if ( ! (*rdoIter).is_valid() ) { if (msgLvl(MSG::VERBOSE)) msg() << MSG::WARNING << - "Invalid identifier from pixel SP->rdoList() !!" << endreq; + "Invalid identifier from pixel SP->rdoList() !!" << endmsg; continue; } else { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "Pixel identifier: " - << m_PIXid->print_to_string(*rdoIter) << endreq; + << m_PIXid->print_to_string(*rdoIter) << endmsg; } // find InDetSimData object corresponding to this RDO from the @@ -572,7 +572,7 @@ void TrigInDetTrackTruthMaker::PIXspTruth(const TrigSiSpacePoint* p_SP, std::vec if (clusSimData == m_id2SimDataMapPIX->end()) { // we didn't find the ID in the map - check if it is a ganged pixel if (msgLvl(MSG::VERBOSE)) msg() << MSG::DEBUG << "PIXspTruth() : Cannot find simulation info for " - << m_PIXid->print_to_string(*rdoIter) <<" : looking for ganged pixel" << endreq; + << m_PIXid->print_to_string(*rdoIter) <<" : looking for ganged pixel" << endmsg; const unsigned int phi_index = m_PIXid->phi_index(*rdoIter); unsigned int ganged_phi_index=0; @@ -599,14 +599,14 @@ void TrigInDetTrackTruthMaker::PIXspTruth(const TrigSiSpacePoint* p_SP, std::vec m_PIXid->eta_index(*rdoIter)); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "PIXspTruth() : ganged to pixel " - << m_PIXid->print_to_string(new_rdoID) << endreq; + << m_PIXid->print_to_string(new_rdoID) << endmsg; clusSimData = m_id2SimDataMapPIX->find(new_rdoID); } if(clusSimData == m_id2SimDataMapPIX->end() ) { // check again, in case ganged pixel is also not in map if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG << "SCTspTruth() : Cannot find simulation info for " - << m_PIXid->print_to_string(*rdoIter) << endreq; + << m_PIXid->print_to_string(*rdoIter) << endmsg; continue; } } @@ -630,7 +630,7 @@ void TrigInDetTrackTruthMaker::TRTdcTruth(const InDet::TRT_DriftCircle* p_DC, st const std::vector<Identifier>& dcircRDOids = p_DC->rdoList(); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TRTdcTruth() : drift circle has " - << dcircRDOids.size() << " RDO identifiers" << endreq; + << dcircRDOids.size() << " RDO identifiers" << endmsg; std::vector<Identifier>::const_iterator rdoIter = dcircRDOids.begin(); std::vector<Identifier>::const_iterator lastRDO = dcircRDOids.end(); @@ -638,15 +638,15 @@ void TrigInDetTrackTruthMaker::TRTdcTruth(const InDet::TRT_DriftCircle* p_DC, st // loop over RDO identifiers and get collection of InDetSimData for (int iRDO=0; rdoIter != lastRDO; ++rdoIter, ++iRDO) { - if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TRTdcTruth() : Doing RDO nr " << iRDO << endreq; + if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TRTdcTruth() : Doing RDO nr " << iRDO << endmsg; if ( !(*rdoIter).is_valid() ) { if (msgLvl(MSG::WARNING)) msg() << MSG::WARNING << "Invalid identifier from TRT DC->rdoList() !!" - << endreq; + << endmsg; continue; } else { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "TRT identifier: " - << m_TRTid->print_to_string(*rdoIter) << endreq; + << m_TRTid->print_to_string(*rdoIter) << endmsg; } // find InDetSimData object corresponding to this RDO from the @@ -659,7 +659,7 @@ void TrigInDetTrackTruthMaker::TRTdcTruth(const InDet::TRT_DriftCircle* p_DC, st // we didn't find the ID in the map if (msgLvl(MSG::VERBOSE)) msg() << MSG::DEBUG << "TRTdcTruth() : Cannot find simulation info for " - << m_TRTid->print_to_string(*rdoIter) << endreq; + << m_TRTid->print_to_string(*rdoIter) << endmsg; continue; } @@ -677,7 +677,7 @@ void TrigInDetTrackTruthMaker::updatePLvector(std::vector<HepMcParticleLink>* p_ const std::vector< std::pair<HepMcParticleLink,float> >& simDeposits = ((*simData).second).getdeposits(); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLvector() : RDO has " - << simDeposits.size() << " deposits" << endreq; + << simDeposits.size() << " deposits" << endmsg; // loop over the deposits and get info from HepMcParticleLinks std::vector< std::pair<HepMcParticleLink,float> >::const_iterator depIter = simDeposits.begin(); @@ -686,7 +686,7 @@ void TrigInDetTrackTruthMaker::updatePLvector(std::vector<HepMcParticleLink>* p_ for (int iDep=0 ; depIter != lastDep; ++depIter, ++iDep) { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLvector() : Doing deposit " - << iDep << endreq; + << iDep << endmsg; // get the HepMcParticleLink from the Deposit particle link and check it's ok HepMcParticleLink partLink = (*depIter).first; @@ -694,7 +694,7 @@ void TrigInDetTrackTruthMaker::updatePLvector(std::vector<HepMcParticleLink>* p_ if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLvector() : Deposit " << iDep << ": kine " << partLink.barcode() << ", event index " << partLink.eventIndex() - << ", energy deposit " << (*depIter).second << endreq; + << ", energy deposit " << (*depIter).second << endmsg; if (partLink.isValid()) { @@ -709,7 +709,7 @@ void TrigInDetTrackTruthMaker::updatePLvector(std::vector<HepMcParticleLink>* p_ p_GP->push_back(partLink); if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "updatePLvector() : Added particle to vector: " - << p_GP->size() << " matches so far" << endreq; + << p_GP->size() << " matches so far" << endmsg; } } } @@ -727,16 +727,16 @@ bool TrigInDetTrackTruthMaker::GetTruthMaps() StatusCode sc = evtStore()->retrieve(m_id2SimDataMapPIX, m_pixel_SDO_Map); if (sc.isFailure()) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_pixel_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_pixel_SDO_Map << "!" << endmsg; m_havePIXmap=false; } else { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "GetTruthMaps() : Retrieved " - << m_pixel_SDO_Map << endreq; + << m_pixel_SDO_Map << endmsg; m_havePIXmap=true; } } else { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_pixel_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_pixel_SDO_Map << "!" << endmsg; m_havePIXmap=false; } @@ -745,16 +745,16 @@ bool TrigInDetTrackTruthMaker::GetTruthMaps() StatusCode sc = evtStore()->retrieve(m_id2SimDataMapSCT, m_SCT_SDO_Map); if (sc.isFailure()) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_SCT_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_SCT_SDO_Map << "!" << endmsg; m_haveSCTmap=false; } else { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE - << "GetTruthMaps() : Retrieved " << m_SCT_SDO_Map << endreq; + << "GetTruthMaps() : Retrieved " << m_SCT_SDO_Map << endmsg; m_haveSCTmap=true; } } else { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_SCT_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_SCT_SDO_Map << "!" << endmsg; m_haveSCTmap=false; } @@ -763,16 +763,16 @@ bool TrigInDetTrackTruthMaker::GetTruthMaps() StatusCode sc = evtStore()->retrieve(m_id2SimDataMapTRT, m_TRT_SDO_Map); if (sc.isFailure()) { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_TRT_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_TRT_SDO_Map << "!" << endmsg; m_haveTRTmap=false; } else { if (msgLvl(MSG::VERBOSE)) msg() << MSG::VERBOSE << "GetTruthMaps() : Retrieved " - << m_TRT_SDO_Map << endreq; + << m_TRT_SDO_Map << endmsg; m_haveTRTmap=true; } } else { if (msgLvl(MSG::DEBUG)) msg() << MSG::DEBUG - << "GetTruthMaps() : Could not retrieve " << m_TRT_SDO_Map << "!" << endreq; + << "GetTruthMaps() : Could not retrieve " << m_TRT_SDO_Map << "!" << endmsg; m_haveTRTmap=false; } diff --git a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/MuonRoiChain.cxx b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/MuonRoiChain.cxx index bfc5e8732c1..acf7dea60e3 100644 --- a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/MuonRoiChain.cxx +++ b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/MuonRoiChain.cxx @@ -113,13 +113,13 @@ namespace Trigger { ms << level << "*** MuonRoiChain object : " << (m_source==Muon_ROI::Barrel ? "Barrel " : (m_source==Muon_ROI::Endcap ? "Endcap " : "Forward ")) << (m_hemisphere==Muon_ROI::Positive ? "Side A " : "Side C ") - << " ***" << endreq; - ms << level << " Muon_ROI= " << m_muonRoi << " , roiIndex= " << m_roiIndex << endreq; - ms << level << " MuCTPI_RDO_dataWord= " << m_muctpiRdoDataWord << " , dataWordIndex= " << m_dataWordIndex << endreq; + << " ***" << endmsg; + ms << level << " Muon_ROI= " << m_muonRoi << " , roiIndex= " << m_roiIndex << endmsg; + ms << level << " MuCTPI_RDO_dataWord= " << m_muctpiRdoDataWord << " , dataWordIndex= " << m_dataWordIndex << endmsg; ms << level << " SectorID= " << dataWordDecoder.getSectorID() << " , RoiNumber= " << dataWordDecoder.getRoiNumber() - << " , Pt= " << dataWordDecoder.getPt() << " , SentRoi= " << dataWordDecoder.getSentRoi() << endreq; - ms << level << " TgcCoinData= " << m_tgcSL << endreq; - ms << level << "*********************************************" << endreq; + << " , Pt= " << dataWordDecoder.getPt() << " , SentRoi= " << dataWordDecoder.getSentRoi() << endmsg; + ms << level << " TgcCoinData= " << m_tgcSL << endmsg; + ms << level << "*********************************************" << endmsg; } bool MuonRoiChain::isInEndcapChamberBoundary() const { diff --git a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchy.cxx b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchy.cxx index 697a930b3eb..da565299374 100644 --- a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchy.cxx +++ b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchy.cxx @@ -204,9 +204,9 @@ namespace Trigger { void TgcCoinHierarchy::dump(MsgStream& ms, MSG::Level level) const { unsigned int bc = timingToInt(m_bc_coin); - ms << "TIMING COIN:" << bc << endreq; + ms << "TIMING COIN:" << bc << endmsg; bc = timingToInt(m_bc_hit); - ms << "TIMING HIT :" << bc << endreq; + ms << "TIMING HIT :" << bc << endmsg; const TgcCoinData* highestCoin = this->getCoincidence(this->highestCoincidence()); if(highestCoin) { @@ -214,51 +214,51 @@ namespace Trigger { << (highestCoin->isAside() ? "Side A " : "Side C ") << (highestCoin->isForward() ? "Forward " : "Endcap ") << "phi=" << highestCoin->phi() - << " ***" << endreq; + << " ***" << endmsg; // SL if(this->hasCoincidence(SL)) { const TgcCoinData* sl = this->getCoincidence(SL); ms << level << "Sector Logic : trackletId=" << sl->trackletId() - << ", trackletIdStrip=" << sl->trackletIdStrip() << endreq; + << ", trackletIdStrip=" << sl->trackletIdStrip() << endmsg; } else { - ms << level << "Sector Logic : does not exist" << endreq; + ms << level << "Sector Logic : does not exist" << endmsg; } // HIPTWIRE if(this->hasCoincidence(HIPTWIRE)) { const TgcCoinData* hw = this->getCoincidence(HIPTWIRE); ms << level << "HiPt Wire : trackletId=" << hw->trackletId() - << ", isDuplicated=" << (m_duplicatedCoincidence[HIPTWIRE] ? "YES" : "NO") << endreq; + << ", isDuplicated=" << (m_duplicatedCoincidence[HIPTWIRE] ? "YES" : "NO") << endmsg; } else { - ms << level << "HiPt Wire : does not exist" << endreq; + ms << level << "HiPt Wire : does not exist" << endmsg; } // HIPTSTRIP if(this->hasCoincidence(HIPTSTRIP)) { const TgcCoinData* hs = this->getCoincidence(HIPTSTRIP); ms << level << "HiPt Strip : trackletId=" << hs->trackletId() - << ", isDuplicated=" << (m_duplicatedCoincidence[HIPTSTRIP] ? "YES" : "NO") << endreq; + << ", isDuplicated=" << (m_duplicatedCoincidence[HIPTSTRIP] ? "YES" : "NO") << endmsg; } else { - ms << level << "HiPt Strip : does not exist" << endreq; + ms << level << "HiPt Strip : does not exist" << endmsg; } // TRACKLETWIRE if(this->hasCoincidence(TRACKLETWIRE)) { const TgcCoinData* tw = this->getCoincidence(TRACKLETWIRE); ms << level << "Tracklet Wire : trackletId=" << tw->trackletId() - << ", isDuplicated=" << (m_duplicatedCoincidence[TRACKLETWIRE] ? "YES" : "NO") << endreq; + << ", isDuplicated=" << (m_duplicatedCoincidence[TRACKLETWIRE] ? "YES" : "NO") << endmsg; } else { - ms << level << "Tracklet Wire : does not exist" << endreq; + ms << level << "Tracklet Wire : does not exist" << endmsg; } // TRACKLETSTRIP if(this->hasCoincidence(TRACKLETSTRIP)) { const TgcCoinData* ts = this->getCoincidence(TRACKLETSTRIP); ms << level << "Tracklet Strip : trackletId=" << ts->trackletId() - << ", isDuplicated=" << (m_duplicatedCoincidence[TRACKLETSTRIP] ? "YES" : "NO") << endreq; + << ", isDuplicated=" << (m_duplicatedCoincidence[TRACKLETSTRIP] ? "YES" : "NO") << endmsg; } else { - ms << level << "Tracklet Strip : does not exist" << endreq; + ms << level << "Tracklet Strip : does not exist" << endmsg; } // HITS @@ -268,15 +268,15 @@ namespace Trigger { STATION station = (iST==TGC1 ? TGC1 : (iST==TGC2 ? TGC2 : TGC3)); unsigned int numHits = this->numHits(isStrip, station); ms << level << "Hit " << (isStrip ? "Strip " : "Wire ") - << "TGC" << iST+1 << " : " << numHits << " hits" << endreq; + << "TGC" << iST+1 << " : " << numHits << " hits" << endmsg; } } } else { - ms << level << "*** TgcCoinHierarchy object : There is no highest coincidence. This is strange. ***" << endreq; + ms << level << "*** TgcCoinHierarchy object : There is no highest coincidence. This is strange. ***" << endmsg; } - ms << level << "*******************************************************" << endreq; + ms << level << "*******************************************************" << endmsg; } diff --git a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchyFindTool.cxx b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchyFindTool.cxx index f761474e389..1bc027126a6 100644 --- a/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchyFindTool.cxx +++ b/Trigger/TrigAnalysis/TrigMuonCoinHierarchy/src/TgcCoinHierarchyFindTool.cxx @@ -1182,7 +1182,7 @@ namespace Trigger { const ITGCcablingServerSvc* TgcCabGet = 0; StatusCode sc = service("TGCcablingServerSvc", TgcCabGet, true); if(!sc.isSuccess()) { - msg(sc.isFailure() ? MSG::FATAL : MSG::ERROR) << "Could not get TGCcablingServerSvc !" << endreq; + msg(sc.isFailure() ? MSG::FATAL : MSG::ERROR) << "Could not get TGCcablingServerSvc !" << endmsg; return sc; } @@ -1193,7 +1193,7 @@ namespace Trigger { sc = TgcCabGet->giveCabling(m_tgcCabling); if(!sc.isSuccess()) { - msg(sc.isFailure() ? MSG::FATAL : MSG::ERROR) << "Could not get ITGCcablingSvc from Server!" << endreq; + msg(sc.isFailure() ? MSG::FATAL : MSG::ERROR) << "Could not get ITGCcablingSvc from Server!" << endmsg; m_tgcCabling = 0; return sc; } else { diff --git a/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/MsgStream.h b/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/MsgStream.h index 6eff8e2903b..517857af410 100644 --- a/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/MsgStream.h +++ b/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/MsgStream.h @@ -48,7 +48,7 @@ namespace TrigConf { * Main difference to Gaudi MsgStream: * - OutputLevel cannot be configued via job options, instead the * gloabal OutputLevel of the MessageSvc is being used - * - Only supports endmsg and not the the deprecated endreq + * - Only supports endmsg and not the the deprecated endmsg */ class MsgStreamTC : public std::ostringstream { public: diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx index fba07fb439e..a7bf6f87421 100755 --- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx +++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc.cxx @@ -132,20 +132,20 @@ StatusCode TrigROBDataProviderSvc::initialize() if (m_msg) m_msg->setLevel( baseOutputLevel.value() ); logStream() << MSG::INFO << " ---> TrigROBDataProviderSvc = " << name() << " initialize " - << " - package version " << PACKAGE_VERSION << endreq ; + << " - package version " << PACKAGE_VERSION << endmsg ; // get Property filterEmptyROB from base class if ( !sc.isSuccess() ) { - logStream() << MSG::ERROR << " ROBDataProviderSvc::initialize() failed." << endreq; + logStream() << MSG::ERROR << " ROBDataProviderSvc::initialize() failed." << endmsg; return sc; } else { BooleanProperty filterEmptyROB; filterEmptyROB.setName("filterEmptyROB"); if (filterEmptyROB.assign(getProperty("filterEmptyROB"))) { m_removeEmptyROB = filterEmptyROB.value() ; - logStream() << MSG::INFO << " ---> getProperty('filterEmptyROB') = " << filterEmptyROB << endreq; + logStream() << MSG::INFO << " ---> getProperty('filterEmptyROB') = " << filterEmptyROB << endmsg; } else { - logStream() << MSG::WARNING << " ROBDataProviderSvc::getProperty('filterEmptyROB') failed." << endreq; + logStream() << MSG::WARNING << " ROBDataProviderSvc::getProperty('filterEmptyROB') failed." << endmsg; } } @@ -223,7 +223,7 @@ StatusCode TrigROBDataProviderSvc::initialize() if ( m_readROBfromOKS.value() ) { ServiceHandle<IJobOptionsSvc> p_jobOptionsSvc("JobOptionsSvc", name()); if ((p_jobOptionsSvc.retrieve()).isFailure()) { - logStream() << MSG::ERROR << "Could not find JobOptionsSvc" << endreq; + logStream() << MSG::ERROR << "Could not find JobOptionsSvc" << endmsg; } else { const std::vector<const Property*>* dataFlowProps = p_jobOptionsSvc->getProperties("DataFlowConfig"); if (dataFlowProps) { @@ -233,9 +233,9 @@ StatusCode TrigROBDataProviderSvc::initialize() if ( (*cur)->name() == "DF_Enabled_ROB_IDs" ) { if (m_enabledROBs.assign(**cur)) { robOKSconfigFound = true; - logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledROBs.value().size() << " enabled ROB IDs." << endreq; + logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledROBs.value().size() << " enabled ROB IDs." << endmsg; } else { - logStream() << MSG::WARNING << " Could not set Property 'enabledROBs' from OKS." << endreq; + logStream() << MSG::WARNING << " Could not set Property 'enabledROBs' from OKS." << endmsg; } } @@ -243,9 +243,9 @@ StatusCode TrigROBDataProviderSvc::initialize() if ( (*cur)->name() == "DF_LAr_MET_ROB_IDs" ) { if (m_enabledLArMetROBs.assign(**cur)) { robLArMetOKSconfigFound = true; - logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledLArMetROBs.value().size() << " LAr MET ROB IDs." << endreq; + logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledLArMetROBs.value().size() << " LAr MET ROB IDs." << endmsg; } else { - logStream() << MSG::WARNING << " Could not set Property 'LArMetROBs' from OKS." << endreq; + logStream() << MSG::WARNING << " Could not set Property 'LArMetROBs' from OKS." << endmsg; } } @@ -253,9 +253,9 @@ StatusCode TrigROBDataProviderSvc::initialize() if ( (*cur)->name() == "DF_Tile_MET_ROB_IDs" ) { if (m_enabledTileMetROBs.assign(**cur)) { robTileMetOKSconfigFound = true; - logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledTileMetROBs.value().size() << " Tile MET ROB IDs." << endreq; + logStream() << MSG::INFO << " ---> Read from OKS = " << m_enabledTileMetROBs.value().size() << " Tile MET ROB IDs." << endmsg; } else { - logStream() << MSG::WARNING << " Could not set Property 'TileMetROBs' from OKS." << endreq; + logStream() << MSG::WARNING << " Could not set Property 'TileMetROBs' from OKS." << endmsg; } } @@ -263,115 +263,115 @@ StatusCode TrigROBDataProviderSvc::initialize() if ( (*cur)->name() == "DF_ROB_ROS_Mapping" ) { if (m_rob_ros_map.assign(**cur)) { robRosOKSconfigFound = true; - logStream() << MSG::INFO << " ---> Read from OKS = " << m_rob_ros_map.value().size() << " ROB/ROS mapping values." << endreq; + logStream() << MSG::INFO << " ---> Read from OKS = " << m_rob_ros_map.value().size() << " ROB/ROS mapping values." << endmsg; } else { - logStream() << MSG::WARNING << " Could not set Property 'RobRosMapping' from OKS." << endreq; + logStream() << MSG::WARNING << " Could not set Property 'RobRosMapping' from OKS." << endmsg; } } } } else { - logStream() << MSG::WARNING << " No 'DataFlowConfig' properties available in JobOptionsSvc " << endreq; + logStream() << MSG::WARNING << " No 'DataFlowConfig' properties available in JobOptionsSvc " << endmsg; } p_jobOptionsSvc.release().ignore(); } } - logStream() << MSG::INFO << " ---> TrigROBDataProviderSvc = " << name() << " special properties <---" << endreq; - logStream() << MSG::INFO << " ---> Filter out empty ROB fragments = " << m_removeEmptyROB << endreq; - logStream() << MSG::INFO << " ---> Fill monitoring histograms = " << m_doMonitoring << endreq; - logStream() << MSG::INFO << " Hist:RequestedROBsPerCall = " << m_histProp_requestedROBsPerCall << endreq; - logStream() << MSG::INFO << " Hist:ReceivedROBsPerCall = " << m_histProp_receivedROBsPerCall << endreq; - logStream() << MSG::INFO << " Hist:TimeROBretrieval = " << m_histProp_timeROBretrieval << endreq; - logStream() << MSG::INFO << " Hist:RetrievedROBsPerAlgo = " << m_histProp_retrievedROBsPerAlgo << endreq; - logStream() << MSG::INFO << " Hist:ROSRequest = " << m_histProp_ROSRequest << endreq; - logStream() << MSG::INFO << " ---> Do detailed ROB monitoring = " << m_doDetailedROBMonitoring << endreq; - logStream() << MSG::INFO << " ---> SG name for ROB monitoring collect. = " << m_ROBDataMonitorCollection_SG_Name << endreq; - logStream() << MSG::INFO << " ---> Read list of enabled ROBs from OKS = " << m_readROBfromOKS << endreq; + logStream() << MSG::INFO << " ---> TrigROBDataProviderSvc = " << name() << " special properties <---" << endmsg; + logStream() << MSG::INFO << " ---> Filter out empty ROB fragments = " << m_removeEmptyROB << endmsg; + logStream() << MSG::INFO << " ---> Fill monitoring histograms = " << m_doMonitoring << endmsg; + logStream() << MSG::INFO << " Hist:RequestedROBsPerCall = " << m_histProp_requestedROBsPerCall << endmsg; + logStream() << MSG::INFO << " Hist:ReceivedROBsPerCall = " << m_histProp_receivedROBsPerCall << endmsg; + logStream() << MSG::INFO << " Hist:TimeROBretrieval = " << m_histProp_timeROBretrieval << endmsg; + logStream() << MSG::INFO << " Hist:RetrievedROBsPerAlgo = " << m_histProp_retrievedROBsPerAlgo << endmsg; + logStream() << MSG::INFO << " Hist:ROSRequest = " << m_histProp_ROSRequest << endmsg; + logStream() << MSG::INFO << " ---> Do detailed ROB monitoring = " << m_doDetailedROBMonitoring << endmsg; + logStream() << MSG::INFO << " ---> SG name for ROB monitoring collect. = " << m_ROBDataMonitorCollection_SG_Name << endmsg; + logStream() << MSG::INFO << " ---> Read list of enabled ROBs from OKS = " << m_readROBfromOKS << endmsg; if (m_enabledROBs.value().size() == 0) { - logStream() << MSG::INFO << " ---> The list of enabled ROBs has size = 0. No check will be performed " << endreq; + logStream() << MSG::INFO << " ---> The list of enabled ROBs has size = 0. No check will be performed " << endmsg; } else { if (m_readROBfromOKS.value() && robOKSconfigFound) { logStream() << MSG::INFO << " ---> The list of enabled ROBs has size = " << m_enabledROBs.value().size() - << ". It was read from the partition database." << endreq; + << ". It was read from the partition database." << endmsg; } else { logStream() << MSG::INFO << " ---> The list of enabled ROBs has size = " << m_enabledROBs.value().size() - << ". It was read from job options." << endreq; + << ". It was read from job options." << endmsg; } } - logStream() << MSG::INFO << " ---> Generic Module ID for LAr MET ROB = " << m_genericLArMetModuleID << endreq; + logStream() << MSG::INFO << " ---> Generic Module ID for LAr MET ROB = " << m_genericLArMetModuleID << endmsg; if (m_enabledLArMetROBs.value().size() == 0) { - logStream() << MSG::INFO << " ---> The list of LAr MET ROBs has size = 0. No LAr MET ROB access will be done." << endreq; + logStream() << MSG::INFO << " ---> The list of LAr MET ROBs has size = 0. No LAr MET ROB access will be done." << endmsg; } else { if (m_readROBfromOKS.value() && robLArMetOKSconfigFound) { logStream() << MSG::INFO << " ---> The list of LAr MET ROBs has size = " << m_enabledLArMetROBs.value().size() - << ". It was read from the partition database." << endreq; + << ". It was read from the partition database." << endmsg; } else { logStream() << MSG::INFO << " ---> The list of LAr MET ROBs has size = " << m_enabledLArMetROBs.value().size() - << ". It was read from job options." << endreq; + << ". It was read from job options." << endmsg; } } - logStream() << MSG::INFO << " ---> Generic Module ID for Tile MET ROB = " << m_genericTileMetModuleID << endreq; + logStream() << MSG::INFO << " ---> Generic Module ID for Tile MET ROB = " << m_genericTileMetModuleID << endmsg; if (m_enabledTileMetROBs.value().size() == 0) { - logStream() << MSG::INFO << " ---> The list of Tile MET ROBs has size = 0. No Tile MET ROB access will be done." << endreq; + logStream() << MSG::INFO << " ---> The list of Tile MET ROBs has size = 0. No Tile MET ROB access will be done." << endmsg; } else { if (m_readROBfromOKS.value() && robTileMetOKSconfigFound) { logStream() << MSG::INFO << " ---> The list of Tile MET ROBs has size = " << m_enabledTileMetROBs.value().size() - << ". It was read from the partition database." << endreq; + << ". It was read from the partition database." << endmsg; } else { logStream() << MSG::INFO << " ---> The list of Tile MET ROBs has size = " << m_enabledTileMetROBs.value().size() - << ". It was read from job options." << endreq; + << ". It was read from job options." << endmsg; } } - logStream() << MSG::INFO << " ---> Separate MET and Det ROB Retrieval = " << m_separateMETandDetROBRetrieval << endreq; + logStream() << MSG::INFO << " ---> Separate MET and Det ROB Retrieval = " << m_separateMETandDetROBRetrieval << endmsg; if (m_rob_ros_map.value().size() == 0) { - logStream() << MSG::INFO << " ---> The mapping of ROBs to ROSes has size = 0. No ROB/ROS mapping will be used for ROB prefetching." << endreq; + logStream() << MSG::INFO << " ---> The mapping of ROBs to ROSes has size = 0. No ROB/ROS mapping will be used for ROB prefetching." << endmsg; m_useROSmappingForROBRetrieval = false; // reset the job property } else { if (m_readROBfromOKS.value() && robRosOKSconfigFound) { logStream() << MSG::INFO << " ---> The ROB/ROS mapping has size = " << m_rob_ros_map.value().size() - << ". It was read from the partition database." << endreq; + << ". It was read from the partition database." << endmsg; } else { logStream() << MSG::INFO << " ---> The ROB/ROS mapping has size = " << m_rob_ros_map.value().size() - << ". It was read from job options." << endreq; + << ". It was read from job options." << endmsg; } } - logStream() << MSG::INFO << " ---> Use ROB/ROS mapping for ROB prefetching/retrieval = " << m_useROSmappingForROBRetrieval << endreq; + logStream() << MSG::INFO << " ---> Use ROB/ROS mapping for ROB prefetching/retrieval = " << m_useROSmappingForROBRetrieval << endmsg; if (m_ignoreROB.value().size() == 0) { - logStream() << MSG::INFO << " ---> The list of ROBs to ignore has size = 0. No check will be performed " << endreq; + logStream() << MSG::INFO << " ---> The list of ROBs to ignore has size = 0. No check will be performed " << endmsg; } else { - logStream() << MSG::INFO << " ---> The list of ROBs to ignore has size = " << m_ignoreROB.value().size() << endreq; + logStream() << MSG::INFO << " ---> The list of ROBs to ignore has size = " << m_ignoreROB.value().size() << endmsg; } for (unsigned int i=0; i<m_ignoreROB.value().size(); i++) { logStream() << MSG::INFO << " ---> do not retrieve ROB[" << i << "]: hex(id)=0x" << MSG::hex << m_ignoreROB.value()[i]<<MSG::dec - << " dec(id)="<< m_ignoreROB.value()[i] << endreq; + << " dec(id)="<< m_ignoreROB.value()[i] << endmsg; } - logStream() << MSG::INFO << " ---> Simulate online ROB data access (Network access) = " << m_simulateOnlineDataAccess << endreq; + logStream() << MSG::INFO << " ---> Simulate online ROB data access (Network access) = " << m_simulateOnlineDataAccess << endmsg; if (m_simulateOnlineDataAccess.value() && !m_useROSmappingForROBRetrieval.value()) { - logStream() << MSG::ERROR << " +-----------------------------------------------------------------------------------------------+ " << endreq; - logStream() << MSG::ERROR << " | Simulate online data access is switched on but no ROB-ROS mapping is provided. | " << endreq; - logStream() << MSG::ERROR << " | Online simulation is not meainigful in this case. | " << endreq; - logStream() << MSG::ERROR << " | Set 'UseROSmappingForROBRetrieval' to True and provide a ROB-ROS mapping with 'RobRosMapping' | " << endreq; - logStream() << MSG::ERROR << " | A simple ROB-ROS mapping can be generated from the Bytestream input file with the scipt | " << endreq; - logStream() << MSG::ERROR << " | 'generate-rob-ros-map-from-data.py' in the TrigROBDataProviderSvc package. | " << endreq; - logStream() << MSG::ERROR << " +-----------------------------------------------------------------------------------------------+ " << endreq; + logStream() << MSG::ERROR << " +-----------------------------------------------------------------------------------------------+ " << endmsg; + logStream() << MSG::ERROR << " | Simulate online data access is switched on but no ROB-ROS mapping is provided. | " << endmsg; + logStream() << MSG::ERROR << " | Online simulation is not meainigful in this case. | " << endmsg; + logStream() << MSG::ERROR << " | Set 'UseROSmappingForROBRetrieval' to True and provide a ROB-ROS mapping with 'RobRosMapping' | " << endmsg; + logStream() << MSG::ERROR << " | A simple ROB-ROS mapping can be generated from the Bytestream input file with the scipt | " << endmsg; + logStream() << MSG::ERROR << " | 'generate-rob-ros-map-from-data.py' in the TrigROBDataProviderSvc package. | " << endmsg; + logStream() << MSG::ERROR << " +-----------------------------------------------------------------------------------------------+ " << endmsg; return StatusCode::FAILURE; } - logStream() << MSG::INFO << " ---> Print Stack Trace for failed ROB access (DEBUG) = " << m_printStackTraceGetROBData << endreq; + logStream() << MSG::INFO << " ---> Print Stack Trace for failed ROB access (DEBUG) = " << m_printStackTraceGetROBData << endmsg; // register incident handler for begin run ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", name()); if ((incidentSvc.retrieve()).isFailure()) { - logStream() << MSG::ERROR << "Unable to locate IncidentSvc" << endreq; + logStream() << MSG::ERROR << "Unable to locate IncidentSvc" << endmsg; incidentSvc.release().ignore(); return StatusCode::FAILURE; } @@ -389,9 +389,9 @@ StatusCode TrigROBDataProviderSvc::initialize() StatusCode TrigROBDataProviderSvc::finalize() { StatusCode sc = ROBDataProviderSvc::finalize(); - logStream() << MSG::DEBUG << "finalize()" << endreq; + logStream() << MSG::DEBUG << "finalize()" << endmsg; if ( !sc.isSuccess() ) { - logStream() << MSG::ERROR << " ROBDataProviderSvc::finalize() failed." << endreq; + logStream() << MSG::ERROR << " ROBDataProviderSvc::finalize() failed." << endmsg; } // delete message stream @@ -488,14 +488,14 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if ( p_robMonCollection ) { p_robMonCollection->reserve( 10 ) ; if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) { - logStream() << MSG::WARNING << " Registering ROB Monitoring collection in StoreGate failed." << endreq; + logStream() << MSG::WARNING << " Registering ROB Monitoring collection in StoreGate failed." << endmsg; delete p_robMonCollection; p_robMonCollection = 0; } } } else { if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) { - logStream() << MSG::WARNING << " Retrieval of ROB Monitoring collection from StoreGate failed." << endreq; + logStream() << MSG::WARNING << " Retrieval of ROB Monitoring collection from StoreGate failed." << endmsg; p_robMonCollection = 0; } } @@ -516,7 +516,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con // find missing ROB ids which should be retrieved if(logLevel() <= MSG::DEBUG) - logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": Number of ROB Ids requested : " << robIdsUnique.size() << endreq; + logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": Number of ROB Ids requested : " << robIdsUnique.size() << endmsg; for(std::vector<uint32_t>::const_iterator it=robIdsUnique.begin(); it!=robIdsUnique.end(); ++it){ uint32_t id = (*it); @@ -538,7 +538,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if(map_it != m_online_robmap.end()) { if(logLevel() <= MSG::DEBUG) logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": Found ROB Id : 0x" << MSG::hex << (*map_it).second.source_id() << MSG::dec - <<" in cache "<< endreq; + <<" in cache "<< endmsg; //* detailed monitoring if ( p_robMonStruct ) { (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::CACHED; @@ -561,7 +561,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if(rob_ignore_it != m_ignoreROB.value().end()) { if(logLevel() <= MSG::DEBUG) logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": ROB Id : 0x" << MSG::hex << id << MSG::dec - << " will be not retrieved, since it is on the veto list."<< endreq; + << " will be not retrieved, since it is on the veto list."<< endmsg; //* detailed monitoring if ( p_robMonStruct ) { (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::IGNORED; @@ -580,7 +580,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if(rob_enabled_it == m_enabledROBs.value().end()) { if(logLevel() <= MSG::DEBUG) logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": ROB Id : 0x" << MSG::hex << id << MSG::dec - << " will be not retrieved, since it is not on the list of enabled ROBs."<< endreq; + << " will be not retrieved, since it is not on the list of enabled ROBs."<< endmsg; //* detailed monitoring if ( p_robMonStruct ) { (p_robMonStruct->requested_ROBs)[id].rob_history = robmonitor::DISABLED; @@ -594,7 +594,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if(rob_duplicate_it != vRobIds.end()) { if(logLevel() <= MSG::DEBUG) logStream() << MSG::DEBUG << " ---> addROBData for "<<m_callerName<<": ROB Id : 0x" << MSG::hex << id << MSG::dec - << " found multiple times on list. Only one copy will be retrieved."<< endreq; + << " found multiple times on list. Only one copy will be retrieved."<< endmsg; continue; } @@ -602,14 +602,14 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con if ( (m_useROSmappingForROBRetrieval.value()) && (m_rob_ros_map.value().find(id) == m_rob_ros_map.value().end()) ) { logStream() << MSG::WARNING << " ---> addROBData for "<<m_callerName<<": ROB Id : 0x" << MSG::hex << id << MSG::dec <<" is not found in the ROB-ROS mapping. ROB can not be scheduled for retrieval. Check ROB-ROS mapping." - << endreq; + << endmsg; continue; } // the ROB should be retrieved from the ROS if (logLevel() <= MSG::VERBOSE) logStream() << MSG::VERBOSE << " ---> addROBData for "<<m_callerName<<": Request ROB Id : 0x" << MSG::hex << id << MSG::dec - <<" from ROS "<< endreq; + <<" from ROS "<< endmsg; vRobIds.push_back( *it ) ; if ( (m_useROSmappingForROBRetrieval.value()) && (m_Det_Robs_for_retrieval.find(id)==m_Det_Robs_for_retrieval.end()) ) { m_Det_Robs_for_retrieval[ *it ] = m_rob_ros_map.value().find(id)->second ; @@ -624,7 +624,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con << " or all requested ROBs were not retrieved due to the veto list.\n" << " Number of requested ROB Ids = " << robIdsUnique.size() << "\n" << " Lvl1 id = " << m_currentLvl1ID - << endreq; + << endmsg; // Set ROB request time also in the case when no DataCollector request is necessary // to allow correlation with RoI request times // start and stop times will be equal @@ -670,7 +670,7 @@ void TrigROBDataProviderSvc::addROBData(const std::vector<uint32_t>& robIds, con << " ---> addROBData for "<<m_callerName<<": A ROB/ROS mapping is available the following ROB Ids are scheduled for retrieval in getROBData: \n" << " Lvl1 id = " << m_currentLvl1ID << "\n" << ost.str() - << endreq; + << endmsg; } } // end if (!m_useROSmappingForROBRetrieval.value()) } @@ -704,7 +704,7 @@ void TrigROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result) if ( result.size() == 0 ) { logStream()<<MSG::ERROR<< " ---> setNextEvent online for "<< name() <<" failed: Size of received vector of ROB fragments = " << result.size() - <<endreq; + <<endmsg; return; } @@ -722,14 +722,14 @@ void TrigROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result) logStream() << MSG::ERROR << " ---> Lvl1 ID mismatch for CTP fragment with SourceId = 0x" << MSG::hex << id << MSG::dec << " and L1 Id = " << it_robf->rod_lvl1_id() << " to currently used L1 Id = " << m_currentLvl1ID - << " -> Use CTP version from now on."<< endreq; + << " -> Use CTP version from now on."<< endmsg; m_currentLvl1ID = it_robf->rod_lvl1_id() ; } // remove empty ROB fragments or ones with bad status, if requested if ((it_robf->rod_ndata() == 0) && (m_removeEmptyROB)) { if(logLevel() <= MSG::DEBUG) { logStream() << MSG::DEBUG << " ---> Empty ROB Id = 0x" << MSG::hex << id << MSG::dec - << " removed for L1 Id = " << m_currentLvl1ID << endreq; + << " removed for L1 Id = " << m_currentLvl1ID << endmsg; } } else if ( ROBDataProviderSvc::filterRobWithStatus(&*it_robf) ) { if ((logLevel() <= MSG::DEBUG) && (it_robf->nstatus() > 0)) { @@ -741,7 +741,7 @@ void TrigROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result) << " with Generic Status Code = 0x" << std::setw(4) << tmpstatus.generic() << " and Specific Status Code = 0x" << std::setw(4) << tmpstatus.specific() << MSG::dec - << " removed for L1 Id = " << m_currentLvl1ID << endreq; + << " removed for L1 Id = " << m_currentLvl1ID << endmsg; } } else { // mask off the module ID for L2 and EF result for Run 1 data @@ -787,12 +787,12 @@ void TrigROBDataProviderSvc::setNextEvent(const std::vector<ROBF>& result) } if(logLevel() <= MSG::DEBUG) { - logStream()<<MSG::DEBUG<< " ---> setNextEvent online for "<< name()<<endreq; - logStream()<<MSG::DEBUG<< " online running = " << m_onlineRunning <<endreq; - logStream()<<MSG::DEBUG<< " current LVL1 id = " << m_currentLvl1ID <<endreq; - logStream()<<MSG::DEBUG<< " # LVL1 ROBs = " << result.size() <<endreq; - logStream()<<MSG::DEBUG<< " size of ROB cache = " << m_online_robmap.size() <<endreq; - logStream()<<MSG::DEBUG<< dumpROBcache() <<endreq; + logStream()<<MSG::DEBUG<< " ---> setNextEvent online for "<< name()<<endmsg; + logStream()<<MSG::DEBUG<< " online running = " << m_onlineRunning <<endmsg; + logStream()<<MSG::DEBUG<< " current LVL1 id = " << m_currentLvl1ID <<endmsg; + logStream()<<MSG::DEBUG<< " # LVL1 ROBs = " << result.size() <<endmsg; + logStream()<<MSG::DEBUG<< " size of ROB cache = " << m_online_robmap.size() <<endmsg; + logStream()<<MSG::DEBUG<< dumpROBcache() <<endmsg; } return; } @@ -916,14 +916,14 @@ void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std if ( p_robMonCollection ) { p_robMonCollection->reserve( 10 ) ; if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) { - logStream() << MSG::WARNING << " getROBData: Registering ROB Monitoring collection in StoreGate failed." << endreq; + logStream() << MSG::WARNING << " getROBData: Registering ROB Monitoring collection in StoreGate failed." << endmsg; delete p_robMonCollection; p_robMonCollection = 0; } } } else { if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) { - logStream() << MSG::WARNING << " getROBData: Retrieval of ROB Monitoring collection from StoreGate failed." << endreq; + logStream() << MSG::WARNING << " getROBData: Retrieval of ROB Monitoring collection from StoreGate failed." << endmsg; p_robMonCollection = 0; } } @@ -983,13 +983,13 @@ void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std if(logLevel() <= MSG::WARNING) { logStream()<<MSG::WARNING<<" ---> getROBData: Failed to find ROB for id 0x" - <<MSG::hex<< id <<MSG::dec<<endreq; + <<MSG::hex<< id <<MSG::dec<<endmsg; if (m_Det_Robs_for_retrieval.find(id)!=m_Det_Robs_for_retrieval.end()) { logStream()<<MSG::WARNING<<" getROBData: The ROB id 0x" - <<MSG::hex<< id <<MSG::dec<<" was put on the prefetching list, but never arrived on the processor."<<endreq; + <<MSG::hex<< id <<MSG::dec<<" was put on the prefetching list, but never arrived on the processor."<<endmsg; } else { logStream()<<MSG::WARNING<<" getROBData: The ROB id 0x" - <<MSG::hex<< id <<MSG::dec<<" was never put on the prefetching list."<<endreq; + <<MSG::hex<< id <<MSG::dec<<" was never put on the prefetching list."<<endmsg; } // caller name of this method @@ -997,7 +997,7 @@ void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std if ( m_algContextSvc ) { knownAlgs = m_algContextSvc->algorithms(); } - logStream()<<MSG::WARNING<<" getROBData was called by : " << m_callerName << endreq; + logStream()<<MSG::WARNING<<" getROBData was called by : " << m_callerName << endmsg; // Print all known algorithms if(logLevel() <= MSG::DEBUG) { logStream()<<MSG::DEBUG<<" getROBData known algorithms : \n" ; @@ -1006,7 +1006,7 @@ void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std logStream() << std::setw(2) << i << " : " << (*itr)->name() << "\n"; ++i; } - logStream()<<endreq; + logStream()<<endmsg; } // Optionally provide caller backtrace @@ -1020,12 +1020,12 @@ void TrigROBDataProviderSvc::getROBData(const std::vector<uint32_t>& robIds, std if (i==1) { logStream() << "-->" << std::setw(2) << i << " : " << symbols[i] << "\n"; } else { logStream() << std::setw(5) << i << " : " << symbols[i] << "\n"; } } - logStream() << endreq; + logStream() << endmsg; free(symbols); } // Print contents of ROB cache - if(logLevel() <= MSG::VERBOSE) { logStream()<<MSG::VERBOSE<< dumpROBcache() <<endreq; } + if(logLevel() <= MSG::VERBOSE) { logStream()<<MSG::VERBOSE<< dumpROBcache() <<endmsg; } } } } @@ -1114,14 +1114,14 @@ int TrigROBDataProviderSvc::collectCompleteEventData(const std::string callerNam if ( p_robMonCollection ) { p_robMonCollection->reserve( 10 ) ; if ( (m_storeGateSvc->record(p_robMonCollection, m_ROBDataMonitorCollection_SG_Name.value(), true)).isFailure() ) { - logStream() << MSG::WARNING << " Registering ROB Monitoring collection in StoreGate failed." << endreq; + logStream() << MSG::WARNING << " Registering ROB Monitoring collection in StoreGate failed." << endmsg; delete p_robMonCollection; p_robMonCollection = 0; } } } else { if ( m_storeGateSvc->retrieve(p_robMonCollection).isFailure() ) { - logStream() << MSG::WARNING << " Retrieval of ROB Monitoring collection from StoreGate failed." << endreq; + logStream() << MSG::WARNING << " Retrieval of ROB Monitoring collection from StoreGate failed." << endmsg; p_robMonCollection = 0; } } @@ -1177,14 +1177,14 @@ int TrigROBDataProviderSvc::collectCompleteEventData(const std::string callerNam << " ---> collectCompleteEventData: The following ROB Ids were received from DataCollector : \n" << " Lvl1 id = " << m_currentLvl1ID << "\n" << " Number of actually received ROB Ids = " << retrievedRobIds.size() - << endreq; + << endmsg; } if (logLevel() <= MSG::VERBOSE) { std::ostringstream ost; unsigned int rob_counter = 1; for (std::vector<uint32_t>::const_iterator rob_it = retrievedRobIds.begin(); rob_it != retrievedRobIds.end(); ++rob_it,++rob_counter) ost << " # = "<< std::setw(5) << rob_counter << " ROB id = 0x" << std::hex << *rob_it << std::dec << "\n" ; - logStream() << MSG::VERBOSE << "\n" << ost.str() << endreq; + logStream() << MSG::VERBOSE << "\n" << ost.str() << endmsg; } // update event complete flag @@ -1208,7 +1208,7 @@ void TrigROBDataProviderSvc::setCallerName(std::string callerName) } } m_callerName=caller_name; - // logStream() << MSG::DEBUG << "TrigROBDataProviderSvc::setCallerName : " << m_callerName <<endreq; + // logStream() << MSG::DEBUG << "TrigROBDataProviderSvc::setCallerName : " << m_callerName <<endmsg; return; } @@ -1217,14 +1217,14 @@ void TrigROBDataProviderSvc::setCallerName(std::string callerName) void TrigROBDataProviderSvc::handle(const Incident& incident) { if (incident.type()!="BeginRun") return; if(logLevel() <= MSG::DEBUG) - logStream() <<MSG::DEBUG << "In BeginRun incident." << endreq; + logStream() <<MSG::DEBUG << "In BeginRun incident." << endmsg; // if detailed ROB monitoring is requested, check if the AlgContextSvc is running, // if yes use it to obtain the calling algorithm name if ( m_doDetailedROBMonitoring.value() ) { if ( service("AlgContextSvc", m_algContextSvc, /*createIf=*/ false).isFailure() ) { logStream() << MSG::ERROR << "Error retrieving AlgContextSvc." - << "Calling algorithm name not available in detailed ROB monitoring" << endreq; + << "Calling algorithm name not available in detailed ROB monitoring" << endmsg; m_algContextSvc=0; } } @@ -1235,7 +1235,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { // find histogramming service ServiceHandle<ITHistSvc> rootHistSvc("THistSvc", name()); if ((rootHistSvc.retrieve()).isFailure()) { - logStream() << MSG::ERROR << "Unable to locate THistSvc" << endreq; + logStream() << MSG::ERROR << "Unable to locate THistSvc" << endmsg; rootHistSvc.release().ignore(); return; } @@ -1255,7 +1255,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { if (m_hist_requestedROBsPerCall) { CAN_REBIN(m_hist_requestedROBsPerCall); if( rootHistSvc->regHist(path + m_hist_requestedROBsPerCall->GetName(), m_hist_requestedROBsPerCall).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerCall->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerCall->GetName() << endmsg; } } @@ -1268,7 +1268,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { if (m_hist_receivedROBsPerCall) { CAN_REBIN(m_hist_receivedROBsPerCall); if( rootHistSvc->regHist(path + m_hist_receivedROBsPerCall->GetName(), m_hist_receivedROBsPerCall).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_receivedROBsPerCall->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_receivedROBsPerCall->GetName() << endmsg; } } @@ -1281,7 +1281,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { if (m_hist_timeROBretrieval) { CAN_REBIN(m_hist_timeROBretrieval); if( rootHistSvc->regHist(path + m_hist_timeROBretrieval->GetName(), m_hist_timeROBretrieval).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_timeROBretrieval->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_timeROBretrieval->GetName() << endmsg; } } @@ -1294,7 +1294,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { if (m_hist_retrievedROBsPerAlgo) { CAN_REBIN(m_hist_retrievedROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_retrievedROBsPerAlgo->GetName(), m_hist_retrievedROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_retrievedROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_retrievedROBsPerAlgo->GetName() << endmsg; } } @@ -1317,7 +1317,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { CAN_REBIN(m_hist_ROSRequest); if( rootHistSvc->regHist(path + m_hist_ROSRequest->GetName(), m_hist_ROSRequest).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_ROSRequest->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_ROSRequest->GetName() << endmsg; } } @@ -1341,7 +1341,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { n_tmp_bin++; } if( rootHistSvc->regHist(path + m_hist_genericStatusForROB->GetName(), m_hist_genericStatusForROB).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_genericStatusForROB->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_genericStatusForROB->GetName() << endmsg; } } @@ -1364,7 +1364,7 @@ void TrigROBDataProviderSvc::handle(const Incident& incident) { n_tmp_bin++; } if( rootHistSvc->regHist(path + m_hist_specificStatusForROB->GetName(), m_hist_specificStatusForROB).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_specificStatusForROB->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_specificStatusForROB->GetName() << endmsg; } } @@ -1384,7 +1384,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR if(logLevel() <= MSG::DEBUG) logStream() << MSG::DEBUG << " ---> addROBDataToCache for "<<m_callerName<<": Number of ROB Ids requested for retrieval : " << robIdsForRetrieval.size() - << ", Lvl1 id = " << m_currentLvl1ID << endreq; + << ", Lvl1 id = " << m_currentLvl1ID << endmsg; // return if no ROBs are requested if (robIdsForRetrieval.size() == 0) return; @@ -1426,7 +1426,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR ) { if (std::find(vRobIds.begin(), vRobIds.end(), id) == vRobIds.end()) { logStream() << MSG::ERROR << " ---> addROBDataToCache for "<<m_callerName<<": Received ROB Id : 0x" << MSG::hex << id << MSG::dec - <<" from ROS is not on the list of requested ROB Ids."<< endreq; + <<" from ROS is not on the list of requested ROB Ids."<< endmsg; } } } @@ -1448,7 +1448,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR ) { if (std::find(vMETRobIds.begin(), vMETRobIds.end(), id) == vMETRobIds.end()) { logStream() << MSG::ERROR << " ---> addROBDataToCache for "<<m_callerName<<": Received MET ROB Id : 0x" << MSG::hex << id << MSG::dec - <<" from ROS is not on the list of requested ROB Ids."<< endreq; + <<" from ROS is not on the list of requested ROB Ids."<< endmsg; } } } @@ -1469,7 +1469,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR << " Number of MET ROB Ids requested for retrieval = " << vMETRobIds.size() << "\n" << " Number of actually received ROB Ids = " << retrievedRobIds.size() << "\n" << ost.str() - << endreq; + << endmsg; } if ( m_doMonitoring || p_robMonStruct ) { @@ -1524,7 +1524,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR if (((*it_robf)->rod_ndata() == 0) && (m_removeEmptyROB)) { if(logLevel() <= MSG::DEBUG) { logStream() << MSG::DEBUG << " ---> addROBDataToCache for "<<m_callerName<<": Empty ROB Id = 0x" << MSG::hex << id << MSG::dec - << " removed for L1 Id = " << m_currentLvl1ID << endreq; + << " removed for L1 Id = " << m_currentLvl1ID << endmsg; } } else if ( ROBDataProviderSvc::filterRobWithStatus(&*(*it_robf)) ) { if ((logLevel() <= MSG::DEBUG) && ((*it_robf)->nstatus() > 0)) { @@ -1536,7 +1536,7 @@ void TrigROBDataProviderSvc::addROBDataToCache(std::vector<uint32_t>& robIdsForR << " with Generic Status Code = 0x" << std::setw(4) << tmpstatus.generic() << " and Specific Status Code = 0x" << std::setw(4) << tmpstatus.specific() << MSG::dec - << " removed for L1 Id = " << m_currentLvl1ID << endreq; + << " removed for L1 Id = " << m_currentLvl1ID << endmsg; } } else { // mask off the module ID for L2 and EF result for Run 1 data diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx index 18532b94941..8ba1e9172fb 100644 --- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx +++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/src/TrigROBDataProviderSvc_RTT.cxx @@ -113,7 +113,7 @@ StatusCode TrigROBDataProviderSvc_RTT::initialize() StatusCode sc = TrigROBDataProviderSvc::initialize(); logStream() << MSG::INFO << " ---> TrigROBDataProviderSvc_RTT = " << name() << " initialize " - << " - package version " << PACKAGE_VERSION << endreq ; + << " - package version " << PACKAGE_VERSION << endmsg ; return sc; } @@ -145,8 +145,8 @@ std::ostream& operator << (std::ostream& os, const TrigROBDataProviderSvc_RTT& c void TrigROBDataProviderSvc_RTT::setNextEvent(const std::vector<ROBF>& result) { TrigROBDataProviderSvc::setNextEvent(result) ; - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::setNextEvent map size is " << m_caller_robmap.size() <<". Now reset it"<< endreq; - logStream() << MSG::DEBUG << *this << endreq;// print out the content of the map + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::setNextEvent map size is " << m_caller_robmap.size() <<". Now reset it"<< endmsg; + logStream() << MSG::DEBUG << *this << endmsg;// print out the content of the map FillEvent(); m_caller_robmap.clear(); m_callerName = "UNKNOWN"; @@ -157,8 +157,8 @@ void TrigROBDataProviderSvc_RTT::setNextEvent(const std::vector<ROBF>& result) void TrigROBDataProviderSvc_RTT::setNextEvent(const RawEvent* re) { TrigROBDataProviderSvc::setNextEvent(re) ; - logStream() << MSG::DEBUG << "TrigROBDataProviderSvc_RTT::setNextEvent map size is " << m_caller_robmap.size() <<". Now reset it"<<endreq; - logStream() << MSG::DEBUG << *this << endreq; // print out the content of the map + logStream() << MSG::DEBUG << "TrigROBDataProviderSvc_RTT::setNextEvent map size is " << m_caller_robmap.size() <<". Now reset it"<<endmsg; + logStream() << MSG::DEBUG << *this << endmsg; // print out the content of the map FillEvent(); m_caller_robmap.clear(); m_callerName = "UNKNOWN"; @@ -252,7 +252,7 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, if (foundL1 !=0) - logStream() << MSG::WARNING <<"TrigROBDataProviderSvc_RTT::getROBData. Algo " <<m_callerName<<" called some L1 ROBIds. Is this an error?" <<endreq; + logStream() << MSG::WARNING <<"TrigROBDataProviderSvc_RTT::getROBData. Algo " <<m_callerName<<" called some L1 ROBIds. Is this an error?" <<endmsg; // monitor the requested ROBs if ( m_hist_requestedROBsPerAlgo ) { @@ -286,7 +286,7 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, logStream() << MSG::DEBUG << "TrigROBDataProviderSvc_RTT::getROBData. ROBs of algo "<<m_callerName<<": requested "<< robIds.size() <<" ROBIDs " <<". Found " << ( (m_caller_robmap.count(pref_name)>0) ? (m_caller_robmap.find(pref_name)->second).size() : 0 ) - <<" pre-fetched, "<< ( (m_caller_robmap.count(m_callerName)>0)? (m_caller_robmap.find(m_callerName)->second).size(): 0) << " pre-declared" << endreq; + <<" pre-fetched, "<< ( (m_caller_robmap.count(m_callerName)>0)? (m_caller_robmap.find(m_callerName)->second).size(): 0) << " pre-declared" << endmsg; bool found = false; @@ -370,24 +370,24 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, if ((found_another_pref) && (m_callerName != prefetching_caller)){ missingRequestedROBsPerCallButCached_pref++;// count the missing ROBs in this call during the pre-fetching, but data are cached by other algorithm - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared in the PRE-FETCHING, but pre-declared by different algorithm " << prefetching_caller << std::dec << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared in the PRE-FETCHING, but pre-declared by different algorithm " << prefetching_caller << std::dec << endmsg; } else {// this is the error // count the missing ROBs in this call during the pre-fetching, not cached or cached by this algo (meaning that the algo retrieved data without prefcthing) not_prefetched_robIds.push_back(*it); missingRequestedROBsPerCall_pref++; - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: RTTerrors algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared in the PRE-FETCHING!"<< std::dec << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: RTTerrors algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared in the PRE-FETCHING!"<< std::dec << endmsg; } // check if the same algo prefetcehd any ROBIds if (m_caller_robmap.count(pref_name) != 0 ) { // print the already declared ROBSId by this algo - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" predeclared in pre-fetching these ROBIds:" << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" predeclared in pre-fetching these ROBIds:" << endmsg; for (CALLER_ROBMAP::iterator iit=algo_rob_pref_it.first; iit!=algo_rob_pref_it.second; ++iit){//loop over the calls of this algo requested_pref_robIds = iit->second; for(std::vector<uint32_t>::const_iterator rit = requested_pref_robIds.begin(); rit != requested_pref_robIds.end(); ++rit){ logStream() << MSG::DEBUG << (*rit) <<", "; } - logStream() << MSG::DEBUG << endreq; + logStream() << MSG::DEBUG << endmsg; } } } @@ -407,27 +407,27 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, if (!found && !found_pref){ if (found_cached && ( m_callerName != cached_caller)){ missingRequestedROBsPerCallButCached++; - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared, but cached by different algorithm " << cached_caller << std::dec << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared, but cached by different algorithm " << cached_caller << std::dec << endmsg; } else { not_predeclared_robIds.push_back(*it); missingRequestedROBsPerCall++; // count the missing ROBs in this call, not cached or cached by the same algo if (found_cached && ( m_callerName == cached_caller)){ - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared, but cached " << std::dec << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " was NOT predeclared, but cached " << std::dec << endmsg; } else { - logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " NOT predeclared (and not cached)!"<< std::dec << endreq; + logStream() << MSG::DEBUG <<"TrigROBDataProviderSvc_RTT::getROBData: algo "<< m_callerName <<" ROB id 0x" << std::hex << (*it) << " NOT predeclared (and not cached)!"<< std::dec << endmsg; } } if (m_caller_robmap.count(m_callerName) != 0 ) { // print the already declared ROBSId by this algo - logStream() << MSG::DEBUG <<"getROBData: algo "<< m_callerName <<" predeclared these ROBIds:" << endreq; + logStream() << MSG::DEBUG <<"getROBData: algo "<< m_callerName <<" predeclared these ROBIds:" << endmsg; for (CALLER_ROBMAP::iterator iit=algo_rob_it.first; iit!=algo_rob_it.second; ++iit){//loop over the calls of this algo requested_robIds = iit->second; for(std::vector<uint32_t>::const_iterator rit = requested_pref_robIds.begin(); rit != requested_pref_robIds.end(); ++rit){ logStream() << MSG::DEBUG << (*rit) <<", "; } - logStream() << MSG::DEBUG<< endreq; + logStream() << MSG::DEBUG<< endmsg; } } @@ -439,12 +439,12 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, if (missingRequestedROBsPerCall_pref>0){ logStream() << MSG::WARNING << "getROBData: ---> RTTerrors in the PRE-FETCHING: algo " << m_callerName << " missed to declare " << missingRequestedROBsPerCall_pref << " ROBs in this call, " - << missingRequestedROBsPerCallButCached_pref <<" ROBs are declared by other algorithm"<< endreq; + << missingRequestedROBsPerCallButCached_pref <<" ROBs are declared by other algorithm"<< endmsg; logStream() << MSG::DEBUG <<"getROBData: ---> in the PRE-FETCHING: These are the missing ROBS: "<< std::hex; for(std::vector<uint32_t>::const_iterator rit = not_prefetched_robIds.begin(); rit != not_prefetched_robIds.end(); ++rit){ logStream() << MSG::DEBUG << "0x" << (*rit) <<", "; } - logStream() << MSG::DEBUG << std::dec <<endreq; + logStream() << MSG::DEBUG << std::dec <<endmsg; } if ( m_hist_missingRequestedROBsPerCall_pref ) { @@ -482,12 +482,12 @@ void TrigROBDataProviderSvc_RTT::getROBData(const std::vector<uint32_t>& robIds, if (missingRequestedROBsPerCall>0) { logStream() << MSG::WARNING << "getROBData: ---> RTTerrors in the EXECUTION: algo " << m_callerName << " missed to declare " << missingRequestedROBsPerCall << " ROBs in this call , " - << missingRequestedROBsPerCallButCached <<" ROBs are not declared, but cached by other algorithm "<< endreq; + << missingRequestedROBsPerCallButCached <<" ROBs are not declared, but cached by other algorithm "<< endmsg; logStream() << MSG::DEBUG <<"getROBData: ---> in the EXECUTION: These are the missing ROBS: "<< std::hex; for(std::vector<uint32_t>::const_iterator rit = not_predeclared_robIds.begin(); rit != not_predeclared_robIds.end(); ++rit){ logStream() << MSG::DEBUG << "0x"<<(*rit) <<", "; } - logStream() << MSG::DEBUG <<std::dec <<endreq; + logStream() << MSG::DEBUG <<std::dec <<endmsg; } if ( m_hist_missingRequestedROBsPerCall ) { m_hist_missingRequestedROBsPerCall->Fill(missingRequestedROBsPerCall); @@ -535,14 +535,14 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (incident.type()!="BeginRun") return; if(logLevel() <= MSG::DEBUG) - logStream() <<MSG::DEBUG << "In BeginRun incident." << endreq; + logStream() <<MSG::DEBUG << "In BeginRun incident." << endmsg; // if detailed ROB monitoring is requested, check if the AlgContextSvc is running, // if yes use it to obtain the calling algorithm name if ( m_doDetailedROBMonitoring.value() ) { if ( service("AlgContextSvc", m_algContextSvc, /*createIf=*/ false).isFailure() ) { logStream() << MSG::ERROR << "Error retrieving AlgContextSvc." - << "Calling algorithm name not available in detailed ROB monitoring" << endreq; + << "Calling algorithm name not available in detailed ROB monitoring" << endmsg; m_algContextSvc=0; } } @@ -553,7 +553,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) // find histogramming service ServiceHandle<ITHistSvc> rootHistSvc("THistSvc", name()); if ((rootHistSvc.retrieve()).isFailure()) { - logStream() << MSG::ERROR << "Unable to locate THistSvc" << endreq; + logStream() << MSG::ERROR << "Unable to locate THistSvc" << endmsg; rootHistSvc.release().ignore(); return; } @@ -570,7 +570,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestedROBsPerAlgo) { CAN_REBIN(m_hist_missingRequestedROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerAlgo->GetName(), m_hist_missingRequestedROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgo->GetName() << endmsg; } } @@ -583,7 +583,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestPerAlgo) { CAN_REBIN(m_hist_missingRequestPerAlgo); if( rootHistSvc->regHist(path + m_hist_missingRequestPerAlgo->GetName(), m_hist_missingRequestPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgo->GetName() << endmsg; } } @@ -596,7 +596,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) m_histProp_missingRequestedROBsPerCall.value().highEdge()); if (m_hist_missingRequestedROBsPerCall) { if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerCall->GetName(), m_hist_missingRequestedROBsPerCall).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCall->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCall->GetName() << endmsg; } } @@ -610,7 +610,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestedROBsPerAlgoButCached) { CAN_REBIN(m_hist_missingRequestedROBsPerAlgoButCached); if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerAlgoButCached->GetName(), m_hist_missingRequestedROBsPerAlgoButCached).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgoButCached->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgoButCached->GetName() << endmsg; } } @@ -623,7 +623,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestPerAlgoButCached) { CAN_REBIN(m_hist_missingRequestPerAlgoButCached); if( rootHistSvc->regHist(path + m_hist_missingRequestPerAlgoButCached->GetName(), m_hist_missingRequestPerAlgoButCached).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgoButCached->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgoButCached->GetName() << endmsg; } } @@ -636,7 +636,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) m_histProp_missingRequestedROBsPerCallButCached.value().highEdge()); if (m_hist_missingRequestedROBsPerCallButCached) { if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerCallButCached->GetName(), m_hist_missingRequestedROBsPerCallButCached).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCallButCached->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCallButCached->GetName() << endmsg; } } @@ -649,7 +649,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_requestPerAlgo) { CAN_REBIN(m_hist_requestPerAlgo); if( rootHistSvc->regHist(path + m_hist_requestPerAlgo->GetName(), m_hist_requestPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestPerAlgo->GetName() << endmsg; } } @@ -662,7 +662,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_callerPerEvent) { CAN_REBIN(m_hist_callerPerEvent); if( rootHistSvc->regHist(path + m_hist_callerPerEvent->GetName(), m_hist_callerPerEvent).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_callerPerEvent->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_callerPerEvent->GetName() << endmsg; } } @@ -675,7 +675,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_requestedROBsPerAlgo) { CAN_REBIN(m_hist_requestedROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_requestedROBsPerAlgo->GetName(), m_hist_requestedROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerAlgo->GetName() << endmsg; } } @@ -684,7 +684,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_requestedROBsPerCallPerAlgo) { CAN_REBIN(m_hist_requestedROBsPerCallPerAlgo); if( rootHistSvc->regHist(path + m_hist_requestedROBsPerCallPerAlgo->GetName(), m_hist_requestedROBsPerCallPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerCallPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_requestedROBsPerCallPerAlgo->GetName() << endmsg; } } @@ -697,7 +697,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_nocachedRequestPerAlgo) { CAN_REBIN(m_hist_nocachedRequestPerAlgo); if( rootHistSvc->regHist(path + m_hist_nocachedRequestPerAlgo->GetName(), m_hist_nocachedRequestPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_nocachedRequestPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_nocachedRequestPerAlgo->GetName() << endmsg; } } @@ -710,7 +710,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_nocachedRequestedROBsPerAlgo) { CAN_REBIN(m_hist_nocachedRequestedROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_nocachedRequestedROBsPerAlgo->GetName(), m_hist_nocachedRequestedROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_nocachedRequestedROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_nocachedRequestedROBsPerAlgo->GetName() << endmsg; } } @@ -724,7 +724,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestedROBsPerAlgo_pref) { CAN_REBIN(m_hist_missingRequestedROBsPerAlgo_pref); if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerAlgo_pref->GetName(), m_hist_missingRequestedROBsPerAlgo_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgo_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgo_pref->GetName() << endmsg; } } @@ -737,7 +737,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestPerAlgo_pref) { CAN_REBIN(m_hist_missingRequestPerAlgo_pref); if( rootHistSvc->regHist(path + m_hist_missingRequestPerAlgo_pref->GetName(), m_hist_missingRequestPerAlgo_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgo_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgo_pref->GetName() << endmsg; } } @@ -749,7 +749,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) m_histProp_missingRequestedROBsPerCall_pref.value().highEdge()); if (m_hist_missingRequestedROBsPerCall_pref) { if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerCall_pref->GetName(), m_hist_missingRequestedROBsPerCall_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCall_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCall_pref->GetName() << endmsg; } } @@ -762,7 +762,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestedROBsPerAlgoButCached_pref) { CAN_REBIN(m_hist_missingRequestedROBsPerAlgoButCached_pref); if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerAlgoButCached_pref->GetName(), m_hist_missingRequestedROBsPerAlgoButCached_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgoButCached_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerAlgoButCached_pref->GetName() << endmsg; } } @@ -775,7 +775,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_missingRequestPerAlgoButCached_pref) { CAN_REBIN(m_hist_missingRequestPerAlgoButCached_pref); if( rootHistSvc->regHist(path + m_hist_missingRequestPerAlgoButCached_pref->GetName(), m_hist_missingRequestPerAlgoButCached_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgoButCached_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestPerAlgoButCached_pref->GetName() << endmsg; } } @@ -787,7 +787,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) m_histProp_missingRequestedROBsPerCallButCached_pref.value().highEdge()); if (m_hist_missingRequestedROBsPerCallButCached_pref) { if( rootHistSvc->regHist(path + m_hist_missingRequestedROBsPerCallButCached_pref->GetName(), m_hist_missingRequestedROBsPerCallButCached_pref).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCallButCached_pref->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_missingRequestedROBsPerCallButCached_pref->GetName() << endmsg; } } @@ -802,7 +802,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_declaredROBsPerAlgo) { CAN_REBIN(m_hist_declaredROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_declaredROBsPerAlgo->GetName(), m_hist_declaredROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_declaredROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_declaredROBsPerAlgo->GetName() << endmsg; } } @@ -815,7 +815,7 @@ void TrigROBDataProviderSvc_RTT::handle(const Incident& incident) if (m_hist_prefetchedROBsPerAlgo) { CAN_REBIN(m_hist_prefetchedROBsPerAlgo); if( rootHistSvc->regHist(path + m_hist_prefetchedROBsPerAlgo->GetName(), m_hist_prefetchedROBsPerAlgo).isFailure() ) { - logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_prefetchedROBsPerAlgo->GetName() << endreq; + logStream() << MSG::WARNING << "Can not register monitoring histogram: " << m_hist_prefetchedROBsPerAlgo->GetName() << endmsg; } } diff --git a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBSExtraction.cxx b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBSExtraction.cxx index d3e5c99b897..fa4f56ee13b 100755 --- a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBSExtraction.cxx +++ b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBSExtraction.cxx @@ -146,10 +146,10 @@ bool TrigBSExtraction::repackFeature() { try { status = m_navigation->getAllFeatures(v); } catch ( const std::exception& ex) { - log << MSG::WARNING << "Unpacking of the features of type: " << ClassID_traits<T>::typeName() << " caused exception: " << ex.what() << endreq; + log << MSG::WARNING << "Unpacking of the features of type: " << ClassID_traits<T>::typeName() << " caused exception: " << ex.what() << endmsg; } if ( status != true ) - log << MSG::WARNING << "Unpacking of the features of type: " << ClassID_traits<T>::typeName() << " failed" << endreq; + log << MSG::WARNING << "Unpacking of the features of type: " << ClassID_traits<T>::typeName() << " failed" << endmsg; */ diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfAlgCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfAlgCnv_p1.cxx index a39fa68f9a6..0e971bd78c5 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfAlgCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfAlgCnv_p1.cxx @@ -16,7 +16,7 @@ void TrigConfAlgCnv_p1::persToTrans(const TrigConfAlg_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfAlgCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigConfAlgCnv_p1::persToTrans called " << endmsg; } transObj->m_index = persObj->m_index; @@ -33,7 +33,7 @@ void TrigConfAlgCnv_p1::transToPers(const TrigConfAlg* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfAlgCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigConfAlgCnv_p1::transToPers called " << endmsg; } persObj->m_index = transObj->m_index; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfChainCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfChainCnv_p1.cxx index f8ffdea44ca..df7fef91ca4 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfChainCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfChainCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigConfChainCnv_p1::persToTrans(const TrigConfChain_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfChainCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigConfChainCnv_p1::persToTrans called " << endmsg; } transObj->m_chain_name = persObj->m_chain_name; @@ -43,7 +43,7 @@ void TrigConfChainCnv_p1::transToPers(const TrigConfChain* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfChainCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigConfChainCnv_p1::transToPers called " << endmsg; } persObj->m_chain_name = transObj->m_chain_name; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSeqCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSeqCnv_p1.cxx index 2c290fec459..4c9f5e44909 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSeqCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSeqCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigConfSeqCnv_p1::persToTrans(const TrigConfSeq_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfSeqCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigConfSeqCnv_p1::persToTrans called " << endmsg; } transObj->m_output_te_name = persObj->m_output_te_name; @@ -35,7 +35,7 @@ void TrigConfSeqCnv_p1::transToPers(const TrigConfSeq* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfSeqCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigConfSeqCnv_p1::transToPers called " << endmsg; } persObj->m_output_te_name = transObj->m_output_te_name; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSigCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSigCnv_p1.cxx index cb69ba49aa1..832ea0346fc 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSigCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigConfSigCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigConfSigCnv_p1::persToTrans(const TrigConfSig_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfSigCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigConfSigCnv_p1::persToTrans called " << endmsg; } transObj->m_counter = persObj->m_counter; @@ -32,7 +32,7 @@ void TrigConfSigCnv_p1::transToPers(const TrigConfSig* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigConfSigCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigConfSigCnv_p1::transToPers called " << endmsg; } persObj->m_counter = transObj->m_counter; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonAlgCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonAlgCnv_p1.cxx index 7737deb5a34..6f851c19612 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonAlgCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonAlgCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonAlgCnv_p1::persToTrans(const TrigMonAlg_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonAlgCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonAlgCnv_p1::persToTrans called " << endmsg; } transObj->m_byte = persObj->m_byte; @@ -30,7 +30,7 @@ void TrigMonAlgCnv_p1::transToPers(const TrigMonAlg* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonAlgCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonAlgCnv_p1::transToPers called " << endmsg; } persObj->m_byte = transObj->m_byte; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonConfigCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonConfigCnv_p1.cxx index 2f93010a177..ac8005c9cd5 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonConfigCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonConfigCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonConfigCnv_p1::persToTrans(const TrigMonConfig_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonConfigCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonConfigCnv_p1::persToTrans called " << endmsg; } transObj->m_event = persObj->m_event; @@ -43,7 +43,7 @@ void TrigMonConfigCnv_p1::transToPers(const TrigMonConfig* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonConfigCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonConfigCnv_p1::transToPers called " << endmsg; } persObj->m_event = transObj->m_event; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonEventCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonEventCnv_p1.cxx index 07a73690a1b..b7b0b90046c 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonEventCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonEventCnv_p1.cxx @@ -35,10 +35,10 @@ void TrigMonEventCnv_p1::persToTrans(const TrigMonEvent_p1* persObj, if(log.level() <= MSG::DEBUG) { log << MSG::DEBUG - << "TrigMonEventCnv_p1::persToTrans called - persistent to transient :" << endreq - << " event: " << transObj->m_event << " to " << persObj->m_event << endreq - << " lumi: " << transObj->m_lumi << " to " << persObj->m_lumi << endreq - << " run: " << transObj->m_run << " to " << persObj->m_run << endreq; + << "TrigMonEventCnv_p1::persToTrans called - persistent to transient :" << endmsg + << " event: " << transObj->m_event << " to " << persObj->m_event << endmsg + << " lumi: " << transObj->m_lumi << " to " << persObj->m_lumi << endmsg + << " run: " << transObj->m_run << " to " << persObj->m_run << endmsg; } } @@ -66,9 +66,9 @@ void TrigMonEventCnv_p1::transToPers(const TrigMonEvent* transObj, if(log.level() <= MSG::DEBUG) { log << MSG::DEBUG - << "TrigMonEventCnv_p1::transToPers called - persistent to transient:" << endreq - << " event: " << persObj->m_event << " to " << transObj->m_event << endreq - << " lumi: " << persObj->m_lumi << " to " << transObj->m_lumi << endreq - << " run: " << persObj->m_run << " to " << transObj->m_run << endreq; + << "TrigMonEventCnv_p1::transToPers called - persistent to transient:" << endmsg + << " event: " << persObj->m_event << " to " << transObj->m_event << endmsg + << " lumi: " << persObj->m_lumi << " to " << transObj->m_lumi << endmsg + << " run: " << persObj->m_run << " to " << transObj->m_run << endmsg; } } diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBCnv_p1.cxx index 6f313cf12dc..0a1a5bd7356 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonROBCnv_p1::persToTrans(const TrigMonROB_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonROBCnv_p1::persToTrans called " << endmsg; } transObj->m_word = persObj->m_word; @@ -30,7 +30,7 @@ void TrigMonROBCnv_p1::transToPers(const TrigMonROB* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonROBCnv_p1::transToPers called " << endmsg; } persObj->m_word = transObj->m_word; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p1.cxx index 0af15e42c4c..1cf2f814b1a 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p1.cxx @@ -16,7 +16,7 @@ void TrigMonROBDataCnv_p1::persToTrans(const TrigMonROBData_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBDataCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonROBDataCnv_p1::persToTrans called " << endmsg; } transObj->m_rob_id = persObj->m_rob_id; @@ -29,7 +29,7 @@ void TrigMonROBDataCnv_p1::transToPers(const TrigMonROBData* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBDataCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonROBDataCnv_p1::transToPers called " << endmsg; } persObj->m_rob_id = transObj->m_rob_id; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p2.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p2.cxx index 735307ebb7b..92ecada3735 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p2.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonROBDataCnv_p2.cxx @@ -16,7 +16,7 @@ void TrigMonROBDataCnv_p2::persToTrans(const TrigMonROBData_p2* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBDataCnv_p2::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonROBDataCnv_p2::persToTrans called " << endmsg; } transObj->m_rob_id = persObj->m_rob_id; @@ -29,7 +29,7 @@ void TrigMonROBDataCnv_p2::transToPers(const TrigMonROBData* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonROBDataCnv_p2::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonROBDataCnv_p2::transToPers called " << endmsg; } persObj->m_rob_id = transObj->m_rob_id; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonRoiCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonRoiCnv_p1.cxx index d937afece11..af39cfb4b78 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonRoiCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonRoiCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonRoiCnv_p1::persToTrans(const TrigMonRoi_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonRoiCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonRoiCnv_p1::persToTrans called " << endmsg; } transObj->m_word = persObj->m_word; @@ -31,7 +31,7 @@ void TrigMonRoiCnv_p1::transToPers(const TrigMonRoi* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonRoiCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonRoiCnv_p1::transToPers called " << endmsg; } persObj->m_word = transObj->m_word; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonSeqCnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonSeqCnv_p1.cxx index 7b69713aa89..9aafbc5d073 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonSeqCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonSeqCnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonSeqCnv_p1::persToTrans(const TrigMonSeq_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonSeqCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonSeqCnv_p1::persToTrans called " << endmsg; } transObj->m_encoded = persObj->m_encoded; @@ -33,7 +33,7 @@ void TrigMonSeqCnv_p1::transToPers(const TrigMonSeq* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonSeqCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonSeqCnv_p1::transToPers called " << endmsg; } persObj->m_encoded = transObj->m_encoded; diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonTECnv_p1.cxx b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonTECnv_p1.cxx index 9d4cc452b17..2ab78eedb5f 100644 --- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonTECnv_p1.cxx +++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/src/TrigMonTECnv_p1.cxx @@ -17,7 +17,7 @@ void TrigMonTECnv_p1::persToTrans(const TrigMonTE_p1* persObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonTECnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigMonTECnv_p1::persToTrans called " << endmsg; } transObj->m_id = persObj->m_id; @@ -36,7 +36,7 @@ void TrigMonTECnv_p1::transToPers(const TrigMonTE* transObj, MsgStream &log) { if(log.level() <= MSG::DEBUG) { - log << MSG::DEBUG << "TrigMonTECnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigMonTECnv_p1::transToPers called " << endmsg; } persObj->m_id = transObj->m_id; diff --git a/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx b/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx index 12ab1cc4da6..39f63e655bd 100644 --- a/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx +++ b/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx @@ -799,7 +799,7 @@ bool TrigNavStructure::getFeatureAccessors( const TriggerElement* te, class_id_t bool singleTEstatus = getFeatureAccessorsSingleTE(te,clid,index_or_label,only_single_feature,features,with_cache_recording,source,sourcelabel); if(!singleTEstatus){ - // MLOG(WARNING) << "getFeatureAccessorsSingleTE() returned false" << endreq; + // MLOG(WARNING) << "getFeatureAccessorsSingleTE() returned false" << endmsg; } @@ -833,7 +833,7 @@ bool TrigNavStructure::getFeatureAccessors( const TriggerElement* te, class_id_t if ( only_single_feature && ( features.size() > 1 || recursion_status == false) ) { // MLOG(DEBUG) << "getFeatureAccessors: looking for object of CLID: " << clid - // << " label: \"" << label << "\"" << " found several objects matching criteria while can only return back one, this is ambiguous" << endreq; + // << " label: \"" << label << "\"" << " found several objects matching criteria while can only return back one, this is ambiguous" << endmsg; if ( getDirectPredecessors(te).size() > 1 ) // mark bifurcation point as to where one can start again source = te; diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx index 4b08ab5d3dd..6b2c7014ea0 100755 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/HLTResultCnv_p1.cxx @@ -12,7 +12,7 @@ void HLTResultCnv_p1::transToPers(const HLT::HLTResult* trans, HLTResult_p1* pers, MsgStream &log ) { - log << MSG::DEBUG << "HLTResultCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "HLTResultCnv_p1::transToPers called " << endmsg; pers->m_headerResult = trans->m_headerResult ; pers->m_chainsResult = trans->m_chainsResult ; @@ -24,7 +24,7 @@ void HLTResultCnv_p1::persToTrans(const HLT::HLTResult_p1* pers, HLTResult* trans, MsgStream &log ) { - log << MSG::DEBUG << "HLTResultCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "HLTResultCnv_p1::persToTrans called " << endmsg; trans->m_headerResult = pers->m_headerResult ; trans->m_chainsResult = pers->m_chainsResult ; diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p1.cxx index 78c8d952880..15b8bed95d2 100755 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p1.cxx @@ -12,7 +12,7 @@ void Lvl1ResultCnv_p1::transToPers(const LVL1CTP::Lvl1Result* trans, Lvl1Result_p1* pers, MsgStream &log ) { - log << MSG::DEBUG << "Lvl1ResultCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "Lvl1ResultCnv_p1::transToPers called " << endmsg; pers->m_configured = trans->isConfigured() ; // pers->m_l1_items = trans->m_l1_items ; @@ -24,7 +24,7 @@ void Lvl1ResultCnv_p1::persToTrans(const LVL1CTP::Lvl1Result_p1* pers, Lvl1Result* trans, MsgStream &log ) { - log << MSG::DEBUG << "Lvl1ResultCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "Lvl1ResultCnv_p1::persToTrans called " << endmsg; // this is for reading in old, ie Lvl1Result_p1 class, into the new transient class *trans = Lvl1Result (pers->m_configured); diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p2.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p2.cxx index 376f38eebe1..e2ae6b1e625 100755 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p2.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/Lvl1ResultCnv_p2.cxx @@ -12,7 +12,7 @@ void Lvl1ResultCnv_p2::transToPers(const LVL1CTP::Lvl1Result* trans, Lvl1Result_p2* pers, MsgStream &log ) { - log << MSG::DEBUG << "Lvl1ResultCnv_p2::transToPers called " << endreq; + log << MSG::DEBUG << "Lvl1ResultCnv_p2::transToPers called " << endmsg; pers->m_configured = trans->isConfigured(); pers->m_l1_itemsTBP = trans->itemsBeforePrescale(); @@ -25,7 +25,7 @@ void Lvl1ResultCnv_p2::persToTrans(const LVL1CTP::Lvl1Result_p2* pers, Lvl1Result* trans, MsgStream &log ) { - log << MSG::DEBUG << "Lvl1ResultCnv_p2::persToTrans called " << endreq; + log << MSG::DEBUG << "Lvl1ResultCnv_p2::persToTrans called " << endmsg; *trans = Lvl1Result (pers->m_configured); trans->itemsBeforePrescale() = pers->m_l1_itemsTBP; diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigOperationalInfoCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigOperationalInfoCnv_p1.cxx index 78c2a248975..68a3133106e 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigOperationalInfoCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigOperationalInfoCnv_p1.cxx @@ -12,7 +12,7 @@ void TrigOperationalInfoCnv_p1::persToTrans(const TrigOperationalInfo_p1* persOb TrigOperationalInfo* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrigOperationalInfoCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigOperationalInfoCnv_p1::persToTrans called " << endmsg; *transObj = TrigOperationalInfo (persObj->m_keys, persObj->m_values); } @@ -21,7 +21,7 @@ void TrigOperationalInfoCnv_p1::transToPers(const TrigOperationalInfo* transObj, TrigOperationalInfo_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrigOperationalInfoCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigOperationalInfoCnv_p1::transToPers called " << endmsg; auto infos = transObj->infos(); persObj->m_keys = std::move(infos.first); persObj->m_values = std::move(infos.second); diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassBitsCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassBitsCnv_p1.cxx index 492f5a7241a..4dd04334c79 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassBitsCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassBitsCnv_p1.cxx @@ -59,7 +59,7 @@ void TrigPassBitsCnv_p1::persToTrans(const TrigPassBits_p1* persObj, TrigPassBits* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrigPassBitsCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigPassBitsCnv_p1::persToTrans called " << endmsg; transObj->m_decisions.resize(persObj->m_size, false); // reserve space and set defaults to 0 @@ -72,7 +72,7 @@ void TrigPassBitsCnv_p1::transToPers(const TrigPassBits* transObj, TrigPassBits_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrigPassBitsCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigPassBitsCnv_p1::transToPers called " << endmsg; persObj->m_size = transObj->m_decisions.size(); persObj->m_serialized.resize(necessary_words(persObj->m_size), 0); // reserve the space and set the content to 0 diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassFlagsCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassFlagsCnv_p1.cxx index 0773af6d0c0..c8205a27e68 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassFlagsCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigPassFlagsCnv_p1.cxx @@ -15,7 +15,7 @@ void TrigPassFlagsCnv_p1::persToTrans(const TrigPassFlags_p1* persObj, { if(log.level()<=MSG::DEBUG) - log << MSG::DEBUG << "TrigPassFlagsCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigPassFlagsCnv_p1::persToTrans called " << endmsg; // reserve space in vector<vector<bool> > and set defaults to false transObj->m_flagsPerObject.clear(); @@ -64,7 +64,7 @@ void TrigPassFlagsCnv_p1::transToPers(const TrigPassFlags* transObj, MsgStream &log) { if(log.level()<=MSG::DEBUG) { - log << MSG::DEBUG << "TrigPassFlagsCnv_p1::transToPers called " << endreq; + log << MSG::DEBUG << "TrigPassFlagsCnv_p1::transToPers called " << endmsg; for(unsigned int i=0; i<transObj->size(); i++) { int flag = HLT::FlagAs<int>(transObj->getFlag(i)); log << " " << flag << " [0x" << std::hex << flag << "]" << std::dec << std::endl; @@ -78,13 +78,13 @@ void TrigPassFlagsCnv_p1::transToPers(const TrigPassFlags* transObj, if(persObj->m_nObjects > 0){ persObj->m_nFlags = transObj->m_flagsPerObject[0].size(); if(persObj->m_nFlags == 0){ - log << MSG::WARNING << "TrigPassFlagsCnv_p1::transToPers zero flags to save, this is an empty TrigPassFlags" << endreq; + log << MSG::WARNING << "TrigPassFlagsCnv_p1::transToPers zero flags to save, this is an empty TrigPassFlags" << endmsg; persObj->m_serialized.clear(); return; } } else{ - log << MSG::WARNING << "TrigPassFlagsCnv_p1::transToPers zero objects to save, this is an empty TrigPassFlags" << endreq; + log << MSG::WARNING << "TrigPassFlagsCnv_p1::transToPers zero objects to save, this is an empty TrigPassFlags" << endmsg; persObj->m_serialized.clear(); return; } diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p1.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p1.cxx index 85edb715699..250e07f4949 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p1.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p1.cxx @@ -14,7 +14,7 @@ void TrigRoiDescriptorCnv_p1::persToTrans(const TrigRoiDescriptor_p1* persObj, TrigRoiDescriptor* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p1::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p1::persToTrans called " << endmsg; double phi = persObj->m_phi0 ; double eta = persObj->m_eta0 ; @@ -40,8 +40,8 @@ void TrigRoiDescriptorCnv_p1::transToPers(const TrigRoiDescriptor* transObj, TrigRoiDescriptor_p1* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p1::transToPers called " << endreq; - // log << MSG::FATAL << "TrigRoiDescriptorCnv_p1::transToPers called - do not use this converter, use more recent converter" << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p1::transToPers called " << endmsg; + // log << MSG::FATAL << "TrigRoiDescriptorCnv_p1::transToPers called - do not use this converter, use more recent converter" << endmsg; persObj->m_phi0 = transObj->phi() ; persObj->m_eta0 = transObj->eta() ; diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p2.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p2.cxx index 633032f6e68..73b59ff4a26 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p2.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p2.cxx @@ -14,7 +14,7 @@ void TrigRoiDescriptorCnv_p2::persToTrans(const TrigRoiDescriptor_p2* persObj, TrigRoiDescriptor* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p2::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p2::persToTrans called " << endmsg; double phi = persObj->geom[PHI] ; double eta = persObj->geom[ETA] ; @@ -41,8 +41,8 @@ void TrigRoiDescriptorCnv_p2::transToPers(const TrigRoiDescriptor* transObj, TrigRoiDescriptor_p2* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p2::transToPers called " << endreq; - // log << MSG::FATAL << "TrigRoiDescriptorCnv_p1::transToPers called - do not use this converter, use more recent converter" << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p2::transToPers called " << endmsg; + // log << MSG::FATAL << "TrigRoiDescriptorCnv_p1::transToPers called - do not use this converter, use more recent converter" << endmsg; persObj->geom[PHI] = transObj->phi() ; persObj->geom[ETA] = transObj->eta() ; diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p3.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p3.cxx index 3d0ab680edd..6fb48df283b 100644 --- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p3.cxx +++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/src/TrigRoiDescriptorCnv_p3.cxx @@ -12,7 +12,7 @@ void TrigRoiDescriptorCnv_p3::persToTrans(const TrigRoiDescriptor_p3* persObj, TrigRoiDescriptor* transObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p3::persToTrans called " << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p3::persToTrans called " << endmsg; double phi = persObj->geom[PHI] ; double eta = persObj->geom[ETA] ; @@ -51,7 +51,7 @@ void TrigRoiDescriptorCnv_p3::transToPers(const TrigRoiDescriptor* transObj, TrigRoiDescriptor_p3* persObj, MsgStream &log) { - log << MSG::DEBUG << "TrigRoiDescriptorCnv_p3::transToPers called " << endreq; + log << MSG::DEBUG << "TrigRoiDescriptorCnv_p3::transToPers called " << endmsg; persObj->geom[PHI] = transObj->phi() ; persObj->geom[ETA] = transObj->eta() ; diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/FTKDump.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/FTKDump.cxx index f62e0ad59c9..9215fb8e256 100644 --- a/Trigger/TrigFTK/TrigFTKByteStream/src/FTKDump.cxx +++ b/Trigger/TrigFTK/TrigFTKByteStream/src/FTKDump.cxx @@ -29,7 +29,7 @@ StatusCode FTKDump::execute() { CHECK(evtStore()->retrieve(tracks_ptr, "dummy_tracks")); //ATH_MSG_INFO( "Got the tracks" ); - (*m_log) << MSG::INFO << "Got no of tracks: " << tracks_ptr->size() << endreq; + (*m_log) << MSG::INFO << "Got no of tracks: " << tracks_ptr->size() << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx index de395cb3c3d..9c6762578ef 100755 --- a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx +++ b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx @@ -56,38 +56,38 @@ StatusCode FTK::TrigFTKByteStreamCnv::initialize() } m_log = new MsgStream(messageService(), "TrigFTKByteStreamCnv"); - (*m_log) << MSG::DEBUG << "TrigFTKByteStreamCnv in initialize() " <<endreq; + (*m_log) << MSG::DEBUG << "TrigFTKByteStreamCnv in initialize() " <<endmsg; //Get ByteStreamCnvSvc if ( m_ByteStreamEventAccess.retrieve().isFailure() ) { (*m_log) << MSG::FATAL << "failed to retrieve ByteStreamEventAccess service: " - << m_ByteStreamEventAccess << endreq; + << m_ByteStreamEventAccess << endmsg; return StatusCode::FAILURE; } else { (*m_log) << MSG::DEBUG << "successfully retrieved ByteStreamEventAccess service: " - << m_ByteStreamEventAccess << endreq; + << m_ByteStreamEventAccess << endmsg; } // get the converter tool: if ( m_tool.retrieve().isFailure() ) { (*m_log) << MSG::FATAL << "failed to retrieve converter tool : " - << m_tool << endreq; + << m_tool << endmsg; return StatusCode::FAILURE; } else { (*m_log) << MSG::DEBUG << "successfully retrieved converter tool: " - << m_tool << endreq; + << m_tool << endmsg; } // Get ROBDataProvider if (m_robDataProvider.retrieve().isFailure()) { (*m_log) << MSG::FATAL << "failed to retrieve ROBDataProviderSvc service: " - << m_robDataProvider << endreq; + << m_robDataProvider << endmsg; return StatusCode::FAILURE; } (*m_log) << MSG::DEBUG << "successfully retrieved ROBDataProviderSvc service: " - << m_robDataProvider << endreq; + << m_robDataProvider << endmsg; return StatusCode::SUCCESS; } @@ -100,7 +100,7 @@ StatusCode FTK::TrigFTKByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObjec ByteStreamAddress *pBS_Addr; pBS_Addr = dynamic_cast<ByteStreamAddress*>(pAddr); if(!pBS_Addr) { - (*m_log) << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq ; + (*m_log) << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg ; return StatusCode::FAILURE; } @@ -111,7 +111,7 @@ StatusCode FTK::TrigFTKByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObjec StatusCode sc = m_tool->convert(*m_robDataProvider, result, object_name); //<Actual converstion if (sc != StatusCode::SUCCESS) { - (*m_log) << MSG::ERROR << "Failed to convert object " << object_name << endreq; + (*m_log) << MSG::ERROR << "Failed to convert object " << object_name << endmsg; return sc; } @@ -127,7 +127,7 @@ StatusCode FTK::TrigFTKByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress StoreGateSvc::fromStorable(pObj, result); if (!result) { - (*m_log) << MSG::ERROR << " Cannot cast to FTK_RawTrackContainer " << endreq ; + (*m_log) << MSG::ERROR << " Cannot cast to FTK_RawTrackContainer " << endmsg ; return StatusCode::FAILURE; } diff --git a/Trigger/TrigFTK/TrigFTKByteStream/test/FTKEncodeDecode_CppUnit.cxx b/Trigger/TrigFTK/TrigFTKByteStream/test/FTKEncodeDecode_CppUnit.cxx index 7762b91e10f..a2d7f26785a 100644 --- a/Trigger/TrigFTK/TrigFTKByteStream/test/FTKEncodeDecode_CppUnit.cxx +++ b/Trigger/TrigFTK/TrigFTKByteStream/test/FTKEncodeDecode_CppUnit.cxx @@ -91,13 +91,13 @@ public: for ( size_t i = 0 ; i < ntrk; ++i ) { cont.push_back(generateTrack()); } - log << MSG::DEBUG << "prepareed collection of size " << cont.size() << endreq; + log << MSG::DEBUG << "prepareed collection of size " << cont.size() << endmsg; std::vector<uint32_t> payload; { StatusCode sc = encode(&cont, payload, log); CPPUNIT_ASSERT( sc.isSuccess() ); } - log << MSG::DEBUG << "Serialized payload to size " << payload.size() << endreq; + log << MSG::DEBUG << "Serialized payload to size " << payload.size() << endmsg; // copy payload to plain array uint32_t * raw = new uint32_t[payload.size()]; std::copy(payload.begin(), payload.end(), raw); diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx index f2ddcf332bb..849007ee269 100644 --- a/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx +++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx @@ -439,7 +439,7 @@ StatusCode FTKTrackFitterAlgo::initialize(){ if(m_PrintSSBConstants){ - log << MSG::INFO << "*** Printing EXP and TF constants in a txt file ****" << endreq; + log << MSG::INFO << "*** Printing EXP and TF constants in a txt file ****" << endmsg; ofstream myfile; myfile.open (Form("EXPConstants_reg%d.txt",ir)); @@ -452,7 +452,7 @@ StatusCode FTKTrackFitterAlgo::initialize(){ vecOfMapSecID.clear(); vecOfMapNconn.clear(); - log << MSG::INFO << "*** Reading the connection file and mapping 8L -> 12L " << endreq; + log << MSG::INFO << "*** Reading the connection file and mapping 8L -> 12L " << endmsg; vector<vector<int>> moduleIDvec; moduleIDvec.clear(); diff --git a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx index 3f067677278..028e7aee96b 100755 --- a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx +++ b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx @@ -95,72 +95,72 @@ FakeLvl1MultipleRoIsatFixedEtaPhi::~FakeLvl1MultipleRoIsatFixedEtaPhi() HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltInitialize() { // check that the vectors for emRoi are the same length - if (m_emRoiPhi.size() != m_emRoiEta.size() || m_emRoiPhi.size() != m_emRoiLabel.size()) { msg() << MSG::FATAL << " problem configuring EMROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_emRoiEta.size() << " label "<<m_emRoiLabel.size() <<endreq; + if (m_emRoiPhi.size() != m_emRoiEta.size() || m_emRoiPhi.size() != m_emRoiLabel.size()) { msg() << MSG::FATAL << " problem configuring EMROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_emRoiEta.size() << " label "<<m_emRoiLabel.size() <<endmsg; return HLT::BAD_JOB_SETUP; } - if (m_emRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake EMROIs" << endreq; + if (m_emRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake EMROIs" << endmsg; for (size_t em=0;em<m_emRoiPhi.size();em++){ if ( m_emRoiPhi.at(em) <= M_PI && m_emRoiPhi.at(em) >= -M_PI ) { msg() << MSG::INFO << " Forming fake EMROI with name " << m_emRoiLabel.at(em) <<" at phi = " << - m_emRoiPhi.at(em) << " eta = " << m_emRoiEta.at(em) << endreq; + m_emRoiPhi.at(em) << " eta = " << m_emRoiEta.at(em) << endmsg; } else { - msg() << MSG::INFO << " Not forming fake EMROI " <<m_emRoiLabel.at(em) << " phi out of range"<< endreq; + msg() << MSG::INFO << " Not forming fake EMROI " <<m_emRoiLabel.at(em) << " phi out of range"<< endmsg; } } // check that the vectors for tauRoi are the same length if (m_tauRoiPhi.size() != m_tauRoiEta.size() || m_tauRoiPhi.size() != m_tauRoiLabel.size()) { - msg() << MSG::FATAL << " problem configuring TAUROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_tauRoiEta.size() << " label "<< m_tauRoiLabel.size() <<endreq; + msg() << MSG::FATAL << " problem configuring TAUROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_tauRoiEta.size() << " label "<< m_tauRoiLabel.size() <<endmsg; return HLT::BAD_JOB_SETUP; } if (m_tauRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake TAUROIs" << -endreq; +endmsg; for (size_t tau=0;tau<m_tauRoiPhi.size();tau++){ if ( m_tauRoiPhi.at(tau) <= M_PI && m_tauRoiPhi.at(tau) >= -M_PI ) { msg() << MSG::INFO << " Forming fake TAUROI with name " << m_tauRoiLabel.at(tau) << " at phi = " << - m_tauRoiPhi.at(tau) << " eta = " << m_tauRoiEta.at(tau) << endreq; + m_tauRoiPhi.at(tau) << " eta = " << m_tauRoiEta.at(tau) << endmsg; } else { - msg() << MSG::INFO << " Not forming fake TAUROI " <<m_tauRoiLabel.at(tau) << " phi out of range"<< endreq; + msg() << MSG::INFO << " Not forming fake TAUROI " <<m_tauRoiLabel.at(tau) << " phi out of range"<< endmsg; } } // check that the vectors for muonRoi are the same length if (m_muonRoiPhi.size() != m_muonRoiEta.size() || m_muonRoiPhi.size() != m_muonRoiLabel.size()) { - msg() << MSG::FATAL << " problem configuring MUONROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_muonRoiEta.size() << " label "<< m_muonRoiLabel.size() <<endreq; + msg() << MSG::FATAL << " problem configuring MUONROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_muonRoiEta.size() << " label "<< m_muonRoiLabel.size() <<endmsg; return HLT::BAD_JOB_SETUP; } - if (m_muonRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake MUONROIs" << endreq; + if (m_muonRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake MUONROIs" << endmsg; // print out the MUONROIs that will be created... for (size_t mu=0;mu<m_muonRoiPhi.size();mu++){ if ( m_muonRoiPhi.at(mu) <= M_PI && m_muonRoiPhi.at(mu) >= -M_PI ) { msg() << MSG::INFO << " Forming fake MUONROI " <<mu<< " with name " << m_muonRoiLabel.at(mu) << " at phi = " << - m_muonRoiPhi.at(mu) << " eta = " << m_muonRoiEta.at(mu) << endreq; + m_muonRoiPhi.at(mu) << " eta = " << m_muonRoiEta.at(mu) << endmsg; } else { - msg() << MSG::INFO << " Not forming fake MUONROI " <<mu << "phi out of range " <<endreq; + msg() << MSG::INFO << " Not forming fake MUONROI " <<mu << "phi out of range " <<endmsg; } } // check that the vectors for jetRoi are the same length if (m_jetRoiPhi.size() != m_jetRoiEta.size() || m_jetRoiPhi.size() != m_jetRoiLabel.size()) { - msg() << MSG::FATAL << " problem configuring JETROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_jetRoiEta.size() << " label "<< m_jetRoiLabel.size() <<endreq; + msg() << MSG::FATAL << " problem configuring JETROI sizes of Phi, Eta, Label vectors different, phi " << m_muonRoiPhi.size() << " eta " << m_jetRoiEta.size() << " label "<< m_jetRoiLabel.size() <<endmsg; return HLT::BAD_JOB_SETUP; } if (m_jetRoiPhi.size() == 0) msg() << MSG::INFO << " Not forming any fake JETROIs" << -endreq; +endmsg; for (size_t j=0;j<m_jetRoiPhi.size();j++){ if ( m_jetRoiPhi.at(j) <= M_PI && m_jetRoiPhi.at(j) >= -M_PI ) { msg() << MSG::INFO << " Forming fake JETROI with name " << m_jetRoiLabel.at(j) << " at phi = " << - m_jetRoiPhi.at(j) << " eta = " << m_jetRoiEta.at(j) << endreq; + m_jetRoiPhi.at(j) << " eta = " << m_jetRoiEta.at(j) << endmsg; } else { - msg() << MSG::INFO << " Not forming fake JETROI " <<m_jetRoiLabel.at(j) << " phi out of range "<< endreq; + msg() << MSG::INFO << " Not forming fake JETROI " <<m_jetRoiLabel.at(j) << " phi out of range "<< endmsg; } } - msg() << MSG::INFO << name() << ": Initialization completed successfully" << endreq; + msg() << MSG::INFO << name() << ": Initialization completed successfully" << endmsg; return HLT::OK; } @@ -175,10 +175,10 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S - msg() << MSG::DEBUG << "Executing FakeLvl1MultipleRoIsatFixedEtaPhi" << endreq; + msg() << MSG::DEBUG << "Executing FakeLvl1MultipleRoIsatFixedEtaPhi" << endmsg; // activate all configured chains: - msg() << MSG::DEBUG << "activating all configured chains." << endreq; + msg() << MSG::DEBUG << "activating all configured chains." << endmsg; for (std::vector<HLT::SteeringChain*>::const_iterator it = m_configuredChains->begin(); it != m_configuredChains->end(); ++it) { @@ -190,7 +190,7 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S } HLT::TriggerElement* initialTE = m_config->getNavigation()->getInitialNode(); - msg() << MSG::DEBUG << "initial Navigation node created." << endreq; + msg() << MSG::DEBUG << "initial Navigation node created." << endmsg; // set Lvl1 ID in AlgoConfig: m_config->setLvl1Id(m_lvl1ID); @@ -215,7 +215,7 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S TrigConf::HLTTriggerElement::getId(m_emRoiLabel.at(em).c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created "<< m_emRoiLabel.at(em) << endreq; + msg() << MSG::DEBUG << "created "<< m_emRoiLabel.at(em) << endmsg; } } @@ -234,7 +234,7 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S unsigned int teId; TrigConf::HLTTriggerElement::getId(m_tauRoiLabel.at(t).c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created" << m_tauRoiLabel.at(t) << endreq; + msg() << MSG::DEBUG << "created" << m_tauRoiLabel.at(t) << endmsg; } } @@ -253,7 +253,7 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S unsigned int teId; TrigConf::HLTTriggerElement::getId(m_muonRoiLabel.at(m).c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created"<< m_muonRoiLabel.at(m) << endreq; + msg() << MSG::DEBUG << "created"<< m_muonRoiLabel.at(m) << endmsg; } } @@ -273,7 +273,7 @@ HLT::ErrorCode FakeLvl1MultipleRoIsatFixedEtaPhi::hltExecute( std::vector<HLT::S unsigned int teId; TrigConf::HLTTriggerElement::getId(m_jetRoiLabel.at(j).c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created " << m_jetRoiLabel.at(j) << endreq; + msg() << MSG::DEBUG << "created " << m_jetRoiLabel.at(j) << endmsg; } } diff --git a/Trigger/TrigFake/src/FakeLvl1RoIatFixedEtaPhi.cxx b/Trigger/TrigFake/src/FakeLvl1RoIatFixedEtaPhi.cxx index abb1cc4ea1e..a1a4c1bc15b 100755 --- a/Trigger/TrigFake/src/FakeLvl1RoIatFixedEtaPhi.cxx +++ b/Trigger/TrigFake/src/FakeLvl1RoIatFixedEtaPhi.cxx @@ -98,43 +98,43 @@ FakeLvl1RoIatFixedEtaPhi::~FakeLvl1RoIatFixedEtaPhi() HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltInitialize() { - msg() << MSG::INFO << " FakeLvl1RoIatFixedEtaPhi creating the following RoI: " << endreq; + msg() << MSG::INFO << " FakeLvl1RoIatFixedEtaPhi creating the following RoI: " << endmsg; if ( m_emRoiPhi <= M_PI && m_emRoiPhi >= -M_PI ) { msg() << MSG::INFO << " Forming fake EMROI with name " << m_emRoiLabel << " at phi = " << - m_emRoiPhi << " eta = " << m_emRoiEta << endreq; + m_emRoiPhi << " eta = " << m_emRoiEta << endmsg; } else { - msg() << MSG::INFO << " Not forming fake EMROI" << endreq; + msg() << MSG::INFO << " Not forming fake EMROI" << endmsg; } if ( m_tauRoiPhi <= M_PI && m_tauRoiPhi >= -M_PI ) { msg() << MSG::INFO << " Forming fake TAUROI with name " << m_tauRoiLabel << " at phi = " << - m_tauRoiPhi << " eta = " << m_tauRoiEta << endreq; + m_tauRoiPhi << " eta = " << m_tauRoiEta << endmsg; } else { - msg() << MSG::INFO << " Not forming fake TAUROI" << endreq; + msg() << MSG::INFO << " Not forming fake TAUROI" << endmsg; } if ( m_muonRoiPhi <= M_PI && m_muonRoiPhi >= -M_PI ) { msg() << MSG::INFO << " Forming fake MUONROI with name " << m_muonRoiLabel << " at phi = " << - m_muonRoiPhi << " eta = " << m_muonRoiEta << endreq; + m_muonRoiPhi << " eta = " << m_muonRoiEta << endmsg; } else { - msg() << MSG::INFO << " Not forming fake MUONROI" << endreq; + msg() << MSG::INFO << " Not forming fake MUONROI" << endmsg; } if ( m_jetRoiPhi <= M_PI && m_jetRoiPhi >= -M_PI ) { msg() << MSG::INFO << " Forming fake JETROI with name " << m_jetRoiLabel << " at phi = " << - m_jetRoiPhi << " eta = " << m_jetRoiEta << endreq; + m_jetRoiPhi << " eta = " << m_jetRoiEta << endmsg; } else { - msg() << MSG::INFO << " Not forming fake JETROI" << endreq; + msg() << MSG::INFO << " Not forming fake JETROI" << endmsg; } - msg() << MSG::INFO << name() << ": Initialization completed successfully" << endreq; + msg() << MSG::INFO << name() << ": Initialization completed successfully" << endmsg; return HLT::OK; } @@ -149,10 +149,10 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh - msg() << MSG::DEBUG << "Executing FakeLvl1RoIatFixedEtaPhi" << endreq; + msg() << MSG::DEBUG << "Executing FakeLvl1RoIatFixedEtaPhi" << endmsg; // activate all configured chains: - msg() << MSG::DEBUG << "activating all configured chains." << endreq; + msg() << MSG::DEBUG << "activating all configured chains." << endmsg; for (std::vector<HLT::SteeringChain*>::const_iterator it = m_configuredChains->begin(); it != m_configuredChains->end(); ++it) { @@ -164,7 +164,7 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh } HLT::TriggerElement* initialTE = m_config->getNavigation()->getInitialNode(); - msg() << MSG::DEBUG << "initial Navigation node created." << endreq; + msg() << MSG::DEBUG << "initial Navigation node created." << endmsg; // set Lvl1 ID in AlgoConfig: m_config->setLvl1Id(m_lvl1ID); @@ -190,7 +190,7 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh TrigConf::HLTTriggerElement::getId(m_emRoiLabel.c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created "<< m_emRoiLabel << endreq; + msg() << MSG::DEBUG << "created "<< m_emRoiLabel << endmsg; } if ( m_tauRoiPhi <= M_PI && m_tauRoiPhi >= -M_PI ) { @@ -211,7 +211,7 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh unsigned int teId; TrigConf::HLTTriggerElement::getId(m_tauRoiLabel.c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created" << m_tauRoiLabel << endreq; + msg() << MSG::DEBUG << "created" << m_tauRoiLabel << endmsg; } if ( m_muonRoiPhi <= M_PI && m_muonRoiPhi >= -M_PI ) { @@ -233,7 +233,7 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh unsigned int teId; TrigConf::HLTTriggerElement::getId(m_muonRoiLabel.c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created"<< m_muonRoiLabel << endreq; + msg() << MSG::DEBUG << "created"<< m_muonRoiLabel << endmsg; } @@ -253,7 +253,7 @@ HLT::ErrorCode FakeLvl1RoIatFixedEtaPhi::hltExecute( std::vector<HLT::SteeringCh unsigned int teId; TrigConf::HLTTriggerElement::getId(m_jetRoiLabel.c_str(), teId); m_config->getNavigation()->addNode(roiTE, teId); - msg() << MSG::DEBUG << "created " << m_jetRoiLabel << endreq; + msg() << MSG::DEBUG << "created " << m_jetRoiLabel << endmsg; } m_lvl1ID++; diff --git a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx index 8c8b41f34d4..f3e73992f27 100755 --- a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx +++ b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx @@ -118,7 +118,7 @@ FakeLvl1RoIfromKine::~FakeLvl1RoIfromKine() HLT::ErrorCode FakeLvl1RoIfromKine::hltInitialize() { // if ( m_particleDataTable.empty() ) { - //(*m_log) << MSG::WARNING << "FakeLvl1RoIfromKine failed to read particleDataTable" << endreq; + //(*m_log) << MSG::WARNING << "FakeLvl1RoIfromKine failed to read particleDataTable" << endmsg; //return StatusCode::FAILURE; // } @@ -129,7 +129,7 @@ HLT::ErrorCode FakeLvl1RoIfromKine::hltInitialize() for ( ; emParticle != lastEmParticle ; emParticle++ ) { msg() << *emParticle << " " ; } - msg() << endreq; + msg() << endmsg; ATH_MSG_INFO(" with ET > " << m_emTauRoiPtMin << " and |eta| < " << m_emTauRoiEtaMax); } else { @@ -143,7 +143,7 @@ HLT::ErrorCode FakeLvl1RoIfromKine::hltInitialize() for ( ; muParticle != lastMuParticle ; muParticle++ ) { msg() << *muParticle << " " ; } - msg() << endreq; + msg() << endmsg; ATH_MSG_INFO(" with pT > " << m_muonRoiPtMin << " and |eta| < " << m_muonRoiEtaMax); } else { @@ -158,7 +158,7 @@ HLT::ErrorCode FakeLvl1RoIfromKine::hltInitialize() for ( ; muParticle != lastMuParticle ; muParticle++ ) { msg() << *muParticle << " " ; } - msg() << endreq; + msg() << endmsg; ATH_MSG_INFO(" with pT > " << m_jetRoiPtMin<< " and |eta| < " << m_jetRoiEtaMax); } else { @@ -197,7 +197,7 @@ HLT::ErrorCode FakeLvl1RoIfromKine::hltExecute( std::vector<HLT::SteeringChain*> // HLT::TriggerElement* initialTE = m_config->getNavigation()->getInitialNode(); - // (*m_log) << MSG::DEBUG << "initial Navigation node created." << endreq; + // (*m_log) << MSG::DEBUG << "initial Navigation node created." << endmsg; m_roiId=0; std::vector<FakeRoI> *roiList; diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigEFDPhiMetJetAllTE.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigEFDPhiMetJetAllTE.cxx index 87ffa5d518d..ef0afeef58e 100755 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigEFDPhiMetJetAllTE.cxx +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigEFDPhiMetJetAllTE.cxx @@ -82,7 +82,7 @@ HLT::ErrorCode TrigEFDPhiMetJetAllTE::hltExecute(std::vector<std::vector<HLT::Tr // if (m_executedEvent_EFDPhiMetJet) { // if (msgLvl() <= MSG::DEBUG) { - // msg() << MSG::DEBUG << "*** Not Executing this TrigCheckForTracks " << name() << ", already executed" << endreq; + // msg() << MSG::DEBUG << "*** Not Executing this TrigCheckForTracks " << name() << ", already executed" << endmsg; // } // return HLT::OK; // } @@ -312,7 +312,7 @@ HLT::ErrorCode TrigEFDPhiMetJetAllTE::hltExecute(std::vector<std::vector<HLT::Tr // attach the bits // if ( attachFeature(out_te, bits, "passbits") != HLT::OK ) { - // msg() << MSG::ERROR << "Problem attaching TrigPassBits for the Jets " << endreq; + // msg() << MSG::ERROR << "Problem attaching TrigPassBits for the Jets " << endmsg; // } auto sc = attachFeature(out_te, xBits.release(), "passbits"); diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx index 7eaac563567..76912c05984 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx @@ -60,7 +60,7 @@ TrigCaloRatioHypo::~TrigCaloRatioHypo() {} HLT::ErrorCode TrigCaloRatioHypo::hltInitialize() { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted=0; m_rejected=0; @@ -68,16 +68,16 @@ HLT::ErrorCode TrigCaloRatioHypo::hltInitialize() { //* declareProperty overview *// if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "declareProperty review:" << endreq; - msg() << MSG::DEBUG << " EtCut = " << m_etCut << endreq; - msg() << MSG::DEBUG << " LogRatioCut = " << m_logRatioCut << endreq; - msg() << MSG::DEBUG << " PtMinID = " << m_ptCut << endreq; - msg() << MSG::DEBUG << " TrackCut = " << m_trackCut << endreq; - msg() << MSG::DEBUG << " DeltaR = " << m_deltaR << endreq; - msg() << MSG::DEBUG << " EtaCut = " << m_etaCut << endreq; - msg() << MSG::DEBUG << " Reversed = " << m_reversedCut << endreq; - msg() << MSG::DEBUG << " DoTrackIso = " << m_doTrackIso << endreq; - msg() << MSG::DEBUG << " AcceptAll = " << m_acceptAll << endreq; + msg() << MSG::DEBUG << "declareProperty review:" << endmsg; + msg() << MSG::DEBUG << " EtCut = " << m_etCut << endmsg; + msg() << MSG::DEBUG << " LogRatioCut = " << m_logRatioCut << endmsg; + msg() << MSG::DEBUG << " PtMinID = " << m_ptCut << endmsg; + msg() << MSG::DEBUG << " TrackCut = " << m_trackCut << endmsg; + msg() << MSG::DEBUG << " DeltaR = " << m_deltaR << endmsg; + msg() << MSG::DEBUG << " EtaCut = " << m_etaCut << endmsg; + msg() << MSG::DEBUG << " Reversed = " << m_reversedCut << endmsg; + msg() << MSG::DEBUG << " DoTrackIso = " << m_doTrackIso << endmsg; + msg() << MSG::DEBUG << " AcceptAll = " << m_acceptAll << endmsg; } return HLT::OK; @@ -89,8 +89,8 @@ HLT::ErrorCode TrigCaloRatioHypo::hltInitialize() { HLT::ErrorCode TrigCaloRatioHypo::hltFinalize() { - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected <<" / "<< m_errors << endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected <<" / "<< m_errors << endmsg; return HLT::OK; } @@ -120,24 +120,24 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE m_cutCounter = 0; if (status != HLT::OK) { - msg() << MSG::ERROR << "Failed to get the xAOD jet container" << endreq; + msg() << MSG::ERROR << "Failed to get the xAOD jet container" << endmsg; m_errors++; return HLT::ERROR; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got the xAOD jet container" << endreq; + msg() << MSG::DEBUG << "Got the xAOD jet container" << endmsg; if (vectorOfJets->size() == 0) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "The xAOD jet container is empty" << endreq; + msg() << MSG::DEBUG << "The xAOD jet container is empty" << endmsg; m_errors++; return HLT::OK; } else if (vectorOfJets->size() != 1) { - msg() << MSG::ERROR << "More than one xAOD jet, not expected!" << endreq; + msg() << MSG::ERROR << "More than one xAOD jet, not expected!" << endmsg; m_errors++; return HLT::ERROR; } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << vectorOfJets->size() << " jet is found" << endreq; + msg() << MSG::DEBUG << vectorOfJets->size() << " jet is found" << endmsg; } const xAOD::Jet *jet = vectorOfJets->front(); @@ -159,7 +159,7 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " jet with et=" << jetEt << ", eta=" << jetEta << ", phi=" << jetPhi - << ", log-ratio=" << jetRatio << endreq; + << ", log-ratio=" << jetRatio << endmsg; if(!m_reversedCut) { @@ -195,19 +195,19 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE status = getFeature(outputTE, vectorOfTracks, "InDetTrigTrackingxAODCnv_Tau_IDTrig"); if(status != HLT::OK) { - msg() << MSG::ERROR << "Failed to get the xAOD track container" << endreq; + msg() << MSG::ERROR << "Failed to get the xAOD track container" << endmsg; m_errors++; return HLT::ERROR; } else if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Got the xAOD track container" << endreq; + msg() << MSG::DEBUG << "Got the xAOD track container" << endmsg; if(vectorOfTracks->size() == 0) { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "The xAOD track container is empty" << endreq; + msg() << MSG::DEBUG << "The xAOD track container is empty" << endmsg; passCutTrk = true; //default is true, but just for clarity } else { if (msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << vectorOfTracks->size() << " tracks are found" << endreq; + msg() << MSG::DEBUG << vectorOfTracks->size() << " tracks are found" << endmsg; xAOD::TrackParticleContainer::const_iterator track = vectorOfTracks->begin(), @@ -225,7 +225,7 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE double eta = (*track)->eta(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << " track with " << "pt=" << pT << ", eta=" << eta << ", phi=" << phi << endreq; + msg() << MSG::DEBUG << " track with " << "pt=" << pT << ", eta=" << eta << ", phi=" << phi << endmsg; double deta = fabs(eta-jetEta); double dphi = fabs(HLT::wrapPhi(phi-jetPhi)); @@ -242,7 +242,7 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE } else{ if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Jet passed tracking isolation" << endreq; + msg() << MSG::DEBUG << "Jet passed tracking isolation" << endmsg; } } @@ -252,11 +252,11 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE m_cutCounter = 1; if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Jet passing calo-ratio requirements" << endreq; + msg() << MSG::DEBUG << "Jet passing calo-ratio requirements" << endmsg; } else { if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Jet not passing calo-ratio requirements" << endreq; + msg() << MSG::DEBUG << "Jet not passing calo-ratio requirements" << endmsg; } return HLT::OK; diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx index 86b8819482f..f8459986f73 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx @@ -93,7 +93,7 @@ TrigL2HVJetHypo::~TrigL2HVJetHypo() HLT::ErrorCode TrigL2HVJetHypo::hltInitialize() // ---------------------------------------------------------------------- { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted_L2=0; m_rejected_L2=0; @@ -107,8 +107,8 @@ HLT::ErrorCode TrigL2HVJetHypo::hltInitialize() HLT::ErrorCode TrigL2HVJetHypo::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endmsg; return HLT::OK; } @@ -137,12 +137,12 @@ HLT::ErrorCode TrigL2HVJetHypo::hltExecute(const HLT::TriggerElement* outputTE, if ( getFeature(outputTE, roiDescriptor, "a_label")==HLT::OK ) { if ( roiDescriptor ) { if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: RoI id " << roiDescriptor->roiId() - << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endreq; + << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endmsg; } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } @@ -153,7 +153,7 @@ HLT::ErrorCode TrigL2HVJetHypo::hltExecute(const HLT::TriggerElement* outputTE, HLT::ErrorCode ec = getFeatures(outputTE, vectorOfJets); if(ec!=HLT::OK) { - msg() << MSG::WARNING << " Failed to get the L2 Jets " << endreq; + msg() << MSG::WARNING << " Failed to get the L2 Jets " << endmsg; m_errors_L2++; return ec; } @@ -163,14 +163,14 @@ HLT::ErrorCode TrigL2HVJetHypo::hltExecute(const HLT::TriggerElement* outputTE, // Check that there is only one JETROI. // We only expect ONE input RoI. if (vectorOfJets.size() != 1){ - msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endreq; + msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endmsg; return HLT::OK; } // Get first (and only) RoI: const TrigT2Jet* pJet = vectorOfJets.back(); if(!pJet){ - msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endreq; + msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endmsg; return HLT::OK; } @@ -192,8 +192,8 @@ HLT::ErrorCode TrigL2HVJetHypo::hltExecute(const HLT::TriggerElement* outputTE, if (CxxUtils::fpcompare::greater( emjet, zero ) && CxxUtils::fpcompare::greater( ehjet, zero )) erat = log10(double(ehjet/emjet)); //if (double(emjet) > 0. && ehjet > 0.) erat = log10(double(ehjet/emjet)); - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endreq; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endmsg; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endmsg; //monitored variables m_JetEt = etjet/1000; @@ -260,7 +260,7 @@ HLT::ErrorCode TrigL2HVJetHypo::hltExecute(const HLT::TriggerElement* outputTE, } else { m_rejected_L2++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Event rejected !" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Event rejected !" << endmsg; } diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx index 7fb64715401..cd911819cdb 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx @@ -103,7 +103,7 @@ TrigL2HVJetHypoAllCuts::~TrigL2HVJetHypoAllCuts() HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltInitialize() // ---------------------------------------------------------------------- { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted_L2=0; m_rejected_L2=0; @@ -130,8 +130,8 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltInitialize() HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endmsg; return HLT::OK; } @@ -160,12 +160,12 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out if ( getFeature(outputTE, roiDescriptor, "a_label")==HLT::OK ) { if ( roiDescriptor ) { if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: RoI id " << roiDescriptor->roiId() - << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endreq; + << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endmsg; } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } @@ -175,7 +175,7 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out HLT::ErrorCode ec = getFeatures(outputTE, vectorOfJets); if(ec!=HLT::OK) { - msg() << MSG::WARNING << " Failed to get the L2 Jets " << endreq; + msg() << MSG::WARNING << " Failed to get the L2 Jets " << endmsg; m_errors_L2++; return ec; } @@ -185,14 +185,14 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out // Check that there is only one JETROI. // We only expect ONE input RoI. if (vectorOfJets.size() != 1){ - msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endreq; + msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endmsg; return HLT::OK; } // Get first (and only) RoI: const TrigT2Jet* pJet = vectorOfJets.back(); if(!pJet){ - msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endreq; + msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endmsg; return HLT::OK; } @@ -214,8 +214,8 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out if (CxxUtils::fpcompare::greater( emjet, zero ) && CxxUtils::fpcompare::greater( ehjet, zero )) erat = log10(double(ehjet/emjet)); //if (double(emjet) > 0. && ehjet > 0.) erat = log10(double(ehjet/emjet)); - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endreq; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endmsg; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endmsg; //monitored variables m_JetEt = etjet/1000; @@ -280,7 +280,7 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out //Timer for accessing the ID track collection and cut on track number - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Accessing the ID track collection " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Accessing the ID track collection " << endmsg; //ACCESSING THE ID TRACK COLLECTION FOR THE TRACKLESS JET REQUEST int ntrk = 0; if(m_UseID) { @@ -289,11 +289,11 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out status = getFeatures(outputTE,vectorOfTrackCollections, ""); if( status!=HLT::OK ) { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Failed to get InDetTrackCollections " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Failed to get InDetTrackCollections " << endmsg; }else{ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Got " << vectorOfTrackCollections.size() - << " InDetTrackCollections " << endreq; + << " InDetTrackCollections " << endmsg; std::vector<const TrigInDetTrackCollection*>::iterator theTrackColl = vectorOfTrackCollections.begin(), @@ -317,7 +317,7 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out double eta_id = (*track)->param()->eta(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "trying " << m_ID_algo_to_use << " track with " << "pt=" << pt_idtr << ", eta=" << eta_id << ", phi=" << phi_id << endreq; + msg() << MSG::DEBUG << "trying " << m_ID_algo_to_use << " track with " << "pt=" << pt_idtr << ", eta=" << eta_id << ", phi=" << phi_id << endmsg; double deta = fabs( eta_id - jetEta ); double dphi = fabs( HLT::wrapPhi(phi_id - jetPhi) ); @@ -337,14 +337,14 @@ HLT::ErrorCode TrigL2HVJetHypoAllCuts::hltExecute(const HLT::TriggerElement* out pass = true; m_accepted_L2++; m_cutCounter=1; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event Accepted!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event Accepted!" << endmsg; }else{ m_rejected_L2++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event rejected !" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event rejected !" << endmsg; } } else { m_rejected_L2++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Event rejected !" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Event rejected !" << endmsg; } diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx index 6704c732c1f..6718f00a33e 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx @@ -65,7 +65,7 @@ TrigL2HVJetHypoTrk::~TrigL2HVJetHypoTrk() HLT::ErrorCode TrigL2HVJetHypoTrk::hltInitialize() // ---------------------------------------------------------------------- { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted_L2=0; @@ -93,8 +93,8 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltInitialize() HLT::ErrorCode TrigL2HVJetHypoTrk::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events (Lvl2) accepted/rejected/errors: "<< m_accepted_L2 <<" / "<<m_rejected_L2<< " / "<< m_errors_L2<< endmsg; return HLT::OK; } @@ -116,12 +116,12 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT if ( getFeature(outputTE, roiDescriptor, "a_label")==HLT::OK ) { if ( roiDescriptor ) { if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST: RoI id " << roiDescriptor->roiId() - << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endreq; + << " located at phi = " << roiDescriptor->phi() << ", eta = " << roiDescriptor->eta() << endmsg; } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Failed to find RoiDescriptor " << endmsg; } } @@ -131,7 +131,7 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT HLT::ErrorCode ec = getFeatures(outputTE, vectorOfJets); if(ec!=HLT::OK) { - msg() << MSG::WARNING << " Failed to get the L2 Jets " << endreq; + msg() << MSG::WARNING << " Failed to get the L2 Jets " << endmsg; m_errors_L2++; return ec; } @@ -141,14 +141,14 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT // Check that there is only one JETROI. // We only expect ONE input RoI. if (vectorOfJets.size() != 1){ - msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endreq; + msg() << MSG::ERROR << "The number of Jets attached to the TE is not 1" << endmsg; return HLT::OK; } // Get first (and only) RoI: const TrigT2Jet* pJet = vectorOfJets.back(); if(!pJet){ - msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endreq; + msg() << MSG::ERROR << "Retrieval of RoI from vector failed" << endmsg; return HLT::OK; } @@ -167,14 +167,14 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT if (emjet <= 0. && ehjet > 0.) erat = 999999; if (emjet > 0. && ehjet >= 0.) erat = log10(ehjet/emjet); - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endreq; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet energy (L2): " << etjet << endmsg; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Jet log10 of had / em energy ratio (L2): " << erat << endmsg; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Accessing the ID track collection " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Accessing the ID track collection " << endmsg; //ACCESSING THE ID TRACK COLLECTION FOR THE TRACKLESS JET REQUEST int ntrk = 0; if(m_UseID) { @@ -183,11 +183,11 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT status = getFeatures(outputTE,vectorOfTrackCollections, ""); if( status!=HLT::OK ) { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Failed to get InDetTrackCollections " << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Failed to get InDetTrackCollections " << endmsg; }else{ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Got " << vectorOfTrackCollections.size() - << " InDetTrackCollections " << endreq; + << " InDetTrackCollections " << endmsg; std::vector<const TrigInDetTrackCollection*>::iterator theTrackColl = vectorOfTrackCollections.begin(), @@ -211,7 +211,7 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT double eta_id = (*track)->param()->eta(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "trying " << m_ID_algo_to_use << " track with " << "pt=" << pt_idtr << ", eta=" << eta_id << ", phi=" << phi_id << endreq; + msg() << MSG::DEBUG << "trying " << m_ID_algo_to_use << " track with " << "pt=" << pt_idtr << ", eta=" << eta_id << ", phi=" << phi_id << endmsg; double deta = fabs( eta_id - jetEta ); double dphi = fabs( HLT::wrapPhi(phi_id - jetPhi) ); @@ -231,10 +231,10 @@ HLT::ErrorCode TrigL2HVJetHypoTrk::hltExecute(const HLT::TriggerElement* outputT pass = true; m_accepted_L2++; m_cutCounter=1; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event Accepted!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event Accepted!" << endmsg; }else{ m_rejected_L2++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event rejected !" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Number of tracks in ID is " << ntrk << ".... Event rejected !" << endmsg; } diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx index cf615c91353..31106c7f656 100644 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx @@ -106,35 +106,35 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltInitialize() { m_log.setLevel(outputLevel()); - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Initialize: " << name() << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Initialize: " << name() << endmsg; if ( m_regionSelector.retrieve().isFailure() ) { - msg() << MSG::FATAL << "Unable to retrieve RegionSelector tool " << m_regionSelector.type() << endreq; + msg() << MSG::FATAL << "Unable to retrieve RegionSelector tool " << m_regionSelector.type() << endmsg; return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP); } else - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised RegionSelector tool !" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised RegionSelector tool !" << endmsg; if(m_detStore.retrieve().isFailure()) { - if (msgLvl() <= MSG::FATAL) m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endreq; + if (msgLvl() <= MSG::FATAL) m_log << MSG::FATAL << "Failed to connect to " << m_detStore.typeAndName() << endmsg; return StatusCode::FAILURE; } else - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised DetectorStore!" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised DetectorStore!" << endmsg; StatusCode sc_pixH = m_detStore->retrieve(m_pixHelper, "PixelID"); if( sc_pixH.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain pix helper!" << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain pix helper!" << endmsg; return StatusCode::FAILURE; } else - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised pixel helper" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised pixel helper" << endmsg; StatusCode sc_sctH = m_detStore->retrieve(m_sctHelper, "SCT_ID"); if( sc_sctH.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain sct helper!" << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Could not obtain sct helper!" << endmsg; return StatusCode::FAILURE; } else - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised SCT helper" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Successfully initialised SCT helper" << endmsg; - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << " TrigLLPInnerDetectorHypo initialized successfully" << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << " TrigLLPInnerDetectorHypo initialized successfully" << endmsg; return HLT::OK; } @@ -144,11 +144,11 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::checkDetectorMask() { m_hltExecuteInitialisationRun = true; - m_log << MSG::DEBUG << "[TrigLLPInnerDetectorHypo::checkDetectorMask] beginning run with this " << name() << endreq; + m_log << MSG::DEBUG << "[TrigLLPInnerDetectorHypo::checkDetectorMask] beginning run with this " << name() << endmsg; const xAOD::EventInfo* evinfo = 0; if (store()->retrieve(evinfo).isFailure()) { - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR << "Cannot retrieve xAOD::EventInfo from SG for detmasks" << endmsg; return HLT::SG_ERROR; } else { @@ -160,13 +160,13 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::checkDetectorMask() { << ":" << evinfo->timeStampNSOffset() << "," << evinfo->bcid() << ",0x" << std::hex << evinfo->detectorMask() << std::dec - << "]" << endreq; + << "]" << endmsg; uint64_t mask = evinfo->detectorMask(); eformat::helper::DetectorMask decoder(mask); if (mask == 0) { - if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0." << endreq; + if (msgLvl() <= MSG::INFO) m_log << MSG::INFO << "Detector Mask == 0." << endmsg; m_sct_barrel_a_side = true; m_sct_barrel_c_side = true; m_sct_endcap_a_side = true; @@ -185,14 +185,14 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::checkDetectorMask() { } if( msgLvl() <= MSG::INFO ){ - m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! ") << endreq; + m_log << MSG::INFO << "sct_barrel_a_side is " << (m_sct_barrel_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_barrel_c_side is " << (m_sct_barrel_c_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_endcap_a_side is " << (m_sct_endcap_a_side==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "sct_endcap_c_side is " << (m_sct_endcap_c_side==true? "present" : "OFF! ") << endmsg; - m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! ") << endreq; - m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! ") << endreq; + m_log << MSG::INFO << "pixel_barrel is " << (m_pixel_barrel==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "pixel_b_layer is " << (m_pixel_b_layer==true? "present" : "OFF! ") << endmsg; + m_log << MSG::INFO << "pixel_disk is " << (m_pixel_disk==true? "present" : "OFF! ") << endmsg; } } return HLT::OK; @@ -206,7 +206,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o } if ( msgLvl() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Executing " << name() << endreq; + m_log << MSG::DEBUG << "Executing " << name() << endmsg; } std::vector<IdentifierHash>::iterator hashIt, hashItEnd; @@ -235,10 +235,10 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o sc = store()->retrieve( pixCont, m_pixelSpName ); if(sc.isFailure() || !pixCont){ - if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR<< "Trig Pixel SP container " << m_pixelSpName <<" not found"<<endreq; + if (msgLvl() <= MSG::ERROR) m_log << MSG::ERROR<< "Trig Pixel SP container " << m_pixelSpName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } else{ - if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Successfully retrieved pixel SP container!" << endreq; + if (msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Successfully retrieved pixel SP container!" << endmsg; } m_regionSelector->DetHashIDList(PIXEL, m_listOfPixIds ); @@ -279,14 +279,14 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o m_pixSpPerModule.push_back(m_nPixSP); if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_1 << " have cl size == 1 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_2 << " have cl size == 2 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCLmin3 << " have cl size >= 3 in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints after ToT cut in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClBarrel << " SP in pixel barrel in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapA << " SP in pixel ECA in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapC << " SP in pixel ECC in total." << endreq; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_1 << " have cl size == 1 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCL_2 << " have cl size == 2 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : " << m_totNumPixCLmin3 << " have cl size >= 3 in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumPixSP << " pixel spacepoints after ToT cut in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClBarrel << " SP in pixel barrel in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapA << " SP in pixel ECA in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_pixClEndcapC << " SP in pixel ECC in total." << endmsg; } m_ratioA = -1.; m_ratioB = -1.; @@ -322,7 +322,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o const SpacePointContainer* sctCont; sc = store()->retrieve( sctCont, m_sctSpName ); if( sc.isFailure() ){ - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Trig SP SCT container " << m_sctSpName <<" not found"<<endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "Trig SP SCT container " << m_sctSpName <<" not found"<<endmsg; return HLT::TOOL_FAILURE; } @@ -351,7 +351,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o if( msgLvl() <= MSG::VERBOSE ){ m_log << MSG::VERBOSE << " Formed " << m_nSctSP << " sct spacepoints" ; - m_log << MSG::VERBOSE << " with sctid module " << sctid << endreq; + m_log << MSG::VERBOSE << " with sctid module " << sctid << endmsg; } // total @@ -364,7 +364,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o if( nSctModIds <= m_maxnid ) { droppedSctModules.push_back(sctid); } else { - if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " sct modules are noisy, dump their id : " << sctid << endreq; + if (msgLvl() <= MSG::WARNING) m_log << MSG::WARNING << "More than " << m_maxnid << " sct modules are noisy, dump their id : " << sctid << endmsg; } } else{ @@ -381,10 +381,10 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o m_totNumSctSP = m_sctSpEndcapC + m_sctSpBarrel + m_sctSpEndcapA; if( msgLvl() <= MSG::DEBUG ){ - m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumSctSP << " sct spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapC << " sct ECC spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpBarrel << " sct Barr spacepoints in total." << endreq; - m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapA << " sct ECA spacepoints in total." << endreq; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_totNumSctSP << " sct spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapC << " sct ECC spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpBarrel << " sct Barr spacepoints in total." << endmsg; + m_log << MSG::DEBUG << "REGTEST : Formed " << m_sctSpEndcapA << " sct ECA spacepoints in total." << endmsg; } return HLT::OK; @@ -393,7 +393,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* o //--------------------------------------------------------------------------------------------------------------------------------------------- HLT::ErrorCode TrigLLPInnerDetectorHypo::hltFinalize() { - m_log << MSG::DEBUG << " finalizing TrigLLPInnerDetectorHypo : "<< name() << endreq; + m_log << MSG::DEBUG << " finalizing TrigLLPInnerDetectorHypo : "<< name() << endmsg; return HLT::OK; } diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx index 80e593cdf60..e424e9cd463 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx @@ -70,7 +70,7 @@ TrigLoFRemovalHypo::~TrigLoFRemovalHypo() HLT::ErrorCode TrigLoFRemovalHypo::hltInitialize() // ---------------------------------------------------------------------- { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted=0; @@ -85,8 +85,8 @@ HLT::ErrorCode TrigLoFRemovalHypo::hltInitialize() HLT::ErrorCode TrigLoFRemovalHypo::hltFinalize(){ // ---------------------------------------------------------------------- - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected<< " / "<< m_errors<< endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected<< " / "<< m_errors<< endmsg; return HLT::OK; } @@ -99,7 +99,7 @@ HLT::ErrorCode TrigLoFRemovalHypo::hltExecute(const HLT::TriggerElement* outputT if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << " in hltExecute() " << endreq; + msg() << MSG::DEBUG << " in hltExecute() " << endmsg; } m_cutCounter = -1; @@ -109,12 +109,12 @@ HLT::ErrorCode TrigLoFRemovalHypo::hltExecute(const HLT::TriggerElement* outputT std::string cellCollKey = "TrigCaloCellLoF"; const CaloCellContainer* theLoFCellCont = 0; if( HLT::ErrorCode ec = getFeature(outputTE, theLoFCellCont, cellCollKey) != HLT::OK) { - msg() << MSG::WARNING << "Failed to get TrigLoFCells" << endreq; + msg() << MSG::WARNING << "Failed to get TrigLoFCells" << endmsg; return HLT::OK; } if(msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << " Retrieved a Cell Container of Size= " << theLoFCellCont->size() << endreq; + msg() << MSG::DEBUG << " Retrieved a Cell Container of Size= " << theLoFCellCont->size() << endmsg; } //Use this to accept or reject events. @@ -132,10 +132,10 @@ HLT::ErrorCode TrigLoFRemovalHypo::hltExecute(const HLT::TriggerElement* outputT if(m_acceptAll || !this_event_is_a_LoF_event) { pass = true; m_accepted++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Not LoF event: accepted!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Not LoF event: accepted!" << endmsg; } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " LoF event: rejected!!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " LoF event: rejected!!" << endmsg; m_rejected++; m_cutCounter=1; } diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx index ec1a02ba4b1..ed4cf68882b 100755 --- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx +++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx @@ -40,7 +40,7 @@ TrigNewLoFHypo::~TrigNewLoFHypo() {} HLT::ErrorCode TrigNewLoFHypo::hltInitialize() { - msg() << MSG::INFO << "in initialize()" << endreq; + msg() << MSG::INFO << "in initialize()" << endmsg; m_accepted=0; m_rejected=0; @@ -51,8 +51,8 @@ HLT::ErrorCode TrigNewLoFHypo::hltInitialize() { HLT::ErrorCode TrigNewLoFHypo::hltFinalize(){ - msg() << MSG::INFO << "in finalize()" << endreq; - msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected<< " / "<< m_errors<< endreq; + msg() << MSG::INFO << "in finalize()" << endmsg; + msg() << MSG::INFO << "Events accepted/rejected/errors: "<< m_accepted <<" / "<<m_rejected<< " / "<< m_errors<< endmsg; return HLT::OK; } @@ -61,7 +61,7 @@ HLT::ErrorCode TrigNewLoFHypo::hltFinalize(){ HLT::ErrorCode TrigNewLoFHypo::hltExecute(const HLT::TriggerElement* outputTE, bool& pass) { if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << " in hltExecute() " << endreq; + msg() << MSG::DEBUG << " in hltExecute() " << endmsg; m_cutCounter = -1; @@ -71,13 +71,13 @@ HLT::ErrorCode TrigNewLoFHypo::hltExecute(const HLT::TriggerElement* outputTE, b std::vector<const TrigOperationalInfo*> m_vectorOperationalInfo; if (getFeatures(outputTE, m_vectorOperationalInfo, "CellLoFInfo") != HLT::OK) { if (msgLvl() <= MSG::WARNING) { - msg() << MSG::WARNING << "Failed to get TrigOperationalInfo" << endreq; + msg() << MSG::WARNING << "Failed to get TrigOperationalInfo" << endmsg; } return HLT::MISSING_FEATURE; } else { if (msgLvl() <= MSG::DEBUG) { - msg() << MSG::DEBUG << "Number of TrigOperationalInfo objects: " << m_vectorOperationalInfo.size() << endreq; + msg() << MSG::DEBUG << "Number of TrigOperationalInfo objects: " << m_vectorOperationalInfo.size() << endmsg; } } @@ -88,13 +88,13 @@ HLT::ErrorCode TrigNewLoFHypo::hltExecute(const HLT::TriggerElement* outputTE, b unsigned int m_size = (*m_operationalInfo)->infos().first.size(); if (m_size!=1) { - if (msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "Too much information from the same TrigOperationalInfo object" << endreq; + if (msgLvl() <= MSG::WARNING) msg() << MSG::WARNING << "Too much information from the same TrigOperationalInfo object" << endmsg; return HLT::NAV_ERROR; } m_numberCells = (*m_operationalInfo)->get("CellLoF"); - if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Number of calo cells passing LoF quality criteria: " << m_numberCells << endreq; + if (msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Number of calo cells passing LoF quality criteria: " << m_numberCells << endmsg; } } @@ -111,10 +111,10 @@ HLT::ErrorCode TrigNewLoFHypo::hltExecute(const HLT::TriggerElement* outputTE, b if(m_acceptAll || !this_event_is_a_LoF_event) { pass = true; m_accepted++; - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Not LoF event: accepted!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " Not LoF event: accepted!" << endmsg; } else { - if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " LoF event: rejected!!" << endreq; + if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << " LoF event: rejected!!" << endmsg; m_rejected++; m_cutCounter=1; } diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerFex.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerFex.cxx index 97cf37a866c..12d5e2e6afa 100755 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerFex.cxx +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerFex.cxx @@ -57,28 +57,28 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltInitialize() ///check configuration if(m_weights.size() != m_nDiscr){ - msg() << MSG::ERROR << "Weight list dont match with the number of discriminators found" << endreq; + msg() << MSG::ERROR << "Weight list dont match with the number of discriminators found" << endmsg; return StatusCode::FAILURE; } if(m_bias.size() != m_nDiscr){ - msg() << MSG::ERROR << "Bias list dont match with the number of discriminators found" << endreq; + msg() << MSG::ERROR << "Bias list dont match with the number of discriminators found" << endmsg; return StatusCode::FAILURE; } if((m_etaBins.size() != m_nDiscr) || (m_etBins.size() != m_nDiscr)){ - msg() << MSG::ERROR << "Eta/Et list dont match with the number of discriminators found" << endreq; + msg() << MSG::ERROR << "Eta/Et list dont match with the number of discriminators found" << endmsg; return StatusCode::FAILURE; } if(m_nRings.size() != m_normRings.size()){ - msg() << MSG::ERROR << "Preproc nRings list dont match with the number of discriminators found" << endreq; + msg() << MSG::ERROR << "Preproc nRings list dont match with the number of discriminators found" << endmsg; return StatusCode::FAILURE; } if(m_sectionRings.size() != m_normRings.size()){ - msg() << MSG::ERROR << "Preproc section rings list dont match with the number of discriminators found" << endreq; + msg() << MSG::ERROR << "Preproc section rings list dont match with the number of discriminators found" << endmsg; return StatusCode::FAILURE; } @@ -90,12 +90,12 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltInitialize() TrigRingerPreprocessor *preproc = nullptr; if ( msgLvl() <= MSG::INFO ) { - msg() << MSG::INFO << "Create multi layer perceptron discriminator using configuration:" << endreq; - msg() << MSG::INFO << " Input layer : " << m_nodes[i*SIZEOF_NODES+0] << endreq; - msg() << MSG::INFO << " Hidden layer : " << m_nodes[i*SIZEOF_NODES+1] << endreq; - msg() << MSG::INFO << " Output layer : " << m_nodes[i*SIZEOF_NODES+2] << endreq; - msg() << MSG::INFO << " Eta range : " << m_etaBins[i][0] << " < |eta| <=" << m_etaBins[i][1] << endreq; - msg() << MSG::INFO << " Et range : " << m_etBins[i][0] << " < Et[GeV] <=" << m_etBins[i][1] << endreq; + msg() << MSG::INFO << "Create multi layer perceptron discriminator using configuration:" << endmsg; + msg() << MSG::INFO << " Input layer : " << m_nodes[i*SIZEOF_NODES+0] << endmsg; + msg() << MSG::INFO << " Hidden layer : " << m_nodes[i*SIZEOF_NODES+1] << endmsg; + msg() << MSG::INFO << " Output layer : " << m_nodes[i*SIZEOF_NODES+2] << endmsg; + msg() << MSG::INFO << " Eta range : " << m_etaBins[i][0] << " < |eta| <=" << m_etaBins[i][1] << endmsg; + msg() << MSG::INFO << " Et range : " << m_etBins[i][0] << " < Et[GeV] <=" << m_etBins[i][1] << endmsg; } try{ ///Alloc discriminator @@ -108,18 +108,18 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltInitialize() m_etaBins[i][1]); } catch(std::bad_alloc xa){ - msg() << MSG::ERROR << "Weight vector size is not compatible with nodes vector." << endreq; + msg() << MSG::ERROR << "Weight vector size is not compatible with nodes vector." << endmsg; return StatusCode::FAILURE; } catch(int e){ if (e == BAD_WEIGHT_SIZE) { - msg() << MSG::ERROR << "Weight vector size is not compatible with nodes vector." << endreq; + msg() << MSG::ERROR << "Weight vector size is not compatible with nodes vector." << endmsg; return StatusCode::FAILURE; } if (e == BAD_BIAS_SIZE) { - msg() << MSG::ERROR << "Bias vector size is not compatible with nodes vector." << endreq; + msg() << MSG::ERROR << "Bias vector size is not compatible with nodes vector." << endmsg; return StatusCode::FAILURE; } }///try and catch alloc protection @@ -139,7 +139,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltInitialize() preproc = new TrigRingerPreprocessor(nrings,normrings,sectionrings); } catch(std::bad_alloc xa){ - msg() << MSG::ERROR << "Bad alloc for TrigRingerPrepoc." << endreq; + msg() << MSG::ERROR << "Bad alloc for TrigRingerPrepoc." << endmsg; return StatusCode::FAILURE; } @@ -155,7 +155,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltInitialize() }///Only if time is set on python config if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigL2CaloRingerHypo initialization completed successfully." << endreq; + msg() << MSG::DEBUG << "TrigL2CaloRingerHypo initialization completed successfully." << endmsg; return HLT::OK; } @@ -167,7 +167,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltFinalize() { if(m_discriminators.at(i)) delete m_discriminators.at(i); }///Loop over all discriminators and prepoc objects if ( msgLvl() <= MSG::DEBUG ) - msg() << MSG::DEBUG << "TrigL2CaloRingerHypo finalization completed successfully." << endreq; + msg() << MSG::DEBUG << "TrigL2CaloRingerHypo finalization completed successfully." << endmsg; return HLT::OK; } //!=============================================================================================== @@ -178,7 +178,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu ///Retrieve rings pattern information const xAOD::TrigRingerRings *ringerShape = get_rings(outputTE); if(!ringerShape){ - msg() << MSG::WARNING << "Can not retrieve xADO::TrigRingerRings from storegate." << endreq; + msg() << MSG::WARNING << "Can not retrieve xADO::TrigRingerRings from storegate." << endmsg; return HLT::OK; }///protection @@ -187,12 +187,12 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu ///Check if emCluster link exist if(!emCluster){ - msg() << MSG::WARNING << "Can not found the xAOD::TrigEMCluster link" << endreq; + msg() << MSG::WARNING << "Can not found the xAOD::TrigEMCluster link" << endmsg; return HLT::OK; }///protection if(msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG << "Event with roiword: 0x" << std::hex << emCluster->RoIword() << std::dec <<endreq; + msg() << MSG::DEBUG << "Event with roiword: 0x" << std::hex << emCluster->RoIword() << std::dec <<endmsg; } ///It's ready to select the correct eta/et bin @@ -218,13 +218,13 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu ///get shape const std::vector<float> rings = ringerShape->rings(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "ringerShape->rings().size() is: " <<rings.size() << endreq; + msg() << MSG::DEBUG << "ringerShape->rings().size() is: " <<rings.size() << endmsg; std::vector<float> refRings(rings.size()); refRings.assign(rings.begin(), rings.end()); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Et = " << et << " GeV, |eta| = " << eta << endreq; + msg() << MSG::DEBUG << "Et = " << et << " GeV, |eta| = " << eta << endmsg; ///pre-processing shape if(doTiming()) m_normTimer->start(); @@ -232,21 +232,21 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu if(doTiming()) m_normTimer->stop(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "after preproc refRings.size() is: " <<rings.size() << endreq; + msg() << MSG::DEBUG << "after preproc refRings.size() is: " <<rings.size() << endmsg; ///Apply the discriminator if(discr) m_output = discr->propagate(refRings); }else{ if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "There is no discriminator into this Fex." << endreq; + msg() << MSG::DEBUG << "There is no discriminator into this Fex." << endmsg; } if(doTiming()) m_decisionTimer->stop(); if(msgLvl() <= MSG::DEBUG) - msg() << MSG::DEBUG << "Et = " << et << " GeV, |eta| = " << eta << " and rnnoutput = " << m_output << endreq; + msg() << MSG::DEBUG << "Et = " << et << " GeV, |eta| = " << eta << " and rnnoutput = " << m_output << endmsg; if(doTiming()) m_storeTimer->start(); ///Store outout information for monitoring and studys @@ -260,7 +260,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu hltStatus = getFeatureLink<xAOD::TrigRingerRingsContainer,xAOD::TrigRingerRings>(outputTE, ringer_link); if( (hltStatus != HLT::OK) || (!ringer_link.isValid())){ - msg() << MSG::WARNING << "Failed to access ElementLink to TrigRingerRings" << endreq; + msg() << MSG::WARNING << "Failed to access ElementLink to TrigRingerRings" << endmsg; }else{ rnnOutput->setRingerLink( ringer_link ); } @@ -268,7 +268,7 @@ HLT::ErrorCode TrigL2CaloRingerFex::hltExecute(const HLT::TriggerElement* /*inpu if(doTiming()) m_storeTimer->stop(); if (hltStatus != HLT::OK) { - msg() << MSG::WARNING << "Failed to record xAOD::TrigRNNOutput to StoreGate." << endreq; + msg() << MSG::WARNING << "Failed to record xAOD::TrigRNNOutput to StoreGate." << endmsg; return HLT::OK; } diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypo.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypo.cxx index 214d0936f0a..1238c5f6407 100755 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypo.cxx +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypo.cxx @@ -38,7 +38,7 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltInitialize() m_nThresholds = m_thresholds.size(); if((m_etaBins.size() != m_nThresholds) && (m_etBins.size() != m_nThresholds)){ - msg() << MSG::ERROR << "Eta/Et list dont match with the number of thesholds found" << endreq; + msg() << MSG::ERROR << "Eta/Et list dont match with the number of thesholds found" << endmsg; return StatusCode::FAILURE; } @@ -50,13 +50,13 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltInitialize() m_cutDefs.push_back(new TrigL2CaloRingerHypo::CutDefsHelper(m_thresholds[i],m_etaBins[i][0],/* */m_etaBins[i][1], m_etBins[i][0],m_etBins[i][1])); }catch(std::bad_alloc xa){ - msg() << MSG::ERROR << "Can not alloc cutDefs on memory." << endreq; + msg() << MSG::ERROR << "Can not alloc cutDefs on memory." << endmsg; return StatusCode::FAILURE; } }///Loop over discriminators if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "TrigL2CaloRingerHypo initialization completed successfully." << endreq; + msg() << MSG::INFO << "TrigL2CaloRingerHypo initialization completed successfully." << endmsg; return HLT::OK; } @@ -67,7 +67,7 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltFinalize() { if(m_cutDefs[i]) delete m_cutDefs[i]; } if ( msgLvl() <= MSG::INFO ) - msg() << MSG::INFO << "TrigL2CaloRingerHypo finalization completed successfully." << endreq; + msg() << MSG::INFO << "TrigL2CaloRingerHypo finalization completed successfully." << endmsg; return HLT::OK; } //!=============================================================================================== @@ -79,14 +79,14 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltExecute(const HLT::TriggerElement* outpu if (m_acceptAll){ pass = true; if ( msgLvl() <= MSG::DEBUG ){ - msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endreq; + msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endmsg; } return HLT::OK; } const xAOD::TrigRNNOutput* rnnOutput = get_rnnOutput(outputTE); if(!rnnOutput){ - msg() << MSG::WARNING << "There is no xAO::TrigRNNOutput into the TriggerElement." << endreq; + msg() << MSG::WARNING << "There is no xAO::TrigRNNOutput into the TriggerElement." << endmsg; return HLT::OK; } @@ -95,11 +95,11 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltExecute(const HLT::TriggerElement* outpu if(ringerShape){ emCluster = ringerShape->emCluster(); if(!emCluster){ - msg() << MSG::WARNING << "There is no link to xAOD::TrigEMCluster into the Ringer object." << endreq; + msg() << MSG::WARNING << "There is no link to xAOD::TrigEMCluster into the Ringer object." << endmsg; return HLT::OK; } }else{ - msg() << MSG::WARNING << "There is no xAOD::TrigRingerRings link into the rnnOutput object." << endreq; + msg() << MSG::WARNING << "There is no xAOD::TrigRingerRings link into the rnnOutput object." << endmsg; return HLT::OK; } @@ -112,7 +112,7 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltExecute(const HLT::TriggerElement* outpu ///Et threshold if(et < m_emEtCut*1e-3){ if(msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG<< "Event reproved by Et threshold. Et = " << et << ", EtCut = " << m_emEtCut*1e-3 << endreq; + msg() << MSG::DEBUG<< "Event reproved by Et threshold. Et = " << et << ", EtCut = " << m_emEtCut*1e-3 << endmsg; } return HLT::OK; } @@ -125,16 +125,16 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltExecute(const HLT::TriggerElement* outpu if(output >= m_cutDefs[i]->threshold()){ if(msgLvl() <= MSG::DEBUG){///print event information - msg() << MSG::DEBUG << "Event information:" << endreq; - msg() << MSG::DEBUG << " " << m_cutDefs[i]->etmin() << "< Et ("<<et<<") GeV" << " <=" << m_cutDefs[i]->etmax() << endreq; - msg() << MSG::DEBUG << " " << m_cutDefs[i]->etamin() << "< |Eta| ("<<eta<<") " << " <=" << m_cutDefs[i]->etamax() << endreq; - msg() << MSG::DEBUG << " rnnOutput: " << output << " and threshold: " << m_cutDefs[i]->threshold() <<endreq; + msg() << MSG::DEBUG << "Event information:" << endmsg; + msg() << MSG::DEBUG << " " << m_cutDefs[i]->etmin() << "< Et ("<<et<<") GeV" << " <=" << m_cutDefs[i]->etmax() << endmsg; + msg() << MSG::DEBUG << " " << m_cutDefs[i]->etamin() << "< |Eta| ("<<eta<<") " << " <=" << m_cutDefs[i]->etamax() << endmsg; + msg() << MSG::DEBUG << " rnnOutput: " << output << " and threshold: " << m_cutDefs[i]->threshold() <<endmsg; } pass=true; }else{ if(msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG << "Event reproved by discriminator threshold" << endreq; + msg() << MSG::DEBUG << "Event reproved by discriminator threshold" << endmsg; } }///Threshold condition break; @@ -143,7 +143,7 @@ HLT::ErrorCode TrigL2CaloRingerHypo::hltExecute(const HLT::TriggerElement* outpu }///Loop over cutDefs }else{ if(msgLvl() <= MSG::DEBUG){ - msg() << MSG::DEBUG<< "There is no discriminator. Event approved by Et threshold." << endreq; + msg() << MSG::DEBUG<< "There is no discriminator. Event approved by Et threshold." << endmsg; } ///Only for EtCut pass=true; diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx index 34b8d90e74e..982d5889f0a 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx @@ -41,7 +41,7 @@ DumpAll::~DumpAll(){} StatusCode DumpAll::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing DumpAll" << endreq; + msg << MSG::DEBUG << "initializing DumpAll" << endmsg; m_counter = 0; std::string filename=name(); filename+=".DumpAll.root"; @@ -118,7 +118,7 @@ StatusCode DumpAll::initialize(){ // for cell <-> SCell comparison if ( m_cabling.retrieve().isFailure() ){ - msg << MSG::ERROR << "cannot perform comparisons between SuperCells and digits" << endreq; + msg << MSG::ERROR << "cannot perform comparisons between SuperCells and digits" << endmsg; } return StatusCode::SUCCESS; @@ -126,7 +126,7 @@ StatusCode DumpAll::initialize(){ StatusCode DumpAll::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing SimpleLArDigitsChecks" << endreq; + msg << MSG::DEBUG << "finalizing SimpleLArDigitsChecks" << endmsg; m_file->Write(); m_file->Close(); return StatusCode::SUCCESS; @@ -135,50 +135,50 @@ StatusCode DumpAll::finalize(){ StatusCode DumpAll::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute DumpAll" << endreq; + msg << MSG::DEBUG << "execute DumpAll" << endmsg; std::cout << "DumpAll" << std::endl; const CaloCellContainer* scells; if ( evtStore()->retrieve(scells,"SCell").isFailure() ){ - msg << MSG::WARNING << "did not find cell container" << endreq; + msg << MSG::WARNING << "did not find cell container" << endmsg; return StatusCode::SUCCESS; } /* if ( evtStore()->retrieve(allcalo,"LArDigitSCL1").isFailure() ){ - msg << MSG::WARNING << "did not find lardigit container for regular cells" << endreq; + msg << MSG::WARNING << "did not find lardigit container for regular cells" << endmsg; return StatusCode::SUCCESS; } */ const xAOD::VertexContainer* nvtx(NULL); if ( evtStore()->retrieve(nvtx,"PrimaryVertices").isFailure() ) { - msg << MSG::WARNING << "did not find Vectices container" << endreq; + msg << MSG::WARNING << "did not find Vectices container" << endmsg; return StatusCode::SUCCESS; } const xAOD::TrigEMClusterContainer* scluster(nullptr); if ( evtStore()->retrieve(scluster,m_inputClusterName).isFailure() ){ - msg << MSG::WARNING << "did not find super cluster container" << endreq; + msg << MSG::WARNING << "did not find super cluster container" << endmsg; return StatusCode::SUCCESS; } const xAOD::EmTauRoIContainer* lvl1(nullptr); if ( evtStore()->retrieve(lvl1,m_inputLvl1Name).isFailure() ){ - msg << MSG::WARNING << "did not find old l1 container" << endreq; + msg << MSG::WARNING << "did not find old l1 container" << endmsg; return StatusCode::SUCCESS; } const xAOD::TruthParticleContainer* truth; if ( evtStore()->retrieve(truth,"TruthParticles").isFailure() ) { - msg << MSG::WARNING << "did not find truth particle container" << endreq; + msg << MSG::WARNING << "did not find truth particle container" << endmsg; return StatusCode::SUCCESS; } const xAOD::ElectronContainer* electrons; if ( evtStore()->retrieve(electrons,"Electrons").isFailure() ) { - msg << MSG::WARNING << "did not find electron offline container" << endreq; + msg << MSG::WARNING << "did not find electron offline container" << endmsg; return StatusCode::SUCCESS; } bool caloavail=true; const CaloCellContainer* allcalo; if ( evtStore()->retrieve(allcalo,"AllCalo").isFailure() ) { - msg << MSG::WARNING << "did not find allcalo container" << endreq; + msg << MSG::WARNING << "did not find allcalo container" << endmsg; caloavail=false; } diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx index 8f76be619e5..01ffdda66d5 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx @@ -37,7 +37,7 @@ EFexAnalysis::~EFexAnalysis(){} StatusCode EFexAnalysis::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "initializing TrigT1CaloEFex" << endmsg; if ( m_enableMon ){ std::string histoName(name()); histoName+="Algo.root"; @@ -113,7 +113,7 @@ StatusCode EFexAnalysis::initialize(){ StatusCode EFexAnalysis::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "finalizing TrigT1CaloEFex" << endmsg; if ( m_enableMon ){ m_histFile->Write(); m_histFile->Close(); @@ -124,15 +124,15 @@ StatusCode EFexAnalysis::finalize(){ StatusCode EFexAnalysis::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "execute TrigT1CaloEFex" << endmsg; const xAOD::TrigEMClusterContainer* scluster(nullptr); if ( evtStore()->retrieve(scluster,m_inputClusterName).isFailure() ){ - msg << MSG::WARNING << "did not find super cluster container" << endreq; + msg << MSG::WARNING << "did not find super cluster container" << endmsg; return StatusCode::SUCCESS; } const xAOD::EmTauRoIContainer* lvl1(nullptr); if ( evtStore()->retrieve(lvl1,m_inputLvl1Name).isFailure() ){ - msg << MSG::WARNING << "did not find old l1 container" << endreq; + msg << MSG::WARNING << "did not find old l1 container" << endmsg; return StatusCode::SUCCESS; } if ( lvl1 ) { @@ -143,7 +143,7 @@ StatusCode EFexAnalysis::execute(){ const xAOD::VertexContainer* nvtx(NULL); int nvtxs=0; if ( evtStore()->retrieve(nvtx,"PrimaryVertices").isFailure() ) { - msg << MSG::WARNING << "did not find Vectices container" << endreq; + msg << MSG::WARNING << "did not find Vectices container" << endmsg; return StatusCode::SUCCESS; } if ( nvtx != NULL) nvtxs = nvtx->size(); @@ -181,7 +181,7 @@ StatusCode EFexAnalysis::execute(){ if ( m_doTruth ) { const xAOD::TruthParticleContainer* truth; if ( evtStore()->retrieve(truth,"TruthParticles").isFailure() ) { - msg << MSG::WARNING << "did not find truth particle container" << endreq; + msg << MSG::WARNING << "did not find truth particle container" << endmsg; return StatusCode::SUCCESS; } @@ -215,7 +215,7 @@ StatusCode EFexAnalysis::execute(){ if ( m_doOffline ){ const xAOD::ElectronContainer* electrons; if ( evtStore()->retrieve(electrons,"Electrons").isFailure() ) { - msg << MSG::WARNING << "did not find electron offline container" << endreq; + msg << MSG::WARNING << "did not find electron offline container" << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleLArDigitsChecks.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleLArDigitsChecks.cxx index d3f9966c215..b8574643d07 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleLArDigitsChecks.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleLArDigitsChecks.cxx @@ -33,7 +33,7 @@ SimpleLArDigitsChecks::~SimpleLArDigitsChecks(){} StatusCode SimpleLArDigitsChecks::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing SimpleLArDigitsChecks" << endreq; + msg << MSG::DEBUG << "initializing SimpleLArDigitsChecks" << endmsg; std::string filename=name(); filename+=".BasicCheck.root"; counter=0; @@ -122,7 +122,7 @@ StatusCode SimpleLArDigitsChecks::initialize(){ // for cell <-> SCell comparison if ( m_cabling.retrieve().isFailure() ){ - msg << MSG::ERROR << "cannot perform comparisons between SuperCells and digits" << endreq; + msg << MSG::ERROR << "cannot perform comparisons between SuperCells and digits" << endmsg; } return StatusCode::SUCCESS; @@ -130,7 +130,7 @@ StatusCode SimpleLArDigitsChecks::initialize(){ StatusCode SimpleLArDigitsChecks::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing SimpleLArDigitsChecks" << endreq; + msg << MSG::DEBUG << "finalizing SimpleLArDigitsChecks" << endmsg; m_file->Write(); m_file->Close(); return StatusCode::SUCCESS; @@ -139,20 +139,20 @@ StatusCode SimpleLArDigitsChecks::finalize(){ StatusCode SimpleLArDigitsChecks::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute SimpleLArDigitsChecks" << endreq; + msg << MSG::DEBUG << "execute SimpleLArDigitsChecks" << endmsg; const CaloCellContainer* scells; const LArDigitContainer* allcalo(NULL); if ( evtStore()->retrieve(scells,"SCell").isFailure() ){ - msg << MSG::WARNING << "did not find cell container" << endreq; + msg << MSG::WARNING << "did not find cell container" << endmsg; return StatusCode::SUCCESS; } if ( evtStore()->retrieve(allcalo,"LArDigitSCL1").isFailure() ){ - msg << MSG::WARNING << "did not find lardigit container for regular cells" << endreq; + msg << MSG::WARNING << "did not find lardigit container for regular cells" << endmsg; return StatusCode::SUCCESS; } const xAOD::VertexContainer* nvtx(NULL); if ( evtStore()->retrieve(nvtx,"PrimaryVertices").isFailure() ) { - msg << MSG::WARNING << "did not find Vectices container" << endreq; + msg << MSG::WARNING << "did not find Vectices container" << endmsg; return StatusCode::SUCCESS; } unsigned int count_sCells=0; diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleSuperCellChecks.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleSuperCellChecks.cxx index 1073bd33924..dacd6df2dd7 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleSuperCellChecks.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/SimpleSuperCellChecks.cxx @@ -31,7 +31,7 @@ SimpleSuperCellChecks::~SimpleSuperCellChecks(){} StatusCode SimpleSuperCellChecks::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing SimpleSuperCellChecks" << endreq; + msg << MSG::DEBUG << "initializing SimpleSuperCellChecks" << endmsg; std::string filename=name(); filename+=".BasicCheck.root"; counter=0; @@ -290,7 +290,7 @@ StatusCode SimpleSuperCellChecks::initialize(){ // for cell <-> SCell comparison if ( m_scidtool.retrieve().isFailure() ){ - msg << MSG::ERROR << "cannot perform comparisons between cell and SuperCells" << endreq; + msg << MSG::ERROR << "cannot perform comparisons between cell and SuperCells" << endmsg; } return StatusCode::SUCCESS; @@ -298,7 +298,7 @@ StatusCode SimpleSuperCellChecks::initialize(){ StatusCode SimpleSuperCellChecks::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing SimpleSuperCellChecks" << endreq; + msg << MSG::DEBUG << "finalizing SimpleSuperCellChecks" << endmsg; m_file->Write(); m_file->Close(); return StatusCode::SUCCESS; @@ -307,20 +307,20 @@ StatusCode SimpleSuperCellChecks::finalize(){ StatusCode SimpleSuperCellChecks::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute SimpleSuperCellChecks" << endreq; + msg << MSG::DEBUG << "execute SimpleSuperCellChecks" << endmsg; const CaloCellContainer* scells; const CaloCellContainer* allcalo(NULL); if ( evtStore()->retrieve(scells,"SCell").isFailure() ){ - msg << MSG::WARNING << "did not find cell container" << endreq; + msg << MSG::WARNING << "did not find cell container" << endmsg; return StatusCode::SUCCESS; } if ( evtStore()->retrieve(allcalo,"AllCalo").isFailure() ){ - msg << MSG::WARNING << "did not find cell container for regular cells, no resolution test possible" << endreq; + msg << MSG::WARNING << "did not find cell container for regular cells, no resolution test possible" << endmsg; } const xAOD::VertexContainer* nvtx(NULL); int nvtxs=0; if ( evtStore()->retrieve(nvtx,"PrimaryVertices").isFailure() ) { - msg << MSG::WARNING << "did not find Vectices container" << endreq; + msg << MSG::WARNING << "did not find Vectices container" << endmsg; return StatusCode::SUCCESS; } if ( nvtx != NULL) nvtxs = nvtx->size(); @@ -414,12 +414,12 @@ StatusCode SimpleSuperCellChecks::execute(){ m_nSCells_perLayer[11]->Fill ( count_sCells_Layer11 ); if ( !allcalo || !m_scidtool ) { // VERY IMPORTANT - msg << MSG::ERROR << "Nothing more to be done, finish here" << endreq; + msg << MSG::ERROR << "Nothing more to be done, finish here" << endmsg; return StatusCode::SUCCESS; } const CaloIdManager* m_calo_id_manager; if ( (detStore()->retrieve(m_calo_id_manager,"CaloIdManager")).isFailure() ){ - msg << MSG::ERROR << "Not able to map Calo IDs." << endreq; + msg << MSG::ERROR << "Not able to map Calo IDs." << endmsg; return StatusCode::SUCCESS; } const CaloCell_SuperCell_ID* calo_sc_id = m_calo_id_manager->getCaloCell_SuperCell_ID(); @@ -428,7 +428,7 @@ StatusCode SimpleSuperCellChecks::execute(){ std::vector<std::vector<float> > sc_times; sc_times.resize(40000); for(auto cell : *allcalo) { int idx = calo_sc_id->calo_cell_hash( m_scidtool->offlineToSuperCellID ( cell->ID() ) ); - if ( idx < 0 or idx > 37000 ) { msg << MSG::DEBUG << "Problems with index : " << cell->ID().get_identifier32().get_compact() << " " << m_scidtool->offlineToSuperCellID ( cell->ID() ) << " " << idx << endreq; continue; } + if ( idx < 0 or idx > 37000 ) { msg << MSG::DEBUG << "Problems with index : " << cell->ID().get_identifier32().get_compact() << " " << m_scidtool->offlineToSuperCellID ( cell->ID() ) << " " << idx << endmsg; continue; } sc_ets[idx] += cell->et(); sc_etsk[idx].push_back( cell->et() ); sc_times[idx].push_back( cell->time() ); diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloBaseFex.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloBaseFex.cxx index 7dfe1298b84..a26b5d684b8 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloBaseFex.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloBaseFex.cxx @@ -27,7 +27,7 @@ TrigT1CaloBaseFex::TrigT1CaloBaseFex( const std::string& name, ISvcLocator* pSvc StatusCode TrigT1CaloBaseFex::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing TrigT1CaloBaseFex" << endreq; + msg << MSG::DEBUG << "initializing TrigT1CaloBaseFex" << endmsg; m_cellsAboveThr.reserve(200); m_cellsAround.reserve(200); return StatusCode::SUCCESS; @@ -35,7 +35,7 @@ StatusCode TrigT1CaloBaseFex::initialize(){ StatusCode TrigT1CaloBaseFex::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing TrigT1CaloBaseFex" << endreq; + msg << MSG::DEBUG << "finalizing TrigT1CaloBaseFex" << endmsg; m_cellsAboveThr.clear(); m_cellsAround.clear(); return StatusCode::SUCCESS; @@ -46,11 +46,11 @@ StatusCode TrigT1CaloBaseFex::getContainers(CaloCellContainer*& scells, const xA MsgStream msg(msgSvc(), name()); const CaloCellContainer* scells_from_sg; if ( evtStore()->retrieve(scells_from_sg,"SCell").isFailure() ){ - msg << MSG::WARNING << "did not find cell container" << endreq; + msg << MSG::WARNING << "did not find cell container" << endmsg; return StatusCode::SUCCESS; } if ( evtStore()->retrieve(TTs,"xAODTriggerTowers").isFailure() ){ - msg << MSG::WARNING << "did not find TT container" << endreq; + msg << MSG::WARNING << "did not find TT container" << endmsg; return StatusCode::SUCCESS; } @@ -68,11 +68,11 @@ StatusCode TrigT1CaloBaseFex::getContainers(CaloCellContainer*& scells, const xA } for(auto scell : *scells) { if ( scell->et() < 3e3 ) continue; - msg << MSG::DEBUG << "scell : " << scell->et() << " " << scell->eta() << " " << scell->phi() << endreq; + msg << MSG::DEBUG << "scell : " << scell->et() << " " << scell->eta() << " " << scell->phi() << endmsg; } for(auto TT : *TTs) { if ( TT->pt() < 3 ) continue; - msg << MSG::DEBUG << "TT : " << TT->pt() << " " << TT->eta() << " " << TT->phi() << endreq; + msg << MSG::DEBUG << "TT : " << TT->pt() << " " << TT->eta() << " " << TT->phi() << endmsg; } return StatusCode::SUCCESS; } @@ -82,11 +82,11 @@ StatusCode TrigT1CaloBaseFex::getContainers(CaloCellContainer*& scells, const xA MsgStream msg(msgSvc(), name()); const CaloCellContainer* scells_from_sg; if ( evtStore()->retrieve(scells_from_sg,"SCell").isFailure() ){ - msg << MSG::WARNING << "did not find cell container" << endreq; + msg << MSG::WARNING << "did not find cell container" << endmsg; return StatusCode::SUCCESS; } if ( evtStore()->retrieve(TTs,"xAODTriggerTowers").isFailure() ){ - msg << MSG::WARNING << "did not find TT container" << endreq; + msg << MSG::WARNING << "did not find TT container" << endmsg; return StatusCode::SUCCESS; } @@ -106,11 +106,11 @@ StatusCode TrigT1CaloBaseFex::getContainers(CaloCellContainer*& scells, const xA for(auto scell : *scells) { if ( scell->et() < etThresholdGeV*1e3 ) continue; - msg << MSG::DEBUG << "scell : " << scell->et() << " " << scell->eta() << " " << scell->phi() << endreq; + msg << MSG::DEBUG << "scell : " << scell->et() << " " << scell->eta() << " " << scell->phi() << endmsg; } for(auto TT : *TTs) { if ( TT->pt() < etThresholdGeV ) continue; - msg << MSG::DEBUG << "TT : " << TT->pt() << " " << TT->eta() << " " << TT->phi() << endreq; + msg << MSG::DEBUG << "TT : " << TT->pt() << " " << TT->eta() << " " << TT->phi() << endmsg; } return StatusCode::SUCCESS; } @@ -119,7 +119,7 @@ StatusCode TrigT1CaloBaseFex::getContainers(const xAOD::TruthParticleContainer*& MsgStream msg(msgSvc(), name()); if ( evtStore()->retrieve(truthContainer,"TruthParticles").isFailure() ){ - msg << MSG::WARNING << "did not find Truth container" << endreq; + msg << MSG::WARNING << "did not find Truth container" << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx index 95d04719e3f..5f902e78542 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloEFex.cxx @@ -37,7 +37,7 @@ StatusCode TrigT1CaloEFex::initialize(){ if ( TrigT1CaloBaseFex::initialize().isFailure() ) return StatusCode::FAILURE; MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "initializing TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "initializing TrigT1CaloEFex" << endmsg; if ( m_enableMon ){ std::string histoName(name()); histoName+="Algo.root"; @@ -55,7 +55,7 @@ StatusCode TrigT1CaloEFex::initialize(){ StatusCode TrigT1CaloEFex::finalize(){ if ( TrigT1CaloBaseFex::finalize().isFailure() ) return StatusCode::FAILURE; MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "finalizing TrigT1CaloEFex" << endmsg; if ( m_enableMon ) { m_histFile->Write(); m_histFile->Close(); @@ -66,12 +66,12 @@ StatusCode TrigT1CaloEFex::finalize(){ StatusCode TrigT1CaloEFex::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute TrigT1CaloEFex" << endreq; + msg << MSG::DEBUG << "execute TrigT1CaloEFex" << endmsg; CaloCellContainer* scells(0); const xAOD::TriggerTowerContainer* TTs(0); if ( getContainers(scells, TTs).isFailure() || (TTs==0) ) { - msg << MSG::WARNING << " Could not get containers" << endreq; + msg << MSG::WARNING << " Could not get containers" << endmsg; return StatusCode::SUCCESS; } @@ -83,11 +83,11 @@ StatusCode TrigT1CaloEFex::execute(){ clusters->setStore(auxclusters); std::string clusterName(m_outputClusterName); if ( evtStore()->record(clusters,clusterName).isFailure() ){ - msg << MSG::ERROR << "recording was not possible" << endreq; + msg << MSG::ERROR << "recording was not possible" << endmsg; return StatusCode::FAILURE; } if ( evtStore()->record(auxclusters,clusterName+"Aux.").isFailure() ){ - msg << MSG::ERROR << "recording Aux was not possible" << endreq; + msg << MSG::ERROR << "recording Aux was not possible" << endmsg; return StatusCode::FAILURE; } // Loop over seed cells, this should give us @@ -112,7 +112,7 @@ StatusCode TrigT1CaloEFex::execute(){ clusterTime /=clusterTimeWeight; else clusterTime = -999.99; msg << MSG::DEBUG << "CELL versus CLUSTER : " << cellAbove->eta() << " " << cellAbove->phi() << " " << etaCluster << " " << phiCluster << - " " << cellAbove->eta()-etaCluster << " " << cellAbove->phi()-phiCluster << endreq; + " " << cellAbove->eta()-etaCluster << " " << cellAbove->phi()-phiCluster << endmsg; // if find the cluster position fails, etaCluster=999.0 if ( etaCluster > 998.0 ) continue; // other cluster sizes for some of the shower shapes diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloTauFex.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloTauFex.cxx index f715091e669..597903e68a8 100644 --- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloTauFex.cxx +++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/TrigT1CaloTauFex.cxx @@ -68,7 +68,7 @@ TrigT1CaloTauFex::~TrigT1CaloTauFex(){ StatusCode TrigT1CaloTauFex::initialize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::INFO << "initialing TrigT1CaloTauFex" << endreq; + msg << MSG::INFO << "initialing TrigT1CaloTauFex" << endmsg; if ( TrigT1CaloBaseFex::initialize().isFailure() ) return StatusCode::FAILURE; if ( m_enableMon ){ std::string histoName(name()); @@ -78,15 +78,15 @@ StatusCode TrigT1CaloTauFex::initialize(){ // TODO: add here initialisation of other histos ... } - msg << MSG::INFO << " REGTEST: TrigT1CaloTauFex configurations: " <<endreq; - msg << MSG::INFO << " REGTEST: EnableMonitoring " << m_enableMon <<endreq; - msg << MSG::INFO << " REGTEST: CellsEtThreholdGeV " << m_cellsEtThrehold << " GeV" << endreq; - msg << MSG::INFO << " REGTEST: DoTruth " << m_doTruth <<endreq; - msg << MSG::INFO << " REGTEST: TruthMaxEta " << m_truth_maxEta_thr <<endreq; - msg << MSG::INFO << " REGTEST: TruthMinPtGeV " << m_truth_minPt_thr << " GeV" <<endreq; - msg << MSG::INFO << " REGTEST: NoiseSignificanceCore " << m_NoiseSignificanceCore <<endreq; - msg << MSG::INFO << " REGTEST: NoiseSignificanceIso " << m_NoiseSignificanceIso <<endreq; - msg << MSG::INFO << " REGTEST: OutputClusterName " << m_outputClusterName <<endreq; + msg << MSG::INFO << " REGTEST: TrigT1CaloTauFex configurations: " <<endmsg; + msg << MSG::INFO << " REGTEST: EnableMonitoring " << m_enableMon <<endmsg; + msg << MSG::INFO << " REGTEST: CellsEtThreholdGeV " << m_cellsEtThrehold << " GeV" << endmsg; + msg << MSG::INFO << " REGTEST: DoTruth " << m_doTruth <<endmsg; + msg << MSG::INFO << " REGTEST: TruthMaxEta " << m_truth_maxEta_thr <<endmsg; + msg << MSG::INFO << " REGTEST: TruthMinPtGeV " << m_truth_minPt_thr << " GeV" <<endmsg; + msg << MSG::INFO << " REGTEST: NoiseSignificanceCore " << m_NoiseSignificanceCore <<endmsg; + msg << MSG::INFO << " REGTEST: NoiseSignificanceIso " << m_NoiseSignificanceIso <<endmsg; + msg << MSG::INFO << " REGTEST: OutputClusterName " << m_outputClusterName <<endmsg; if(m_doTruth){ m_true_nprong.reserve(200); @@ -100,7 +100,7 @@ StatusCode TrigT1CaloTauFex::initialize(){ StatusCode TrigT1CaloTauFex::finalize(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "finalizing TrigT1CaloTauFex" << endreq; + msg << MSG::DEBUG << "finalizing TrigT1CaloTauFex" << endmsg; if ( TrigT1CaloBaseFex::finalize().isFailure() ) return StatusCode::FAILURE; if ( m_enableMon ) { m_histFile->Write(); @@ -120,25 +120,25 @@ StatusCode TrigT1CaloTauFex::finalize(){ StatusCode TrigT1CaloTauFex::execute(){ MsgStream msg(msgSvc(), name()); - msg << MSG::DEBUG << "execute TrigT1CaloTauFex" << endreq; + msg << MSG::DEBUG << "execute TrigT1CaloTauFex" << endmsg; CaloCellContainer* scells(0); const xAOD::TriggerTowerContainer* TTs(0); const xAOD::TruthParticleContainer *truthContainer(0); if ( getContainers(scells, TTs, m_cellsEtThrehold).isFailure() || (TTs==0) || (scells==0) ) { - msg << MSG::WARNING << " Could not get scell or TT containers" << endreq; + msg << MSG::WARNING << " Could not get scell or TT containers" << endmsg; return StatusCode::SUCCESS; } if(m_doTruth){ if ( getContainers(truthContainer).isFailure() || (truthContainer==0) ) { - msg << MSG::WARNING << " Could not get truth containers" << endreq; + msg << MSG::WARNING << " Could not get truth containers" << endmsg; return StatusCode::SUCCESS; } Truth(truthContainer); if(m_true_vistau.size()!=2){ - msg << MSG::WARNING << "Found " << m_true_vistau.size() << " instead of 2, skipping event" << endreq; + msg << MSG::WARNING << "Found " << m_true_vistau.size() << " instead of 2, skipping event" << endmsg; return StatusCode::SUCCESS; } } @@ -173,11 +173,11 @@ StatusCode TrigT1CaloTauFex::execute(){ // do this check before) ///if ( ! isCellEmMaximum ( m_cellsAround, cellAbove ) ) continue; ///float et = sumEmCells( m_cellsAround )/TMath::CosH(cellAbove->eta()); - ///msg << MSG::INFO << "Tau found at (eta,phi)=(" << etaCluster << "," << phiCluster << ") with ET of : " << et << endreq; + ///msg << MSG::INFO << "Tau found at (eta,phi)=(" << etaCluster << "," << phiCluster << ") with ET of : " << et << endmsg; } for (unsigned int i=0; i<m_RoI.size(); i++) { //for( auto RoI : m_RoI ) { - msg << MSG::INFO << "RoI in the loop=" << m_RoI.at(0).at(0) << endreq; + msg << MSG::INFO << "RoI in the loop=" << m_RoI.at(0).at(0) << endmsg; } return StatusCode::SUCCESS; } diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostRun.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostRun.cxx index 61b46605230..82c64aea6cb 100644 --- a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostRun.cxx +++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostRun.cxx @@ -90,7 +90,7 @@ StatusCode TrigCostRun::initialize() ATH_MSG_DEBUG("Retrieved : " << m_tools); CHECK(m_toolsSave.retrieve()); - ATH_MSG_DEBUG("Retrieved " << m_toolsSave << endreq); + ATH_MSG_DEBUG("Retrieved " << m_toolsSave << endmsg); // @@ -387,27 +387,27 @@ bool TrigCostRun::ReadHLTResult::ReadResult(ServiceHandle<StoreGateSvc> &storeGa // Find HLTResult and extract application id // if(!storeGate->contains<HLT::HLTResult>(keyResult)) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "StoreGate does not contain HLTResult: " << keyResult << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "StoreGate does not contain HLTResult: " << keyResult << endmsg; return false; } const HLT::HLTResult *hlt_result = 0; if(storeGate->retrieve<HLT::HLTResult>(hlt_result, keyResult).isFailure() || !hlt_result) { - log() << MSG::WARNING << "Failed to retrieve HLTResult: " << keyResult << endreq; + log() << MSG::WARNING << "Failed to retrieve HLTResult: " << keyResult << endmsg; return false; } else { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Found HLTResult: " << keyResult << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Found HLTResult: " << keyResult << endmsg; } if(hlt_result->isHLTResultTruncated()) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "HLTResult is truncated" << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "HLTResult is truncated" << endmsg; ++countTrunc; } const std::vector<uint32_t>& navData = hlt_result->getNavigationResult(); if(navData.empty()) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Navigation data is empty" << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Navigation data is empty" << endmsg; return false; } @@ -415,14 +415,14 @@ bool TrigCostRun::ReadHLTResult::ReadResult(ServiceHandle<StoreGateSvc> &storeGa ScopeResumePauseTimer scopeTimer(timerNavig, false); if(!navigation->deserialize(navData)) { - log() << MSG::WARNING << "Failed to deserialize navigation" << endreq; + log() << MSG::WARNING << "Failed to deserialize navigation" << endmsg; return false; } } const std::vector<uint32_t> &extraData = hlt_result->getExtras(); if(extraData.empty()) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Extra data is empty" << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Extra data is empty" << endmsg; return true; } @@ -432,34 +432,34 @@ bool TrigCostRun::ReadHLTResult::ReadResult(ServiceHandle<StoreGateSvc> &storeGa StringSerializer().deserialize(extraData, appName); if(appName.empty()) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Application name is empty" << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Application name is empty" << endmsg; return true; } if(hlt_result->getHLTLevel() == HLT::L2) { if(hltLevel != "L2") { - log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endreq; + log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endmsg; } } else if(hlt_result->getHLTLevel() == HLT::EF) { if(hltLevel != "EF") { - log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endreq; + log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endmsg; } } else if(hlt_result->getHLTLevel() == HLT::HLT) { if(hltLevel != "HLT") { - log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endreq; + log() << MSG::WARNING << "HLT level error: " << hltLevel << "!=" << hlt_result->getHLTLevel() << endmsg; } } else { - log() << MSG::WARNING << "Unknown level for HLTResult: " << hlt_result->getHLTLevel() << endreq; + log() << MSG::WARNING << "Unknown level for HLTResult: " << hlt_result->getHLTLevel() << endmsg; } // // Append application ID with level string // appName = "APP_"+hltLevel+":"+appName; - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Extracted App Name: " << appName << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Extracted App Name: " << appName << endmsg; // // Save a map between application name and application id (hashed name) in global config @@ -489,16 +489,16 @@ bool TrigCostRun::ReadHLTResult::ReadConfig(ServiceHandle<StoreGateSvc> &storeGa ScopeResumePauseTimer scopeTimer(timerNavig, false); if(!storeGate->contains<TrigMonConfigCollection>(keyConfig)) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "TrigMonConfigCollection does not exist: " << keyConfig << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "TrigMonConfigCollection does not exist: " << keyConfig << endmsg; return false; } if(storeGate->retrieve(configCol, keyConfig).isFailure() || !configCol) { - log() << MSG::WARNING << "Failed to retrieve TrigMonConfigCollection: " << keyConfig << endreq; + log() << MSG::WARNING << "Failed to retrieve TrigMonConfigCollection: " << keyConfig << endmsg; return false; } - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Found TrigMonConfigCollection: " << keyConfig << " size=" << configCol->size() << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Found TrigMonConfigCollection: " << keyConfig << " size=" << configCol->size() << endmsg; } for(TrigMonConfigCollection::const_iterator it = configCol->begin(); it != configCol->end(); ++it) { @@ -516,7 +516,7 @@ bool TrigCostRun::ReadHLTResult::ReadConfig(ServiceHandle<StoreGateSvc> &storeGa const std::vector<uint32_t> &ids = ptr->getVarId(); if(!std::count(ids.begin(), ids.end(), appId)) { ptr->add<TrigConfVar>(TrigConfVar(appName, appId)); - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Attaching App Name map to Config " << appName << " = " << appId << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Attaching App Name map to Config " << appName << " = " << appId << endmsg; } // @@ -526,7 +526,7 @@ bool TrigCostRun::ReadHLTResult::ReadConfig(ServiceHandle<StoreGateSvc> &storeGa log() << MSG::INFO << "ExtractConfig M:" << ptr->getMasterKey() << " L1:" << ptr->getLV1PrescaleKey() << " HLT:" << ptr->getHLTPrescaleKey() - << " Lumi:" << ptr->getLumi() << endreq; + << " Lumi:" << ptr->getLumi() << endmsg; } // @@ -552,12 +552,12 @@ bool TrigCostRun::ReadHLTResult::ReadEvent(ServiceHandle<StoreGateSvc> &storeGat ScopeResumePauseTimer scopeTimer(timerNavig, false); if(!storeGate->contains<TrigMonEventCollection>(keyEvent)) { - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "TrigMonEventCollection does not exist: " << keyEvent << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "TrigMonEventCollection does not exist: " << keyEvent << endmsg; return false; } if(storeGate->retrieve(eventCol, keyEvent).isFailure() || !eventCol) { - log() << MSG::WARNING << "Failed to retrieve TrigMonEventCollection: " << keyEvent << endreq; + log() << MSG::WARNING << "Failed to retrieve TrigMonEventCollection: " << keyEvent << endmsg; return false; } } @@ -594,18 +594,18 @@ bool TrigCostRun::ReadHLTResult::ReadEvent(ServiceHandle<StoreGateSvc> &storeGat for (unsigned i=0; i < ptr->getVarKey().size(); ++i) { if (ptr->getVarKey().at(i) == Trig::kEventLumiBlockLength) { _haveLumiLength = true; - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Lumi length already stored in event" << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Lumi length already stored in event" << endmsg; break; } } if (_haveLumiLength == false) { if (m_readLumiBlock.getTriedSetup() == false) { - log() << MSG::INFO << "Reading lumi length" << endreq; + log() << MSG::INFO << "Reading lumi length" << endmsg; m_readLumiBlock.updateLumiBlocks( ptr->getRun() ); } ptr->addVar(Trig::kEventLumiBlockLength, m_readLumiBlock.getLumiBlockLength(ptr->getLumi())); // 43 is lumi block length - if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Decorating Event:" << ptr->getEvent() << " LB:"<< ptr->getLumi()<<" with LB Length " << m_readLumiBlock.getLumiBlockLength( ptr->getLumi()) << endreq; + if(outputLevel <= MSG::DEBUG) log() << MSG::DEBUG << "Decorating Event:" << ptr->getEvent() << " LB:"<< ptr->getLumi()<<" with LB Length " << m_readLumiBlock.getLumiBlockLength( ptr->getLumi()) << endmsg; std::string _msg = m_readLumiBlock.infos(); if (_msg.size()) log() << MSG::INFO << _msg; std::string _dbg = m_readLumiBlock.debug(); @@ -638,10 +638,10 @@ void TrigCostRun::ReadHLTResult::PrintInit() // Print summary counters // log() << MSG::INFO - << " " << hltLevel << ": HLTResult key = " << keyResult << endreq - << " " << hltLevel << ": TrigMonConfig key = " << keyConfig << endreq - << " " << hltLevel << ": TrigMonEvent key = " << keyEvent << endreq - << " " << hltLevel << ": Enabled = " << (doLevel ? "Yes" : "NO") << endreq; + << " " << hltLevel << ": HLTResult key = " << keyResult << endmsg + << " " << hltLevel << ": TrigMonConfig key = " << keyConfig << endmsg + << " " << hltLevel << ": TrigMonEvent key = " << keyEvent << endmsg + << " " << hltLevel << ": Enabled = " << (doLevel ? "Yes" : "NO") << endmsg; } //--------------------------------------------------------------------------------------- @@ -654,7 +654,7 @@ void TrigCostRun::ReadHLTResult::PrintEvent() // Print current events in memory // log() << MSG::INFO << "Extracted TrigMonEventCollection: " << keyEvent - << " with: " << vecEvent.size() << " event(s)" << endreq; + << " with: " << vecEvent.size() << " event(s)" << endmsg; static unsigned _nPrinted = 0; for(unsigned i = 0; i < vecEvent.size(); ++i) { @@ -676,10 +676,10 @@ void TrigCostRun::ReadHLTResult::PrintSummary() // Print summary counters // log() << MSG::INFO - << " " << hltLevel << ": POST_HLT: # of valid HLT results = " << countValid << endreq - << " " << hltLevel << ": POST_HLT: # of invalid HLT results = " << countInvalid << endreq - << " " << hltLevel << ": POST_HLT: # of truncated HLT results = " << countTrunc << endreq - << " " << hltLevel << ": POST_HLT: # of read TrigMonEvent = " << countEvent << endreq - << " " << hltLevel << ": POST_HLT: # of read TrigMonCostEvent = " << countCostEvent << "(In which scale tools were run)" << endreq - << " " << hltLevel << ": POST_HLT: # of read TrigMonConfig = " << countConfig << endreq; + << " " << hltLevel << ": POST_HLT: # of valid HLT results = " << countValid << endmsg + << " " << hltLevel << ": POST_HLT: # of invalid HLT results = " << countInvalid << endmsg + << " " << hltLevel << ": POST_HLT: # of truncated HLT results = " << countTrunc << endmsg + << " " << hltLevel << ": POST_HLT: # of read TrigMonEvent = " << countEvent << endmsg + << " " << hltLevel << ": POST_HLT: # of read TrigMonCostEvent = " << countCostEvent << "(In which scale tools were run)" << endmsg + << " " << hltLevel << ": POST_HLT: # of read TrigMonConfig = " << countConfig << endmsg; } diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtEBWeightTool.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtEBWeightTool.cxx index 97b9e75956f..dcf1b0a0149 100644 --- a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtEBWeightTool.cxx +++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtEBWeightTool.cxx @@ -72,10 +72,10 @@ namespace Trig { // Helper function for (_it = _chains.begin(); _it != _chains.end(); ++_it) { TrigConfChain _chain = (*_it); if (_chain.getChainName() != _toFind) continue; - (*_log) << MSG::DEBUG << "--- Tabulating prescale " << _toFind << " PS:" << _chain.getPrescale() << endreq; + (*_log) << MSG::DEBUG << "--- Tabulating prescale " << _toFind << " PS:" << _chain.getPrescale() << endmsg; return _chain.getPrescale(); } - (*_log) << MSG::ERROR << "!!! Cannot find PS for " << _toFind << endreq; + (*_log) << MSG::ERROR << "!!! Cannot find PS for " << _toFind << endmsg; return 1.; } } diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx index 2c6ea094491..dcb67734088 100644 --- a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx +++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx @@ -353,12 +353,12 @@ bool Trig::TrigNtVarsTool::CollectPU(TrigMonEvent& /*event*/) // } // log() << MSG::DEBUG - // << "Number of minbias events = " << nminbias << endreq - // << "Number of cavern events = " << ncavern << endreq - // << "Number of intime events = " << nevent_intime << endreq - // << "Number of intime signal = " << nsignal_intime << endreq - // << "Number of intime minbias = " << nminbias_intime << endreq - // << "Number of intime cavern = " << ncavern_intime << endreq + // << "Number of minbias events = " << nminbias << endmsg + // << "Number of cavern events = " << ncavern << endmsg + // << "Number of intime events = " << nevent_intime << endmsg + // << "Number of intime signal = " << nsignal_intime << endmsg + // << "Number of intime minbias = " << nminbias_intime << endmsg + // << "Number of intime cavern = " << ncavern_intime << endmsg // << "Number of intime beamgas = " << nbeamgas_intime ); // // Add event counts for all pileup events diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/UtilCost.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/UtilCost.cxx index da8f43e2153..1882b011d1f 100644 --- a/Trigger/TrigMonitoring/TrigCostMonitor/src/UtilCost.cxx +++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/UtilCost.cxx @@ -40,25 +40,25 @@ void Trig::Print(const TrigMonEvent &event, << "|#L1=" << event.getL1Item().size() << "|#HLT=" << event.getChain().size() << "|#WORD=" << event.getWord().size() - << "|CE?:" << (_costEvent < 0.5 ? "N" : "Y") << "]" << endreq; + << "|CE?:" << (_costEvent < 0.5 ? "N" : "Y") << "]" << endmsg; return; } log << level << "TrigMonEvent run #" << event.getRun() << " lumi #" << event.getLumi() - << " event #" << event.getEvent() << endreq; + << " event #" << event.getEvent() << endmsg; if (verb == 1) return; log << level - << " # of rob = " << event.size<TrigMonROB>() << endreq - << " # of roi = " << event.size<TrigMonRoi>() << endreq - << " # of seq = " << event.size<TrigMonSeq>() << endreq - << " # of te = " << event.size<TrigMonTE> () << endreq - << " # of l1 = " << event.getL1Item().size() << endreq - << " # of hlt = " << event.getChain().size() << endreq - << " # of word = " << event.getWord().size() << endreq; + << " # of rob = " << event.size<TrigMonROB>() << endmsg + << " # of roi = " << event.size<TrigMonRoi>() << endmsg + << " # of seq = " << event.size<TrigMonSeq>() << endmsg + << " # of te = " << event.size<TrigMonTE> () << endmsg + << " # of l1 = " << event.getL1Item().size() << endmsg + << " # of hlt = " << event.getChain().size() << endmsg + << " # of word = " << event.getWord().size() << endmsg; if (verb == 2) return; @@ -73,7 +73,7 @@ void Trig::Print(const TrigMonEvent &event, log << level << val.getCounter() << " "; } } - log << level << endreq; + log << level << endmsg; log << level << " HLT: "; for(unsigned int i = 0; i < hlt.size(); ++i) { @@ -86,13 +86,13 @@ void Trig::Print(const TrigMonEvent &event, log << level << val.getCounter() << " "; } } - log << level << endreq; + log << level << endmsg; log << level << " WORD: "; for(unsigned int i = 0; i < event.getWord().size(); ++i) { log << level << event.getWord()[i] << " "; } - log << level << endreq; + log << level << endmsg; if (verb == 3) return; @@ -112,7 +112,7 @@ void Trig::Print(const TrigMonEvent &event, << eta << ", " << phi << ", " << rword - << endreq; + << endmsg; } if (verb == 4) return; @@ -159,7 +159,7 @@ void Trig::Print(const TrigMonEvent &event, << " #sum=" << rob.getSum().size() << " #data=" << ndata << ", " << " ROB size=" << rsize - << endreq; + << endmsg; } if (verb == 5) return; @@ -169,11 +169,11 @@ void Trig::Print(const TrigMonEvent &event, if(var_vec.size() == key_vec.size()) { for(unsigned i = 0; i < key_vec.size(); ++i) { - log << " key=" << key_vec.at(i) << " var=" << var_vec.at(i) << endreq; + log << " key=" << key_vec.at(i) << " var=" << var_vec.at(i) << endmsg; } } else { - log << "Size mismatch for var and key vectors" << endreq; + log << "Size mismatch for var and key vectors" << endmsg; } } diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx index 39c1bd3407b..b59d3a7d179 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx @@ -66,18 +66,18 @@ StatusCode L1TopoByteStreamCnv::initialize() { } MsgStream log(messageService(), "L1TopoByteStreamCnv"); - log << MSG::DEBUG << "L1TopoByteStreamCnv in initialize() " << endreq; + log << MSG::DEBUG << "L1TopoByteStreamCnv in initialize() " << endmsg; // // Get ByteStreamCnvSvc: // sc = m_ByteStreamEventAccess.retrieve(); if (sc.isFailure()) { - log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endreq; + log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endmsg; return sc; } else { log << MSG::DEBUG << "Connected to ByteStreamEventAccess interface" - << endreq; + << endmsg; } // @@ -85,10 +85,10 @@ StatusCode L1TopoByteStreamCnv::initialize() { // sc = m_tool.retrieve(); if (sc.isFailure()) { - log << MSG::FATAL << "Can't get L1TopoByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get L1TopoByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to L1TopoByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to L1TopoByteStreamTool" << endmsg; } // @@ -96,10 +96,10 @@ StatusCode L1TopoByteStreamCnv::initialize() { // sc = m_robDataProvider.retrieve(); if (sc.isFailure()) { - log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endreq; + log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endmsg; // return is disabled for Write BS which does not requre ROBDataProviderSvc } else { - log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endreq; + log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg; } // @@ -148,17 +148,17 @@ StatusCode L1TopoByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress*& pAddr) { MsgStream log(messageService(), "L1TopoByteStreamCnv"); - log << MSG::DEBUG << "createRep() called" << endreq; + log << MSG::DEBUG << "createRep() called" << endmsg; RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent(); L1TopoRDOCollection* result; if (!SG::fromStorable(pObj, result)) { - log << MSG::ERROR << " Cannot cast to L1TopoRDOCollection" << endreq; + log << MSG::ERROR << " Cannot cast to L1TopoRDOCollection" << endmsg; return StatusCode::FAILURE; } else { log << MSG::DEBUG << " Found " << result->size() - << " L1TopoRDOs to convert to ROBs" << endreq; + << " L1TopoRDOs to convert to ROBs" << endmsg; } ByteStreamAddress* addr = @@ -172,7 +172,7 @@ StatusCode L1TopoByteStreamCnv::createRep(DataObject* pObj, StatusCode sc = m_tool->convert(*it, re); if (sc.isFailure()) { log << MSG::ERROR << " Failed to create ROB for L1TopoRDO: " << **it - << endreq; + << endmsg; return sc; } } diff --git a/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx b/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx index b7fcd684b5d..63e88166511 100644 --- a/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx +++ b/Trigger/TrigT1/TrigT1BCM/src/TrigT1BCM.cxx @@ -30,10 +30,10 @@ namespace LVL1 { } StatusCode TrigT1BCM::initialize() { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endmsg; if (AthAlgorithm::initialize().isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg; return StatusCode::FAILURE; } @@ -42,10 +42,10 @@ namespace LVL1 { // Connect to the LVL1ConfigSvc to retrieve threshold settings. sc = m_configSvc.retrieve(); if (sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() << endmsg; return sc; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endmsg; } // Get level 1 BCM threshold settings from the level 1 @@ -64,9 +64,9 @@ namespace LVL1 { std::vector<TrigConf::TriggerThreshold*>::iterator th_itr = thresholds.begin(); std::vector<TrigConf::TriggerThreshold*>::iterator th_itr_end = thresholds.end(); for(;th_itr!=th_itr_end;th_itr++) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endmsg; if ((*th_itr)->name() == "BCM_AtoC") { m_cablestarts[0]=(*th_itr)->cableStart(); } else if ((*th_itr)->name() == "BCM_CtoA") { @@ -91,9 +91,9 @@ namespace LVL1 { std::vector<TrigConf::TriggerThreshold*>::iterator cmb_th_itr = cmbthresholds.begin(); std::vector<TrigConf::TriggerThreshold*>::iterator cmb_th_itr_end = cmbthresholds.end(); for(;cmb_th_itr!=cmb_th_itr_end;cmb_th_itr++) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Threshold name=" << (*cmb_th_itr)->name() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Threshold value=" << (*cmb_th_itr)->triggerThresholdValue(0, 0)->ptcut() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Thershold cablestart=" << (*cmb_th_itr)->cableStart() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Threshold name=" << (*cmb_th_itr)->name() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Threshold value=" << (*cmb_th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "3-bit Thershold cablestart=" << (*cmb_th_itr)->cableStart() << endmsg; if ((*cmb_th_itr)->name() == "BCM_6BITMULTI") { m_cablestarts[9]=(*cmb_th_itr)->cableStart(); } @@ -109,7 +109,7 @@ namespace LVL1 { } StatusCode TrigT1BCM::execute() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg; StatusCode sc; std::string containerName; @@ -120,8 +120,8 @@ namespace LVL1 { sc = evtStore()->retrieve( m_bcmRDO, containerName); if( sc.isFailure() || !m_bcmRDO ) { if (!m_badDataFound) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << containerName << " not found" << endreq; - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Algorithm will be turned off for the rest of the run." << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << containerName << " not found" << endmsg; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Algorithm will be turned off for the rest of the run." << endmsg; m_badDataFound = true; return StatusCode::SUCCESS; } else { @@ -129,7 +129,7 @@ namespace LVL1 { } } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved" << endmsg; } @@ -157,15 +157,15 @@ namespace LVL1 { if ( (*l1_bcm_itr)->size() != 0) { BCM_RDO_Collection::const_iterator sample = (*l1_bcm_itr)->begin(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Channel ID: " << channelID << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Channel ID: " << channelID << endmsg; int pulse1x = (*sample)->getPulse1Position(); int pulse1w = (*sample)->getPulse1Width(); int pulse2x = (*sample)->getPulse2Position(); int pulse2w = (*sample)->getPulse2Width(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " pulse1pos: " << pulse1x << " pulse1width: " << pulse1w << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " pulse1pos: " << pulse2x << " pulse1width: " << pulse2w << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " pulse1pos: " << pulse1x << " pulse1width: " << pulse1w << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " pulse1pos: " << pulse2x << " pulse1width: " << pulse2w << endmsg; if (channelID >= 8 && channelID < 12) { // high gain channels, a side if ((pulse1x > m_OOTPulseX - m_TimeWindow) && (pulse1x < m_OOTPulseX + m_TimeWindow)) nOOTModA++; @@ -235,18 +235,18 @@ namespace LVL1 { } else { cableWord0 = (bit8<<m_cablestarts[8]) | (bit7<<m_cablestarts[7]) | (bit6<<m_cablestarts[6]) | (bit5<<m_cablestarts[5]) | (bit4<<m_cablestarts[4]) | (bit3<<m_cablestarts[3]) | (bit2<<m_cablestarts[2]) | (bit1<<m_cablestarts[1]) | (bit0<<m_cablestarts[0]); } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " cableWord: " << cableWord0 << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " cableWord: " << cableWord0 << endmsg; // Record the CTP trigger word in StoreGate. BcmCTP *bcmCTP = new BcmCTP(cableWord0); containerName = "/Run/L1BCMtoCTPLocation"; sc = evtStore()->record(bcmCTP, containerName, false); if(sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endmsg; return StatusCode::FAILURE; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " registered successfully" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " registered successfully" << endmsg; } return StatusCode::SUCCESS; diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRampRunPlan.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRampRunPlan.cxx index e95c5a297e0..7456e0a34dd 100755 --- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRampRunPlan.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRampRunPlan.cxx @@ -84,7 +84,7 @@ void L1CaloRampRunPlan::makeTransient(const AthenaAttributeList*& athenaAttribut void L1CaloRampRunPlan::nextEvent() { if(m_bEndOfRampRun) { - //log << MSG::INFO << "No more steps to generate - End of ramp run" << endreq; + //log << MSG::INFO << "No more steps to generate - End of ramp run" << endmsg; //std::cout << "End of ramp run - No more steps to iterate" << std::endl; return; } diff --git a/Trigger/TrigT1/TrigT1CaloCondSvc/TrigT1CaloCondSvc/L1CaloCondSvc.icc b/Trigger/TrigT1/TrigT1CaloCondSvc/TrigT1CaloCondSvc/L1CaloCondSvc.icc index 04fc2b6eadb..a6d3f3a8c01 100755 --- a/Trigger/TrigT1/TrigT1CaloCondSvc/TrigT1CaloCondSvc/L1CaloCondSvc.icc +++ b/Trigger/TrigT1/TrigT1CaloCondSvc/TrigT1CaloCondSvc/L1CaloCondSvc.icc @@ -162,7 +162,7 @@ StatusCode L1CaloCondSvc::store(const T*& pobj, const std::string& key, const st for(;it_attrList!=mergedAttrListCollection->end();++it_attrList) { CondAttrListCollection::ChanNum channelNumber = it_attrList->first; CondAttrListCollection::AttributeList attrList = it_attrList->second; - //log<<MSG::INFO<<"atributeList : "<<attrList.toOutputStream(log)<<endreq; + //log<<MSG::INFO<<"atributeList : "<<attrList.toOutputStream(log)<<endmsg; std::cout <<channelNumber<<" "<< attrList.toOutputStream(std::cout) <<std::endl; } */ @@ -343,7 +343,7 @@ StatusCode L1CaloCondSvc::registerCondition(T*& pObj) { const DataHandle<AthenaAttributeList>& dh = *m_mDataHandleAttrList[key]; StatusCode sc = m_detStore->regFcn(&L1CaloCondSvc::updateConditions, this, dh, key, true); if(sc.isFailure()) { - log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endreq; + log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endmsg; return StatusCode::FAILURE; } */ @@ -361,10 +361,10 @@ StatusCode L1CaloCondSvc::registerCondition(T*& pObj) { // // StatusCode sc; // -// log << MSG::DEBUG << "L1CaloCondSvc::registerCondition(std::string key, T*& pObj))" << endreq; +// log << MSG::DEBUG << "L1CaloCondSvc::registerCondition(std::string key, T*& pObj))" << endmsg; ///* // if(!pObj) { -// log << MSG::ERROR << "IL1CaloPersistenceCapable* pObj is NULL in L1CaloCondSvc::registerCondition()" << endreq; +// log << MSG::ERROR << "IL1CaloPersistenceCapable* pObj is NULL in L1CaloCondSvc::registerCondition()" << endmsg; // return StatusCode::FAILURE; // } // @@ -378,7 +378,7 @@ StatusCode L1CaloCondSvc::registerCondition(T*& pObj) { // const DataHandle<CondAttrListCollection>& dh = *m_mDataHandleAttrListColl[key]; // sc = m_detStore->regFcn(&L1CaloCondSvc::updateConditions, this, dh, key, true); // if(sc.isFailure()) { -// log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endreq; +// log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endmsg; // return StatusCode::FAILURE; // } // @@ -391,12 +391,12 @@ StatusCode L1CaloCondSvc::registerCondition(T*& pObj) { // const DataHandle<AthenaAttributeList>& dh = *m_mDataHandleAttrList[key]; // sc = m_detStore->regFcn(&L1CaloCondSvc::updateConditions, this, dh, key, true); // if(sc.isFailure()) { -// log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endreq; +// log << MSG::ERROR << "failed to regFcn datahandle to L1CaloCondSvc::updateConditions()" << endmsg; // return StatusCode::FAILURE; // } // // } else { -// log << MSG::ERROR << "Condition type " << conditionType << "not recognized by L1CaloCondSvc" << endreq; +// log << MSG::ERROR << "Condition type " << conditionType << "not recognized by L1CaloCondSvc" << endmsg; // return StatusCode::FAILURE; // } //*/ diff --git a/Trigger/TrigT1/TrigT1CaloCondSvc/src/L1CaloCondSvc.cxx b/Trigger/TrigT1/TrigT1CaloCondSvc/src/L1CaloCondSvc.cxx index cfc1cdb55c4..d8ae9228610 100755 --- a/Trigger/TrigT1/TrigT1CaloCondSvc/src/L1CaloCondSvc.cxx +++ b/Trigger/TrigT1/TrigT1CaloCondSvc/src/L1CaloCondSvc.cxx @@ -161,7 +161,7 @@ StatusCode L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_K(keys)) { pobj->makeTransient(athenaAttributeList); } else { - log << MSG::ERROR << "Condition type " << conditionType<< "not recognized by L1CaloCondSvc" << endreq; + log << MSG::ERROR << "Condition type " << conditionType<< "not recognized by L1CaloCondSvc" << endmsg; return StatusCode::FAILURE; } } @@ -176,12 +176,12 @@ StatusCode L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_K(keys)) { //StatusCode L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_P(/*I*/, keys)) { // MsgStream log(msgSvc(),name()); // -// log<<MSG::VERBOSE<<"updateConditions()"<<endreq; +// log<<MSG::VERBOSE<<"updateConditions()"<<endmsg; // // std::list<std::string>::const_iterator itr; // for(itr=keys.begin(); itr!=keys.end(); ++itr) { // std::string key = *itr; -// log << MSG::VERBOSE << key << endreq; +// log << MSG::VERBOSE << key << endmsg; // // std::map<std::string, std::vector<IL1CaloPersistenceCapable*> >::const_iterator it_obj = m_mConditions.find(key); // if(it_obj!=m_mConditions.end()) { @@ -204,13 +204,13 @@ StatusCode L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_K(keys)) { // pobj->makeTransient(athenaAttributeList); // // } else { -// log << MSG::ERROR << "Condition type " << conditionType<< "not recognized by L1CaloCondSvc" << endreq; +// log << MSG::ERROR << "Condition type " << conditionType<< "not recognized by L1CaloCondSvc" << endmsg; // return StatusCode::FAILURE; // } // } // } // -// log << MSG::VERBOSE << "end of L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_P(/*I*/, keys))" << endreq; +// log << MSG::VERBOSE << "end of L1CaloCondSvc::updateConditions(IOVSVC_CALLBACK_ARGS_P(/*I*/, keys))" << endmsg; // return StatusCode::SUCCESS; //} diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.cxx index d15550a84bd..38eefc95c06 100644 --- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.cxx @@ -44,7 +44,7 @@ CpmMappingTool::~CpmMappingTool() StatusCode CpmMappingTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.cxx index 14a20ddbfbd..307270f96bd 100644 --- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.cxx @@ -48,7 +48,7 @@ JemMappingTool::~JemMappingTool() StatusCode JemMappingTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; // Initialise extreme eta data vectors const double etasNeg[s_etaBinsPerRow] = {-4.05, -3.05, -2.8, -2.55 }; diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.cxx index a9354fa3b49..e40ba08b841 100644 --- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.cxx @@ -50,21 +50,21 @@ PpmCoolMappingTool::~PpmCoolMappingTool() StatusCode PpmCoolMappingTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; // Retrieve the CaloTriggerTowerService tool StatusCode sc = m_ttSvc.retrieve(); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_ttSvc << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_ttSvc << endmsg; return sc; - } else msg(MSG::INFO) << "Retrieved tool " << m_ttSvc << endreq; + } else msg(MSG::INFO) << "Retrieved tool " << m_ttSvc << endmsg; // Retrieve the CaloIdManager from the detector store const CaloIdManager* caloMgr = 0; sc = detStore()->retrieve(caloMgr); if (sc.isFailure()) { msg(MSG::ERROR) << "Unable to retrieve CaloIdManager from DetectorStore" - << endreq; + << endmsg; return sc; } @@ -72,7 +72,7 @@ StatusCode PpmCoolMappingTool::initialize() // of the CaloLVL1_ID helper m_lvl1Helper = caloMgr->getLVL1_ID(); if (!m_lvl1Helper) { - msg(MSG::ERROR) << "Could not access CaloLVL1_ID helper" << endreq; + msg(MSG::ERROR) << "Could not access CaloLVL1_ID helper" << endmsg; return StatusCode::FAILURE; } @@ -80,7 +80,7 @@ StatusCode PpmCoolMappingTool::initialize() // of the TTOnlineID helper m_l1ttonlineHelper = caloMgr->getTTOnlineID(); if (!m_l1ttonlineHelper ) { - msg(MSG::ERROR) << "Could not access TTOnlineID helper" << endreq; + msg(MSG::ERROR) << "Could not access TTOnlineID helper" << endmsg; return StatusCode::FAILURE; } @@ -88,7 +88,7 @@ StatusCode PpmCoolMappingTool::initialize() IIncidentSvc* incSvc = 0; sc = service("IncidentSvc", incSvc); if (sc.isFailure()) { - msg(MSG::ERROR) << "Unable to retrieve pointer to IncidentSvc " << endreq; + msg(MSG::ERROR) << "Unable to retrieve pointer to IncidentSvc " << endmsg; return StatusCode::FAILURE; } @@ -111,7 +111,7 @@ void PpmCoolMappingTool::handle(const Incident& inc) { if (inc.type()=="BeginRun") { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "Resetting mapping table at start of run" << endreq; + msg(MSG::DEBUG) << "Resetting mapping table at start of run" << endmsg; } m_idTable.clear(); @@ -148,16 +148,16 @@ bool PpmCoolMappingTool::mapping(const int crate, const int module, msg(MSG::VERBOSE) << "crate/module/channel " << crate << "/" << module << "/" << channel << " maps to crate/slot/pin/asic " << crate << "/" - << slot << "/" << pin << "/" << asic << endreq; + << slot << "/" << pin << "/" << asic << endmsg; } const HWIdentifier id = m_l1ttonlineHelper->channelId(crate, slot, pin, asic); if (verbose) { - msg(MSG::VERBOSE) << "hardware_id: " << id << endreq; + msg(MSG::VERBOSE) << "hardware_id: " << id << endmsg; } ttId = m_ttSvc->cnvToIdentifier(id, true); if (verbose) { - msg(MSG::VERBOSE) << "tower_id: " << ttId << endreq; + msg(MSG::VERBOSE) << "tower_id: " << ttId << endmsg; } } catch (CaloID_Exception) { ttId = invalidId; } @@ -186,7 +186,7 @@ bool PpmCoolMappingTool::mapping(const int crate, const int module, if (verbose) { msg(MSG::VERBOSE) << "crate/module/channel " << crate << "/" << module << "/" << channel << " maps to eta/phi/layer " - << eta << "/" << phi << "/" << layer << endreq; + << eta << "/" << phi << "/" << layer << endmsg; } return true; @@ -225,16 +225,16 @@ bool PpmCoolMappingTool::mapping(const double eta, const double phi, msg(MSG::VERBOSE) << "eta/phi/layer " << eta << "/" << phi << "/" << layer << " maps to side/layer/region/ieta/iphi " << side << "/" << layer << "/" << region << "/" - << ieta << "/" << iphi << endreq; + << ieta << "/" << iphi << endmsg; } const Identifier ttId = m_lvl1Helper->tower_id(side, layer, region, ieta, iphi); if (verbose) { - msg(MSG::VERBOSE) << "tower_id: " << ttId << endreq; + msg(MSG::VERBOSE) << "tower_id: " << ttId << endmsg; } id = m_ttSvc->createTTChannelID(ttId, true); if (verbose) { - msg(MSG::VERBOSE) << "hardware_id: " << id << endreq; + msg(MSG::VERBOSE) << "hardware_id: " << id << endmsg; } } catch (CaloID_Exception) { id = invalidId; } @@ -251,7 +251,7 @@ bool PpmCoolMappingTool::mapping(const double eta, const double phi, if (verbose) { msg(MSG::VERBOSE) << "eta/phi/layer " << eta << "/" << phi << "/" << layer << " maps to crate/module/channel " - << crate << "/" << module << "/" << channel << endreq; + << crate << "/" << module << "/" << channel << endmsg; } return true; diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.cxx index 744e66ce340..2b02417fc6a 100644 --- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.cxx @@ -40,21 +40,21 @@ PpmCoolOrBuiltinMappingTool::~PpmCoolOrBuiltinMappingTool() StatusCode PpmCoolOrBuiltinMappingTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; // Retrieve the COOL mapping tool StatusCode sc = m_coolTool.retrieve(); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_coolTool << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_coolTool << endmsg; return sc; - } else msg(MSG::INFO) << "Retrieved tool " << m_coolTool << endreq; + } else msg(MSG::INFO) << "Retrieved tool " << m_coolTool << endmsg; // Retrieve the built-in mapping tool sc = m_builtinTool.retrieve(); if (sc.isFailure()) { - msg(MSG::ERROR) << "Failed to retrieve tool " << m_builtinTool << endreq; + msg(MSG::ERROR) << "Failed to retrieve tool " << m_builtinTool << endmsg; return sc; - } else msg(MSG::INFO) << "Retrieved tool " << m_builtinTool << endreq; + } else msg(MSG::INFO) << "Retrieved tool " << m_builtinTool << endmsg; return StatusCode::SUCCESS; } @@ -120,8 +120,8 @@ bool PpmCoolOrBuiltinMappingTool::coolWorks() } m_coolCheckDone = true; if (m_coolCheckResult) { - msg(MSG::INFO) << "COOL mappings selected" << endreq; - } else msg(MSG::INFO) << "Built-in mappings selected" << endreq; + msg(MSG::INFO) << "COOL mappings selected" << endmsg; + } else msg(MSG::INFO) << "Built-in mappings selected" << endmsg; } return m_coolCheckResult; } diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.cxx b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.cxx index ebd2fa44d68..e4e7f3ea82c 100644 --- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.cxx @@ -39,7 +39,7 @@ PpmMappingTool::~PpmMappingTool() StatusCode PpmMappingTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; return StatusCode::SUCCESS; } @@ -107,13 +107,13 @@ bool PpmMappingTool::mapping(const double eta, const double phi, EtaPhiMap::iterator iter = m_etaPhiMap->find(key); if (iter == m_etaPhiMap->end()) { msg(MSG::WARNING) << "Invalid eta/phi: " << eta - << "/" << phi << endreq; + << "/" << phi << endmsg; return false; } const ChannelIds& ids(iter->second); const unsigned int chanId = (layer == 0) ? ids.first : ids.second; if (chanId == invalidChanId) { - msg(MSG::WARNING) << "Invalid ChanId - shouldn't happen" << endreq; + msg(MSG::WARNING) << "Invalid ChanId - shouldn't happen" << endmsg; return false; } crate = chanId / (s_channels * s_modules); diff --git a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramTool.cxx b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramTool.cxx index f61f75a4c6e..11049e5965b 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramTool.cxx @@ -72,7 +72,7 @@ TrigT1CaloLWHistogramTool::~TrigT1CaloLWHistogramTool() StatusCode TrigT1CaloLWHistogramTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; // Connect to the TrigConfigSvc for the trigger configuration: @@ -80,10 +80,10 @@ StatusCode TrigT1CaloLWHistogramTool::initialize() StatusCode sc = m_configSvc.retrieve(); if ( sc.isFailure() ) { msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() - << endreq; + << endmsg; return sc; } else msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() - << endreq; + << endmsg; } return StatusCode::SUCCESS; @@ -765,7 +765,7 @@ void TrigT1CaloLWHistogramTool::registerHist(LWHist* hist) { if (m_monGroup && m_monGroup->regHist(hist) != StatusCode::SUCCESS) { msg(MSG::WARNING) << "Could not register histogram : " - << hist->GetName() << endreq; + << hist->GetName() << endmsg; } } @@ -802,7 +802,7 @@ void TrigT1CaloLWHistogramTool::registerHist(TH1* hist) { if (m_monGroup && m_monGroup->regHist(hist) != StatusCode::SUCCESS) { msg(MSG::WARNING) << "Could not register histogram : " - << hist->GetName() << endreq; + << hist->GetName() << endmsg; } if (!m_monGroup) hist->SetDirectory(0); } @@ -1679,7 +1679,7 @@ void TrigT1CaloLWHistogramTool::fillEventNumber(LWHist2D* hist, double y) const EventInfo* evInfo = 0; StatusCode sc = evtStore()->retrieve(evInfo); if (sc.isFailure()) { - msg(MSG::DEBUG) << "No EventInfo found" << endreq; + msg(MSG::DEBUG) << "No EventInfo found" << endmsg; } else { const EventID* evID = evInfo->event_ID(); if (evID) eventNumber = evID->event_number(); diff --git a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramToolV1.cxx b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramToolV1.cxx index 9c2b121e265..051a30b514f 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramToolV1.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloLWHistogramToolV1.cxx @@ -70,7 +70,7 @@ TrigT1CaloLWHistogramToolV1::~TrigT1CaloLWHistogramToolV1() StatusCode TrigT1CaloLWHistogramToolV1::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; // Connect to the TrigConfigSvc for the trigger configuration: @@ -78,10 +78,10 @@ StatusCode TrigT1CaloLWHistogramToolV1::initialize() StatusCode sc = m_configSvc.retrieve(); if ( sc.isFailure() ) { msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() - << endreq; + << endmsg; return sc; } else msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() - << endreq; + << endmsg; } return StatusCode::SUCCESS; @@ -751,7 +751,7 @@ void TrigT1CaloLWHistogramToolV1::registerHist(LWHist* hist) { if (m_monGroup && m_monGroup->regHist(hist) != StatusCode::SUCCESS) { msg(MSG::WARNING) << "Could not register histogram : " - << hist->GetName() << endreq; + << hist->GetName() << endmsg; } } @@ -788,7 +788,7 @@ void TrigT1CaloLWHistogramToolV1::registerHist(TH1* hist) { if (m_monGroup && m_monGroup->regHist(hist) != StatusCode::SUCCESS) { msg(MSG::WARNING) << "Could not register histogram : " - << hist->GetName() << endreq; + << hist->GetName() << endmsg; } if (!m_monGroup) hist->SetDirectory(0); } @@ -1619,7 +1619,7 @@ void TrigT1CaloLWHistogramToolV1::fillEventNumber(LWHist2D* hist, double y) const EventInfo* evInfo = 0; StatusCode sc = evtStore()->retrieve(evInfo); if (sc.isFailure()) { - msg(MSG::DEBUG) << "No EventInfo found" << endreq; + msg(MSG::DEBUG) << "No EventInfo found" << endmsg; } else { const EventID* evID = evInfo->event_ID(); if (evID) eventNumber = evID->event_number(); diff --git a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorTool.cxx b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorTool.cxx index 60a13a11c66..5241f458592 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorTool.cxx @@ -105,7 +105,7 @@ TrigT1CaloMonErrorTool::~TrigT1CaloMonErrorTool() StatusCode TrigT1CaloMonErrorTool::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; return StatusCode::SUCCESS; } @@ -134,21 +134,21 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& const xAOD::TriggerTowerContainer* triggerTowerMuonTES = 0; sc = evtStore()->retrieve(triggerTowerTES, m_triggerTowerLocation); if ( sc.isFailure() || !triggerTowerTES ) { - msg(MSG::DEBUG) << "No Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Trigger Tower container found" << endmsg; } if (evtStore()->contains<xAOD::TriggerTowerContainer>(m_triggerTowerLocation + "Spare")) { sc = evtStore()->retrieve(triggerTowerSpareTES, m_triggerTowerLocation + "Spare"); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !triggerTowerSpareTES ) { - msg(MSG::DEBUG) << "No Spare Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Spare Trigger Tower container found" << endmsg; } if (evtStore()->contains<xAOD::TriggerTowerContainer>(m_triggerTowerLocation + "Muon")) { sc = evtStore()->retrieve(triggerTowerMuonTES, m_triggerTowerLocation + "Muon"); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !triggerTowerMuonTES ) { - msg(MSG::DEBUG) << "No Tile Muon Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Tile Muon Trigger Tower container found" << endmsg; } //Retrieve Core and Overlap CPM Towers from SG @@ -156,34 +156,34 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& const xAOD::CPMTowerContainer* cpmTowerOvTES = 0; sc = evtStore()->retrieve(cpmTowerTES, m_cpmTowerLocation); if ( sc.isFailure() || !cpmTowerTES ) { - msg(MSG::DEBUG) << "No Core CPM Tower container found" << endreq; + msg(MSG::DEBUG) << "No Core CPM Tower container found" << endmsg; } if (evtStore()->contains<xAOD::CPMTowerContainer>(m_cpmTowerLocationOverlap)) { sc = evtStore()->retrieve(cpmTowerOvTES, m_cpmTowerLocationOverlap); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpmTowerOvTES ) { - msg(MSG::DEBUG) << "No Overlap CPM Tower container found" << endreq; + msg(MSG::DEBUG) << "No Overlap CPM Tower container found" << endmsg; } //Retrieve CPM RoIs from SG const xAOD::CPMTobRoIContainer* cpmRoiTES = 0; sc = evtStore()->retrieve( cpmRoiTES, m_cpmRoiLocation); if ( sc.isFailure() || !cpmRoiTES ) { - msg(MSG::DEBUG) << "No CPM RoIs container found" << endreq; + msg(MSG::DEBUG) << "No CPM RoIs container found" << endmsg; } //Retrieve CMX-CP TOBs from SG const xAOD::CMXCPTobContainer* cmxCpTobTES = 0; sc = evtStore()->retrieve( cmxCpTobTES, m_cmxCpTobLocation); if ( sc.isFailure() || !cmxCpTobTES ) { - msg(MSG::DEBUG) << "No CMX-CP TOB container found" << endreq; + msg(MSG::DEBUG) << "No CMX-CP TOB container found" << endmsg; } //Retrieve CMX-CP Hits from SG const xAOD::CMXCPHitsContainer* cmxCpHitsTES = 0; sc = evtStore()->retrieve( cmxCpHitsTES, m_cmxCpHitsLocation); if ( sc.isFailure() || !cmxCpHitsTES ) { - msg(MSG::DEBUG) << "No CMX-CP Hits container found" << endreq; + msg(MSG::DEBUG) << "No CMX-CP Hits container found" << endmsg; } //Retrieve Core and Overlap Jet Elements from SG @@ -191,55 +191,55 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& const xAOD::JetElementContainer* jetElementOvTES = 0; sc = evtStore()->retrieve(jetElementTES, m_jetElementLocation); if ( sc.isFailure() || !jetElementTES ) { - msg(MSG::DEBUG) << "No Core Jet Element container found" << endreq; + msg(MSG::DEBUG) << "No Core Jet Element container found" << endmsg; } if (evtStore()->contains<xAOD::JetElementContainer>(m_jetElementLocationOverlap)) { sc = evtStore()->retrieve(jetElementOvTES, m_jetElementLocationOverlap); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jetElementOvTES ) { - msg(MSG::DEBUG) << "No Overlap Jet Element container found" << endreq; + msg(MSG::DEBUG) << "No Overlap Jet Element container found" << endmsg; } //Retrieve JEM RoIs from SG const xAOD::JEMTobRoIContainer* jemRoiTES = 0; sc = evtStore()->retrieve( jemRoiTES, m_jemRoiLocation); if ( sc.isFailure() || !jemRoiTES ) { - msg(MSG::DEBUG) << "No DAQ JEM RoIs container found" << endreq; + msg(MSG::DEBUG) << "No DAQ JEM RoIs container found" << endmsg; } //Retrieve CMX-Jet TOBs from SG const xAOD::CMXJetTobContainer* cmxJetTobTES = 0; sc = evtStore()->retrieve( cmxJetTobTES, m_cmxJetTobLocation); if ( sc.isFailure() || !cmxJetTobTES ) { - msg(MSG::DEBUG) << "No CMX-Jet TOB container found" << endreq; + msg(MSG::DEBUG) << "No CMX-Jet TOB container found" << endmsg; } //Retrieve CMX-Jet Hits from SG const xAOD::CMXJetHitsContainer* cmxJetHitsTES = 0; sc = evtStore()->retrieve( cmxJetHitsTES, m_cmxJetHitsLocation); if ( sc.isFailure() || !cmxJetHitsTES ) { - msg(MSG::DEBUG) << "No CMX-Jet Hits container found" << endreq; + msg(MSG::DEBUG) << "No CMX-Jet Hits container found" << endmsg; } //Retrieve CMX RoIs from SG const xAOD::CMXRoIContainer* cmxRoiTES = 0; sc = evtStore()->retrieve( cmxRoiTES, m_cmxRoiLocation); if ( sc.isFailure() || !cmxRoiTES ) { - msg(MSG::DEBUG) << "No CMX RoIs container found" << endreq; + msg(MSG::DEBUG) << "No CMX RoIs container found" << endmsg; } //Retrieve JEM Et Sums from SG const xAOD::JEMEtSumsContainer* jemEtSumsTES = 0; sc = evtStore()->retrieve( jemEtSumsTES, m_jemEtSumsLocation); if ( sc.isFailure() || !jemEtSumsTES ) { - msg(MSG::DEBUG) << "No JEM Et Sums container found" << endreq; + msg(MSG::DEBUG) << "No JEM Et Sums container found" << endmsg; } //Retrieve CMX Et Sums from SG const xAOD::CMXEtSumsContainer* cmxEtSumsTES = 0; sc = evtStore()->retrieve( cmxEtSumsTES, m_cmxEtSumsLocation); if ( sc.isFailure() || !cmxEtSumsTES ) { - msg(MSG::DEBUG) << "No CMX-Energy Et Sums container found" << endreq; + msg(MSG::DEBUG) << "No CMX-Energy Et Sums container found" << endmsg; } //Retrieve ROD Headers from SG @@ -248,7 +248,7 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(rodTES, m_rodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !rodTES ) { - msg(MSG::DEBUG) << "No ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No ROD Header container found" << endmsg; } //Retrieve CP RoIB ROD Headers from SG @@ -257,7 +257,7 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(cpRoibTES, m_cpRoibRodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpRoibTES ) { - msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" << endmsg; } //Retrieve JEP RoIB ROD Headers from SG @@ -266,7 +266,7 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(jepRoibTES, m_jepRoibRodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jepRoibTES ) { - msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" << endmsg; } //Retrieve ROB Status and Unpacking Error vector from SG @@ -276,7 +276,7 @@ StatusCode TrigT1CaloMonErrorTool::retrieve(const std::vector<unsigned int>*& } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !errColl ) { msg(MSG::DEBUG) << "No ROB Status and Unpacking Error vector found" - << endreq; + << endmsg; } return sc; @@ -325,7 +325,7 @@ bool TrigT1CaloMonErrorTool::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !rodTES ) { if (debug) msg(MSG::DEBUG) << "No DAQ ROD Header container found" - << endreq; + << endmsg; } //Retrieve CP RoIB ROD Headers from SG @@ -335,7 +335,7 @@ bool TrigT1CaloMonErrorTool::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpRoibTES ) { if (debug) msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" - << endreq; + << endmsg; } //Retrieve JEP RoIB ROD Headers from SG @@ -345,7 +345,7 @@ bool TrigT1CaloMonErrorTool::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jepRoibTES ) { if (debug) msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" - << endreq; + << endmsg; } // Record fragments present diff --git a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorToolV1.cxx b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorToolV1.cxx index 065f853533a..6708b5a7bd4 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorToolV1.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoringTools/src/TrigT1CaloMonErrorToolV1.cxx @@ -99,7 +99,7 @@ TrigT1CaloMonErrorToolV1::~TrigT1CaloMonErrorToolV1() StatusCode TrigT1CaloMonErrorToolV1::initialize() { msg(MSG::INFO) << "Initializing " << name() << " - package version " - << PACKAGE_VERSION << endreq; + << PACKAGE_VERSION << endmsg; return StatusCode::SUCCESS; } @@ -141,21 +141,21 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& const TriggerTowerCollection* triggerTowerMuonTES = 0; sc = evtStore()->retrieve(triggerTowerTES, m_triggerTowerLocation); if ( sc.isFailure() || !triggerTowerTES ) { - msg(MSG::DEBUG) << "No Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Trigger Tower container found" << endmsg; } if (evtStore()->contains<TriggerTowerCollection>(m_triggerTowerLocation + "Spare")) { sc = evtStore()->retrieve(triggerTowerSpareTES, m_triggerTowerLocation + "Spare"); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !triggerTowerSpareTES ) { - msg(MSG::DEBUG) << "No Spare Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Spare Trigger Tower container found" << endmsg; } if (evtStore()->contains<TriggerTowerCollection>(m_triggerTowerLocation + "Muon")) { sc = evtStore()->retrieve(triggerTowerMuonTES, m_triggerTowerLocation + "Muon"); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !triggerTowerMuonTES ) { - msg(MSG::DEBUG) << "No Tile Muon Trigger Tower container found" << endreq; + msg(MSG::DEBUG) << "No Tile Muon Trigger Tower container found" << endmsg; } //Retrieve Core and Overlap CPM Towers from SG @@ -163,34 +163,34 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& const CpmTowerCollection* cpmTowerOvTES = 0; sc = evtStore()->retrieve(cpmTowerTES, m_cpmTowerLocation); if ( sc.isFailure() || !cpmTowerTES ) { - msg(MSG::DEBUG) << "No Core CPM Tower container found" << endreq; + msg(MSG::DEBUG) << "No Core CPM Tower container found" << endmsg; } if (evtStore()->contains<CpmTowerCollection>(m_cpmTowerLocationOverlap)) { sc = evtStore()->retrieve(cpmTowerOvTES, m_cpmTowerLocationOverlap); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpmTowerOvTES ) { - msg(MSG::DEBUG) << "No Overlap CPM Tower container found" << endreq; + msg(MSG::DEBUG) << "No Overlap CPM Tower container found" << endmsg; } //Retrieve CPM RoIs from SG const CpmRoiCollection* cpmRoiTES = 0; sc = evtStore()->retrieve( cpmRoiTES, m_cpmRoiLocation); if ( sc.isFailure() || !cpmRoiTES ) { - msg(MSG::DEBUG) << "No CPM RoIs container found" << endreq; + msg(MSG::DEBUG) << "No CPM RoIs container found" << endmsg; } //Retrieve CPM Hits from SG const CpmHitsCollection* cpmHitsTES = 0; sc = evtStore()->retrieve( cpmHitsTES, m_cpmHitsLocation); if ( sc.isFailure() || !cpmHitsTES ) { - msg(MSG::DEBUG) << "No CPM Hits container found" << endreq; + msg(MSG::DEBUG) << "No CPM Hits container found" << endmsg; } //Retrieve CMM-CP Hits from SG const CmmCpHitsCollection* cmmCpHitsTES = 0; sc = evtStore()->retrieve( cmmCpHitsTES, m_cmmCpHitsLocation); if ( sc.isFailure() || !cmmCpHitsTES ) { - msg(MSG::DEBUG) << "No CMM-CP Hits container found" << endreq; + msg(MSG::DEBUG) << "No CMM-CP Hits container found" << endmsg; } //Retrieve Core and Overlap Jet Elements from SG @@ -198,55 +198,55 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& const JetElementCollection* jetElementOvTES = 0; sc = evtStore()->retrieve(jetElementTES, m_jetElementLocation); if ( sc.isFailure() || !jetElementTES ) { - msg(MSG::DEBUG) << "No Core Jet Element container found" << endreq; + msg(MSG::DEBUG) << "No Core Jet Element container found" << endmsg; } if (evtStore()->contains<JetElementCollection>(m_jetElementLocationOverlap)) { sc = evtStore()->retrieve(jetElementOvTES, m_jetElementLocationOverlap); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jetElementOvTES ) { - msg(MSG::DEBUG) << "No Overlap Jet Element container found" << endreq; + msg(MSG::DEBUG) << "No Overlap Jet Element container found" << endmsg; } //Retrieve JEM RoIs from SG const JemRoiCollection* jemRoiTES = 0; sc = evtStore()->retrieve( jemRoiTES, m_jemRoiLocation); if ( sc.isFailure() || !jemRoiTES ) { - msg(MSG::DEBUG) << "No DAQ JEM RoIs container found" << endreq; + msg(MSG::DEBUG) << "No DAQ JEM RoIs container found" << endmsg; } //Retrieve JEM Hits from SG const JemHitsCollection* jemHitsTES = 0; sc = evtStore()->retrieve( jemHitsTES, m_jemHitsLocation); if ( sc.isFailure() || !jemHitsTES ) { - msg(MSG::DEBUG) << "No JEM Hits container found" << endreq; + msg(MSG::DEBUG) << "No JEM Hits container found" << endmsg; } //Retrieve CMM-Jet Hits from SG const CmmJetHitsCollection* cmmJetHitsTES = 0; sc = evtStore()->retrieve( cmmJetHitsTES, m_cmmJetHitsLocation); if ( sc.isFailure() || !cmmJetHitsTES ) { - msg(MSG::DEBUG) << "No CMM-Jet Hits container found" << endreq; + msg(MSG::DEBUG) << "No CMM-Jet Hits container found" << endmsg; } //Retrieve CMM RoIs from SG const LVL1::CMMRoI* cmmRoiTES = 0; sc = evtStore()->retrieve( cmmRoiTES, m_cmmRoiLocation); if ( sc.isFailure() || !cmmRoiTES ) { - msg(MSG::DEBUG) << "No CMM RoIs container found" << endreq; + msg(MSG::DEBUG) << "No CMM RoIs container found" << endmsg; } //Retrieve JEM Et Sums from SG const JemEtSumsCollection* jemEtSumsTES = 0; sc = evtStore()->retrieve( jemEtSumsTES, m_jemEtSumsLocation); if ( sc.isFailure() || !jemEtSumsTES ) { - msg(MSG::DEBUG) << "No JEM Et Sums container found" << endreq; + msg(MSG::DEBUG) << "No JEM Et Sums container found" << endmsg; } //Retrieve CMM Et Sums from SG const CmmEtSumsCollection* cmmEtSumsTES = 0; sc = evtStore()->retrieve( cmmEtSumsTES, m_cmmEtSumsLocation); if ( sc.isFailure() || !cmmEtSumsTES ) { - msg(MSG::DEBUG) << "No CMM-Energy Et Sums container found" << endreq; + msg(MSG::DEBUG) << "No CMM-Energy Et Sums container found" << endmsg; } //Retrieve ROD Headers from SG @@ -255,7 +255,7 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(rodTES, m_rodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !rodTES ) { - msg(MSG::DEBUG) << "No ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No ROD Header container found" << endmsg; } //Retrieve CP RoIB ROD Headers from SG @@ -264,7 +264,7 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(cpRoibTES, m_cpRoibRodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpRoibTES ) { - msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" << endmsg; } //Retrieve JEP RoIB ROD Headers from SG @@ -273,7 +273,7 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& sc = evtStore()->retrieve(jepRoibTES, m_jepRoibRodHeaderLocation); } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jepRoibTES ) { - msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" << endreq; + msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" << endmsg; } //Retrieve ROB Status and Unpacking Error vector from SG @@ -283,7 +283,7 @@ StatusCode TrigT1CaloMonErrorToolV1::retrieve(const std::vector<unsigned int>*& } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !errColl ) { msg(MSG::DEBUG) << "No ROB Status and Unpacking Error vector found" - << endreq; + << endmsg; } return sc; @@ -334,7 +334,7 @@ bool TrigT1CaloMonErrorToolV1::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !rodTES ) { if (debug) msg(MSG::DEBUG) << "No DAQ ROD Header container found" - << endreq; + << endmsg; } //Retrieve CP RoIB ROD Headers from SG @@ -344,7 +344,7 @@ bool TrigT1CaloMonErrorToolV1::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !cpRoibTES ) { if (debug) msg(MSG::DEBUG) << "No CP RoIB ROD Header container found" - << endreq; + << endmsg; } //Retrieve JEP RoIB ROD Headers from SG @@ -354,7 +354,7 @@ bool TrigT1CaloMonErrorToolV1::missingFragment() } else sc = StatusCode::FAILURE; if ( sc.isFailure() || !jepRoibTES ) { if (debug) msg(MSG::DEBUG) << "No JEP RoIB ROD Header container found" - << endreq; + << endmsg; } // Record fragments present diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx index 91d022aae97..b7277feb59c 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMCPHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMMCPHitsCollection_PERS * CMMCPHitsCollectionCnv::createPersistent( CMMCPHitsCo MsgStream mlog(msgSvc(), "CMMCPHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createPersistent called" << endmsg; CMMCPHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMMCPHitsCollection * CMMCPHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMMCPHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMMCPHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "8C6E0191-FAE9-4C2E-BD0A-E6A5518145E2" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx index 5b36222804b..72e5bd60793 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMEtSumsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMMEtSumsCollection_PERS * CMMEtSumsCollectionCnv::createPersistent( CMMEtSumsCo MsgStream mlog(msgSvc(), "CMMEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createPersistent called" << endmsg; CMMEtSumsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMMEtSumsCollection * CMMEtSumsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMMEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMMEtSumsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "DAB02AE0-736D-4C24-AC21-E6F12B3A4FE3" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx index a43ff0616cf..dd74f6c1d90 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMJetHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMMJetHitsCollection_PERS * CMMJetHitsCollectionCnv::createPersistent( CMMJetHit MsgStream mlog(msgSvc(), "CMMJetHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createPersistent called" << endmsg; CMMJetHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMMJetHitsCollection * CMMJetHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMMJetHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMMJetHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "972519B8-F2B3-4205-A0B1-06678460918F" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx index e003fb1abca..16809081b94 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMMRoICnv.cxx @@ -18,7 +18,7 @@ CMMRoI_PERS * CMMRoICnv::createPersistent( CMMRoI *transObj) MsgStream mlog(msgSvc(), "CMMRoIConverter" ); - //mlog << MSG::DEBUG << "CMMRoICnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMMRoICnv::createPersistent called" << endmsg; CMMRoI_PERS * persObj = m_TPConverter_p1.createPersistent( transObj, mlog ); @@ -32,7 +32,7 @@ CMMRoI * CMMRoICnv::createTransient() { MsgStream mlog(msgSvc(), "CMMRoIConverter" ); - //mlog << MSG::DEBUG << "CMMRoICnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMMRoICnv::createTransient called" << endmsg; static pool::Guid p1_guid( "AF2D0BF8-8B28-4BFD-92B1-67F4708039C3" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx index 49d3bc89bf9..0c58f9da53a 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMXCPHitsCollection_PERS * CMXCPHitsCollectionCnv::createPersistent( CMXCPHitsCo MsgStream mlog(msgSvc(), "CMXCPHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createPersistent called" << endmsg; CMXCPHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMXCPHitsCollection * CMXCPHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMXCPHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXCPHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "1A1F6DEF-0233-453C-8614-E7B82EFCEDC6" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx index 121a32493cb..d135e56cb52 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXCPTobCollectionCnv.cxx @@ -16,7 +16,7 @@ CMXCPTobCollection_PERS * CMXCPTobCollectionCnv::createPersistent( CMXCPTobColle MsgStream mlog(msgSvc(), "CMXCPTobCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createPersistent called" << endmsg; CMXCPTobCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMXCPTobCollection * CMXCPTobCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMXCPTobCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXCPTobCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "0E42AA28-7C10-4934-9E54-97C38C249544" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx index 67247f58675..6935116d0f1 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXEtSumsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMXEtSumsCollection_PERS * CMXEtSumsCollectionCnv::createPersistent( CMXEtSumsCo MsgStream mlog(msgSvc(), "CMXEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createPersistent called" << endmsg; CMXEtSumsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMXEtSumsCollection * CMXEtSumsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMXEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXEtSumsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "8CC9CAAB-5A8B-4581-BA66-C762BA7CB565" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx index 0be3d0994ee..9f26a223f60 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ CMXJetHitsCollection_PERS * CMXJetHitsCollectionCnv::createPersistent( CMXJetHit MsgStream mlog(msgSvc(), "CMXJetHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createPersistent called" << endmsg; CMXJetHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMXJetHitsCollection * CMXJetHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMXJetHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXJetHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "29388465-59FE-452C-9462-45C3022F5F2B" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx index f1c54b57a6d..6c43f9f66e2 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXJetTobCollectionCnv.cxx @@ -16,7 +16,7 @@ CMXJetTobCollection_PERS * CMXJetTobCollectionCnv::createPersistent( CMXJetTobCo MsgStream mlog(msgSvc(), "CMXJetTobCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createPersistent called" << endmsg; CMXJetTobCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CMXJetTobCollection * CMXJetTobCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CMXJetTobCollectionConverter" ); - //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXJetTobCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "3FD32EB7-6573-4BCD-A510-6A5549E495A4" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx index 6450a27bb6e..13fbd106fcc 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CMXRoICnv.cxx @@ -20,7 +20,7 @@ CMXRoI_PERS * CMXRoICnv::createPersistent( CMXRoI *transObj) MsgStream mlog(msgSvc(), "CMXRoIConverter" ); - //mlog << MSG::DEBUG << "CMXRoICnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CMXRoICnv::createPersistent called" << endmsg; CMXRoI_PERS * persObj = m_TPConverter_p1.createPersistent( transObj, mlog ); @@ -34,7 +34,7 @@ CMXRoI * CMXRoICnv::createTransient() { MsgStream mlog(msgSvc(), "CMXRoIConverter" ); - //mlog << MSG::DEBUG << "CMXRoICnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CMXRoICnv::createTransient called" << endmsg; static pool::Guid p1_guid( "6EE27E92-E8DE-4F07-810F-025A1450E3BE" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx index fa583a741d4..bab4346292c 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ CPMHitsCollection_PERS * CPMHitsCollectionCnv::createPersistent( CPMHitsCollecti MsgStream mlog(msgSvc(), "CPMHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createPersistent called" << endmsg; CPMHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CPMHitsCollection * CPMHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CPMHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CPMHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "4A309D12-C11D-4666-8253-72522BF7948E" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx index 164131945d7..1270553c4bd 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMRoICollectionCnv.cxx @@ -16,7 +16,7 @@ CPMRoICollection_PERS * CPMRoICollectionCnv::createPersistent( CPMRoICollection MsgStream mlog(msgSvc(), "CPMRoICollectionConverter" ); - //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createPersistent called" << endmsg; CPMRoICollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CPMRoICollection * CPMRoICollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CPMRoICollectionConverter" ); - //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CPMRoICollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "A5867077-621F-4B04-8777-56846085E550" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx index 32e076781eb..b11d0c24a8d 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTobRoICollectionCnv.cxx @@ -16,7 +16,7 @@ CPMTobRoICollection_PERS * CPMTobRoICollectionCnv::createPersistent( CPMTobRoICo MsgStream mlog(msgSvc(), "CPMTobRoICollectionConverter" ); - //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createPersistent called" << endmsg; CPMTobRoICollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CPMTobRoICollection * CPMTobRoICollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CPMTobRoICollectionConverter" ); - //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CPMTobRoICollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "E575088B-8CD0-471C-A278-EA6E508A171E" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx index 4a6f63b9d50..909a77d70c7 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/CPMTowerCollectionCnv.cxx @@ -16,7 +16,7 @@ CPMTowerCollection_PERS * CPMTowerCollectionCnv::createPersistent( CPMTowerColle MsgStream mlog(msgSvc(), "CPMTowerCollectionConverter" ); - //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createPersistent called" << endmsg; CPMTowerCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ CPMTowerCollection * CPMTowerCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "CPMTowerCollectionConverter" ); - //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "CPMTowerCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "AF950A9C-D929-4E3D-8B95-53D0B36B78D8" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx index dc56a3be26c..45fe8c6643f 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMEtSumsCollectionCnv.cxx @@ -16,7 +16,7 @@ JEMEtSumsCollection_PERS * JEMEtSumsCollectionCnv::createPersistent( JEMEtSumsCo MsgStream mlog(msgSvc(), "JEMEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createPersistent called" << endmsg; JEMEtSumsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ JEMEtSumsCollection * JEMEtSumsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "JEMEtSumsCollectionConverter" ); - //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "JEMEtSumsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "FFEF6FF1-31E5-492A-9A44-4AD5B79DB22B" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx index 6f43db47a4f..8f99e9ac7eb 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMHitsCollectionCnv.cxx @@ -16,7 +16,7 @@ JEMHitsCollection_PERS * JEMHitsCollectionCnv::createPersistent( JEMHitsCollecti MsgStream mlog(msgSvc(), "JEMHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createPersistent called" << endmsg; JEMHitsCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ JEMHitsCollection * JEMHitsCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "JEMHitsCollectionConverter" ); - //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "JEMHitsCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "A9D89195-219E-4F33-9B19-4684639CCA5B" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx index 49188b4e0cb..d30cc1c80e5 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMRoICollectionCnv.cxx @@ -16,7 +16,7 @@ JEMRoICollection_PERS * JEMRoICollectionCnv::createPersistent( JEMRoICollection MsgStream mlog(msgSvc(), "JEMRoICollectionConverter" ); - //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createPersistent called" << endmsg; JEMRoICollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ JEMRoICollection * JEMRoICollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "JEMRoICollectionConverter" ); - //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "JEMRoICollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "B82ECDA7-30FE-4F02-9BF3-EC507BA8CB04" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx index af6bd69b90f..84480ba005f 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JEMTobRoICollectionCnv.cxx @@ -16,7 +16,7 @@ JEMTobRoICollection_PERS * JEMTobRoICollectionCnv::createPersistent( JEMTobRoICo MsgStream mlog(msgSvc(), "JEMTobRoICollectionConverter" ); - //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createPersistent called" << endmsg; JEMTobRoICollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ JEMTobRoICollection * JEMTobRoICollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "JEMTobRoICollectionConverter" ); - //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "JEMTobRoICollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "49790040-16E0-4CAB-96A2-31DC010FFB06" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx index e5f9b220356..920c859ba7f 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/JetElementCollectionCnv.cxx @@ -16,7 +16,7 @@ JetElementCollection_PERS * JetElementCollectionCnv::createPersistent( JetElemen MsgStream mlog(msgSvc(), "JetElementCollectionConverter" ); - //mlog << MSG::DEBUG << "JetElementCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "JetElementCollectionCnv::createPersistent called" << endmsg; JetElementCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ JetElementCollection * JetElementCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "JetElementCollectionConverter" ); - //mlog << MSG::DEBUG << "JetElementCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "JetElementCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "132ABB53-1F89-4E0E-83A3-382338B278F3" ); static pool::Guid p0_guid( "48B92167-4892-4694-9E9E-E201F1E1FFFE" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx index 69d46553548..3c2e22db1da 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/RODHeaderCollectionCnv.cxx @@ -16,7 +16,7 @@ RODHeaderCollection_PERS * RODHeaderCollectionCnv::createPersistent( RODHeaderCo MsgStream mlog(msgSvc(), "RODHeaderCollectionConverter" ); - //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createPersistent called" << endmsg; RODHeaderCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ RODHeaderCollection * RODHeaderCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "RODHeaderCollectionConverter" ); - //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "RODHeaderCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "8226F1B6-374D-424D-B059-E0A1B18A1DA7" ); diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx index 14527793915..93648312431 100644 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/src/TriggerTowerCollectionCnv.cxx @@ -16,7 +16,7 @@ TriggerTowerCollection_PERS * TriggerTowerCollectionCnv::createPersistent( Trigg MsgStream mlog(msgSvc(), "TriggerTowerCollectionConverter" ); - //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createPersistent called" << endreq; + //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createPersistent called" << endmsg; TriggerTowerCollection_PERS * p_TTColl = m_TPConverter_tlp1.createPersistent( transObj, mlog ); @@ -30,7 +30,7 @@ TriggerTowerCollection * TriggerTowerCollectionCnv::createTransient() { MsgStream mlog(msgSvc(), "TriggerTowerCollectionConverter" ); - //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createTransient called" << endreq; + //mlog << MSG::DEBUG << "TriggerTowerCollectionCnv::createTransient called" << endmsg; static pool::Guid tlp1_guid( "CDF34B04-7594-4A52-8EE0-FE85CF2C2A18" ); static pool::Guid p0_guid( "1B6DA81A-2F27-4B50-ACF6-D3FC19B40ADB" ); diff --git a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx index 1d77e23b281..4ce21d17304 100644 --- a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx +++ b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx @@ -34,10 +34,10 @@ namespace LVL1 { //--------------------------------------------------------------------- StatusCode TrigT1Lucid::initialize() { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "entering intialize()" << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "entering intialize()" << endmsg; if (AthAlgorithm::initialize().isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg; return StatusCode::FAILURE; } @@ -48,12 +48,12 @@ namespace LVL1 { if (sc.isFailure()) { if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() - << endreq; + << endmsg; return sc; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() - << endreq; + << endmsg; } // Get level 1 LUCID threshold settings from the level 1 @@ -65,8 +65,8 @@ namespace LVL1 { for(; th_itr!=th_itr_end; th_itr++) { if(msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "Threshold name =" << (*th_itr)->name() << endreq; - msg(MSG::DEBUG) << "Threshold value =" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endreq; + msg(MSG::DEBUG) << "Threshold name =" << (*th_itr)->name() << endmsg; + msg(MSG::DEBUG) << "Threshold value =" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg; } if ((*th_itr)->name() == "LUCID_A"){ @@ -80,7 +80,7 @@ namespace LVL1 { } if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cable positions: " << m_cablestart_a << ", " - << m_cablestart_c << endreq; + << m_cablestart_c << endmsg; return StatusCode::SUCCESS; } @@ -88,7 +88,7 @@ namespace LVL1 { //--------------------------------------------------------------------- StatusCode TrigT1Lucid::execute() { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg; m_digitContainer = 0; std::string containerName = m_LUCID_LVL1T1ContainerName; @@ -99,15 +99,15 @@ namespace LVL1 { if (sc.isFailure() || !m_digitContainer) { if(msgLvl(MSG::WARNING)) { - msg(MSG::WARNING) << "BAD DATA!!! Input data does not include " << containerName << endreq; - msg(MSG::WARNING) << "Alogrithm will shut down for the rest of the run." << endreq; + msg(MSG::WARNING) << "BAD DATA!!! Input data does not include " << containerName << endmsg; + msg(MSG::WARNING) << "Alogrithm will shut down for the rest of the run." << endmsg; } m_badDataFound = true; return StatusCode::SUCCESS; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved" - << endreq; + << endmsg; } @@ -138,7 +138,7 @@ namespace LVL1 { << " isSideA : " << isSideA << " isSideC : " << isSideC << " qdcThresold: " << m_qdcThreshold - << " isHit : " << isHit << endreq; + << " isHit : " << isHit << endmsg; } } @@ -152,7 +152,7 @@ namespace LVL1 { << " nHitsC " << nHitsC << " ," << " lucid cableWord0 " << cableWord0 << " ," << " bits " << std::setw(6) - << BitOp::printBits(cableWord0, 0, 20) << endreq; + << BitOp::printBits(cableWord0, 0, 20) << endmsg; } LucidCTP* lucidCTP = new LucidCTP(cableWord0); @@ -169,13 +169,13 @@ namespace LVL1 { if (sc.isFailure()) { if(msgLvl(MSG::ERROR)) { msg(MSG::ERROR) << containerName << " failed to register. " - << endreq; + << endmsg; } return StatusCode::FAILURE; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << containerName << " registered successfully. " - << endreq; + << endmsg; } return StatusCode::SUCCESS; diff --git a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx index ed90435486b..c6560723a9d 100755 --- a/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx +++ b/Trigger/TrigT1/TrigT1RPCRecRoiSvc/src/RPCRecRoiSvc.cxx @@ -23,14 +23,14 @@ StatusCode RPCRecRoiSvc::initialize (void) StoreGateSvc* detStore; StatusCode sc = service("DetectorStore",detStore); if (sc.isFailure()) { - log << MSG::FATAL << "DetectorStore service not found !" << endreq; + log << MSG::FATAL << "DetectorStore service not found !" << endmsg; } else { sc = detStore->retrieve(m_MuonMgr); if ( sc.isFailure() ) { - log << MSG::ERROR << " Cannot retrieve MuonReadoutGeometry " << endreq; + log << MSG::ERROR << " Cannot retrieve MuonReadoutGeometry " << endmsg; return sc; } else { - log << MSG::DEBUG << "Found the MuonDetDescrMgr " << endreq; + log << MSG::DEBUG << "Found the MuonDetDescrMgr " << endmsg; } } @@ -41,7 +41,7 @@ StatusCode RPCRecRoiSvc::initialize (void) { log << MSG::WARNING << "Unable to retrieve the RPC cabling Server Service" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -50,7 +50,7 @@ StatusCode RPCRecRoiSvc::initialize (void) { log << MSG::WARNING << "Unable to retrieve the RPC cabling Service from the Server" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -164,7 +164,7 @@ RPCRecRoiSvc::dumpRoiMap(const std::string& filename) // roi_map.open("ROI_Mapping.txt", std::ios::out ); //try to open the file roi_map.open(filename.c_str(), std::ios::out ); //try to open the file if(!roi_map){ - msg << MSG::WARNING << "Unable to open ROI_Mapping file!"<< endreq; + msg << MSG::WARNING << "Unable to open ROI_Mapping file!"<< endmsg; } else { roi_map <<"# side sector roi etaMin etaMax phiMin phiMax etaMinLow etaMaxLow etaMinHigh etaMaxHigh "<< std::endl; roi_map <<"# ------------------------------------------------------------------------------------------------------------------------------ "<< std::endl; diff --git a/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx b/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx index f3ac164dc82..5dcf6937fbd 100755 --- a/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx +++ b/Trigger/TrigT1/TrigT1RPCsteering/src/TrigT1RPC.cxx @@ -298,8 +298,8 @@ StatusCode TrigT1RPC::execute() { StatusCode TrigT1RPC::finalize() { - ATH_MSG_DEBUG ( "in finalize()" << endreq - << "processed digits = " << digit_num << endreq + ATH_MSG_DEBUG ( "in finalize()" << endmsg + << "processed digits = " << digit_num << endmsg << "digits out of the time window = " << digit_out ); diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc index dac06eae1bd..80491adef98 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc +++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc @@ -60,17 +60,17 @@ StatusCode RecRoIBResultByteStreamCnv< ROBF >::initialize() { } MsgStream log( messageService(), "RecRoIBResultByteStreamCnv" ); - log << MSG::DEBUG << "In initialize()" << endreq; + log << MSG::DEBUG << "In initialize()" << endmsg; // // Get RecRoIBResultByteStreamTool: // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Couldn't retrieve RecRoIBResultByteStreamTool" << endreq; + log << MSG::FATAL << "Couldn't retrieve RecRoIBResultByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Retrieved RecRoIBResultByteStreamTool" << endreq; + log << MSG::DEBUG << "Retrieved RecRoIBResultByteStreamTool" << endmsg; } return StatusCode::SUCCESS; @@ -86,12 +86,12 @@ template< class ROBF > StatusCode RecRoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) { MsgStream log( messageService(), "RecRoIBResultByteStreamCnv" ); - log << MSG::DEBUG << "createObj() called" << endreq; + log << MSG::DEBUG << "createObj() called" << endmsg; ByteStreamAddressL1R *pAddrL1; pAddrL1 = dynamic_cast< ByteStreamAddressL1R* >( pAddr ); if( ! pAddrL1 ) { - log << MSG::ERROR << " Cannot cast to ByteStreamAddressL1R" << endreq ; + log << MSG::ERROR << " Cannot cast to ByteStreamAddressL1R" << endmsg ; return StatusCode::FAILURE; } @@ -102,10 +102,10 @@ StatusCode RecRoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, // Convert to Object StatusCode sc = m_tool->convert( robs, result ); if( sc.isFailure() ) { - log << MSG::ERROR << "Couldn't Create Objects: " << *( pAddrL1->par() ) << endreq; + log << MSG::ERROR << "Couldn't Create Objects: " << *( pAddrL1->par() ) << endmsg; return sc; } else { - log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) << endreq; + log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) << endmsg; } pObj = SG::asStorable( result ); diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc index 8b9a4cf22c8..d7e60439aef 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc +++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.icc @@ -24,7 +24,7 @@ StatusCode RecRoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs ROIB::RecRoIBResult*& result ) { MsgStream log( msgSvc(), name() ); - log << MSG::DEBUG << "executing convert() from ROBFragments to RIO" << endreq; + log << MSG::DEBUG << "executing convert() from ROBFragments to RIO" << endmsg; /* Object defs */ std::vector< LVL1::RecEmTauRoI > emTauContent; diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc index e47f54d20b1..43321c566b2 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc +++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc @@ -60,17 +60,17 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::initialize() { } MsgStream log( messageService(), "RoIBResultByteStreamCnv" ); - log << MSG::DEBUG << "In initialize()" << endreq; + log << MSG::DEBUG << "In initialize()" << endmsg; // // Get ByteStreamCnvSvc: // sc = m_ByteStreamCnvSvc.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get ByteStreamCnvSvc" << endreq; + log << MSG::FATAL << "Can't get ByteStreamCnvSvc" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to ByteStreamCnvSvc" << endreq; + log << MSG::DEBUG << "Connected to ByteStreamCnvSvc" << endmsg; } // @@ -78,10 +78,10 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::initialize() { // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get RoIBResultByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get RoIBResultByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to RoIBResultByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to RoIBResultByteStreamTool" << endmsg; } return StatusCode::SUCCESS; @@ -96,12 +96,12 @@ template< class ROBF > StatusCode RoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) { MsgStream log( messageService(), "RoIBResultByteStreamCnv" ); - log << MSG::DEBUG << "createObj() called" << endreq; + log << MSG::DEBUG << "createObj() called" << endmsg; ByteStreamAddressL1R *pAddrL1; pAddrL1 = dynamic_cast< ByteStreamAddressL1R* >( pAddr ); if( ! pAddrL1 ) { - log << MSG::ERROR << " Cannot cast to ByteStreamAddressL1R" << endreq ; + log << MSG::ERROR << " Cannot cast to ByteStreamAddressL1R" << endmsg ; return StatusCode::FAILURE; } @@ -112,11 +112,11 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, Da // Convert to Object StatusCode sc = m_tool->convert( robs, result ); if( sc.isFailure() ) { - log << MSG::ERROR << "Couldn't convert the robs into RoIBResult" << endreq; + log << MSG::ERROR << "Couldn't convert the robs into RoIBResult" << endmsg; return sc; } - log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) <<endreq; + log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) <<endmsg; pObj = SG::asStorable( result ) ; return StatusCode::SUCCESS; @@ -132,14 +132,14 @@ template< class ROBF > StatusCode RoIBResultByteStreamCnv< ROBF >::createRep( DataObject* pObj, IOpaqueAddress*& pAddr ) { MsgStream log( messageService(), "RoIBResultByteStreamCnv" ); - log << MSG::DEBUG << "createRep() called" << endreq; + log << MSG::DEBUG << "createRep() called" << endmsg; RawEventWrite* re = m_ByteStreamCnvSvc->getRawEvent(); ROIB::RoIBResult* result; if( ! SG::fromStorable( pObj, result ) ) { - log << MSG::ERROR << " Cannot cast to RoIBResult" << endreq ; + log << MSG::ERROR << " Cannot cast to RoIBResult" << endmsg ; return StatusCode::FAILURE; } diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc index 8743a129adf..9f1896aae00 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc +++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.icc @@ -31,7 +31,7 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, ROIB::RoIBResult*& result ) { MsgStream log( msgSvc(), name() ); - log << MSG::DEBUG << "executing convert() from ROBFragments to RDO" << endreq; + log << MSG::DEBUG << "executing convert() from ROBFragments to RDO" << endmsg; /* Create all RDOs */ ROIB::CTPResult cTPResult; @@ -86,10 +86,10 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, DataType status; rob.rod_status( status ); uint32_t nstatus = rob.rod_nstatus(); - log << MSG::VERBOSE << "Number of status words: " << nstatus << endreq; + log << MSG::VERBOSE << "Number of status words: " << nstatus << endmsg; for( uint32_t i = 0; i < nstatus; ++i, ++status ) { log << MSG::VERBOSE << " Status word: 0x" << MSG::hex << std::setw( 8 ) - << std::setfill( '0' ) << *status << endreq; + << std::setfill( '0' ) << *status << endmsg; } rob.rod_status( status ); @@ -104,14 +104,14 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, log << MSG::DEBUG << "ROB ID 0x" << MSG::hex << robId << " ROD ID 0x" << rodId << MSG::dec << " ROB fragment size " - << robFragSize << " ROD fragment size " << rodFragSize << endreq; + << robFragSize << " ROD fragment size " << rodFragSize << endmsg; /* CTP ROB */ eformat::helper::SourceIdentifier helpCTPID( eformat::TDAQ_CTP, m_ctpModuleID ); eformat::helper::SourceIdentifier helpCTPID_II( eformat::TDAQ_CTP, 0 ); log << MSG::DEBUG << "Check ROD ID against CTP 0x" << MSG::hex - << helpCTPID.code() << MSG::dec << endreq; + << helpCTPID.code() << MSG::dec << endmsg; if( rodId == helpCTPID.code() || // this is a hack to catch the early data with the old CTP // firmware, which assigns 0x770000 to both DAQ and LVL2 ROD @@ -121,10 +121,10 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, ( rodId == helpCTPID_II.code() && rodFragSize == 46 ) ) { if( rodId == helpCTPID_II.code() && rodFragSize == 46 ) { - log << MSG::DEBUG << "Take CTP ROD fragment with ID 0x" << MSG::hex << rodId << MSG::dec << endreq; + log << MSG::DEBUG << "Take CTP ROD fragment with ID 0x" << MSG::hex << rodId << MSG::dec << endmsg; } - log << MSG::DEBUG << " Found CTP ROB." << endreq; - log << MSG::VERBOSE << " Dumping RoI Words:" << endreq; + log << MSG::DEBUG << " Found CTP ROB." << endmsg; + log << MSG::VERBOSE << " Dumping RoI Words:" << endmsg; /* Celebrate finding the ROD */ cTPFound = true; @@ -137,7 +137,7 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, std::vector< ROIB::CTPRoI > cTPContent; for( uint32_t i = 0; i < ndata; ++i, ++data ) { log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) - << static_cast< uint32_t >( *data ) << endreq; + << static_cast< uint32_t >( *data ) << endmsg; ROIB::CTPRoI thisRoI( static_cast<uint32_t>( *data ) ); cTPContent.push_back( thisRoI ); } @@ -164,8 +164,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, eformat::helper::SourceIdentifier helpMuonID( eformat::TDAQ_MUON_CTP_INTERFACE, m_muCTPIModuleID ); if( rodId == helpMuonID.code() ) { - log << MSG::DEBUG << " Found MuCTPI ROB." << endreq; - log << MSG::VERBOSE << " Dumping RoI Words:" << endreq; + log << MSG::DEBUG << " Found MuCTPI ROB." << endmsg; + log << MSG::VERBOSE << " Dumping RoI Words:" << endmsg; /* Celebrate finding the ROB */ muCTPIFound = true; @@ -178,7 +178,7 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, std::vector< ROIB::MuCTPIRoI > muCTPIContent; for( uint32_t i = 0; i < ndata; ++i, ++data ) { log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) - << static_cast< uint32_t >( *data ) << endreq; + << static_cast< uint32_t >( *data ) << endmsg; ROIB::MuCTPIRoI thisRoI( static_cast< uint32_t >( *data ) ); muCTPIContent.push_back( thisRoI ); } @@ -202,8 +202,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, eformat::helper::SourceIdentifier helpJetID_1( eformat::TDAQ_CALO_JET_PROC_ROI, m_jetModuleID[1] ); if( rodId == helpJetID_0.code() || rodId == helpJetID_1.code() ) { - log << MSG::DEBUG << " Found Jet/Energy ROB." << endreq; - log << MSG::VERBOSE << " Dumping RoI Words:" << endreq; + log << MSG::DEBUG << " Found Jet/Energy ROB." << endmsg; + log << MSG::VERBOSE << " Dumping RoI Words:" << endmsg; /* Create header */ ROIB::Header jetEnergyHead( rodId, evtNum, formatVersion ); @@ -214,7 +214,7 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, std::vector< ROIB::JetEnergyRoI > jetEnergyContent; for( uint32_t i = 0; i < ndata; ++i, ++data ) { log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) - << static_cast< uint32_t >( *data ) << endreq; + << static_cast< uint32_t >( *data ) << endmsg; ROIB::JetEnergyRoI thisRoI( static_cast< uint32_t >( *data ) ); jetEnergyContent.push_back( thisRoI ); } @@ -244,8 +244,8 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, if( rodId == helpEMTauID_0.code() || rodId == helpEMTauID_1.code() || rodId == helpEMTauID_2.code() || rodId == helpEMTauID_3.code() ) { - log << MSG::DEBUG << " Found EM/Tau ROB." << endreq; - log << MSG::VERBOSE << " Dumping RoI Words:" << endreq; + log << MSG::DEBUG << " Found EM/Tau ROB." << endmsg; + log << MSG::VERBOSE << " Dumping RoI Words:" << endmsg; /* Create header */ ROIB::Header eMTauHead( rodId, evtNum, formatVersion ); @@ -256,7 +256,7 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, std::vector<ROIB::EMTauRoI> eMTauContent; for( uint32_t i = 0; i < ndata; ++i, ++data ) { log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) - << static_cast< uint32_t >( *data ) << endreq; + << static_cast< uint32_t >( *data ) << endmsg; ROIB::EMTauRoI thisRoI( static_cast<uint32_t>( *data ) ); eMTauContent.push_back( thisRoI ); } @@ -352,33 +352,33 @@ StatusCode RoIBResultByteStreamTool::convert( const std::vector< ROBF >& robs, eMTauFound[ 0 ] && eMTauFound[ 1 ] && eMTauFound[ 2 ] && eMTauFound[ 3 ] ) { result = new ROIB::RoIBResult( muCTPIResult, cTPResult, jetEnergyResult, eMTauResult ); - log << MSG::DEBUG << "All RoI Builder ROB fragments found" << endreq; + log << MSG::DEBUG << "All RoI Builder ROB fragments found" << endmsg; } else if( cTPFound && jetEnergyFound[ 0 ] && jetEnergyFound[ 1 ] && eMTauFound[ 0 ] && eMTauFound[ 1 ] && eMTauFound[ 2 ] && eMTauFound[ 3 ] ) { result = new ROIB::RoIBResult( cTPResult, eMTauResult, jetEnergyResult ); - log << MSG::DEBUG << "MuCTPI ROB fragment not found, built RoIBResult object without it." << endreq; + log << MSG::DEBUG << "MuCTPI ROB fragment not found, built RoIBResult object without it." << endmsg; } else if( cTPFound && eMTauFound[ 0 ] && eMTauFound[ 1 ] && eMTauFound[ 2 ] && eMTauFound[ 3 ] ) { result = new ROIB::RoIBResult( cTPResult, eMTauResult ); - log << MSG::DEBUG << "MuCTPI and Jet/Energy fragments not found, built RoIBResult object without them." << endreq; + log << MSG::DEBUG << "MuCTPI and Jet/Energy fragments not found, built RoIBResult object without them." << endmsg; } else if( cTPFound && muCTPIFound ) { // jetEnergyResult and eMTauResult are empty result = new ROIB::RoIBResult( muCTPIResult, cTPResult, jetEnergyResult, eMTauResult ); - log << MSG::DEBUG << "Calo fragments not found, built RoIBResult from CTPResult and MuCTPIResult only." << endreq; + log << MSG::DEBUG << "Calo fragments not found, built RoIBResult from CTPResult and MuCTPIResult only." << endmsg; } else if( cTPFound ) { result = new ROIB::RoIBResult( cTPResult ); - log << MSG::DEBUG << "MuCTPI and calo fragments not found, built RoIBResult from CTPResult only." << endreq; + log << MSG::DEBUG << "MuCTPI and calo fragments not found, built RoIBResult from CTPResult only." << endmsg; } else { result = new ROIB::RoIBResult(); - log << MSG::DEBUG << "No LVL1 fragments found, create empty RoIBResult." << endreq; + log << MSG::DEBUG << "No LVL1 fragments found, create empty RoIBResult." << endmsg; } if( l1TopoFound ){ diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx index 637337ee6e8..bb60233259f 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx +++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx @@ -69,17 +69,17 @@ StatusCode CTPByteStreamCnv::initialize() { } MsgStream log( messageService(), "CTPByteStreamCnv" ); - log << MSG::DEBUG << "CTPByteStreamCnv in initialize() " << endreq; + log << MSG::DEBUG << "CTPByteStreamCnv in initialize() " << endmsg; // // Get ByteStreamCnvSvc: // sc = m_ByteStreamEventAccess.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endreq; + log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to ByteStreamEventAccess interface" << endreq; + log << MSG::DEBUG << "Connected to ByteStreamEventAccess interface" << endmsg; } // @@ -87,10 +87,10 @@ StatusCode CTPByteStreamCnv::initialize() { // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get CTPByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get CTPByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg; } // @@ -98,10 +98,10 @@ StatusCode CTPByteStreamCnv::initialize() { // sc = m_robDataProvider.retrieve(); if( sc.isFailure() ) { - log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endreq; + log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endmsg; // return is disabled for Write BS which does not requre ROBDataProviderSvc } else { - log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endreq; + log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg; } // @@ -121,16 +121,16 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj MsgStream log( messageService(), "CTPByteStreamCnv" ); - log << MSG::DEBUG << "createObj() called" << endreq; + log << MSG::DEBUG << "createObj() called" << endmsg; ByteStreamAddress *pBS_Addr; pBS_Addr = dynamic_cast< ByteStreamAddress* >( pAddr ); if( ! pBS_Addr ) { - log << MSG::ERROR << "Can not cast input to ByteStreamAddress" << endreq ; + log << MSG::ERROR << "Can not cast input to ByteStreamAddress" << endmsg ; return StatusCode::FAILURE; } - log << MSG::DEBUG << "Creating Objects: " << *( pBS_Addr->par() ) << endreq; + log << MSG::DEBUG << "Creating Objects: " << *( pBS_Addr->par() ) << endmsg; // // Get the SourceID: @@ -138,7 +138,7 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj const uint32_t robId = m_srcIdMap->getRobID( m_srcIdMap->getRodID() ); log << MSG::DEBUG << "expected ROB sub-detector ID: " << std::hex - << robId << std::dec << endreq; + << robId << std::dec << endmsg; std::vector< uint32_t > vID; vID.push_back( robId ); @@ -153,8 +153,8 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj // Size check: // if( robFrags.size() != 1 ) { - log << MSG::WARNING << "Number of ROB fragments is " << robFrags.size() << endreq; - log << MSG::WARNING << "Creating empty CTP_RDO object" << endreq; + log << MSG::WARNING << "Number of ROB fragments is " << robFrags.size() << endmsg; + log << MSG::WARNING << "Creating empty CTP_RDO object" << endmsg; CTP_RDO* result = new CTP_RDO(3,0,0); pObj = SG::asStorable( result ); @@ -169,7 +169,7 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result ); if ( sc.isFailure() ) { - log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endreq; + log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endmsg; return sc; } pObj = SG::asStorable( result ) ; @@ -186,13 +186,13 @@ StatusCode CTPByteStreamCnv::createRep( DataObject* pObj, IOpaqueAddress*& pAddr MsgStream log( messageService(), "CTPByteStreamCnv" ); - log << MSG::DEBUG << "createRep() called" << endreq; + log << MSG::DEBUG << "createRep() called" << endmsg; RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent(); CTP_RDO* result; if( ! SG::fromStorable( pObj, result ) ) { - log << MSG::ERROR << " Cannot cast to CTP_RDO" << endreq; + log << MSG::ERROR << " Cannot cast to CTP_RDO" << endmsg; return StatusCode::FAILURE; } diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx index 8d9b10e1208..cde78e9d623 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx +++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx @@ -83,14 +83,14 @@ StatusCode MuCTPIByteStreamCnv::initialize() { } MsgStream log( messageService(), "MuCTPIByteStreamCnv" ); - log << MSG::DEBUG << "MuCTPIByteStreamCnv in initialize() " << endreq; + log << MSG::DEBUG << "MuCTPIByteStreamCnv in initialize() " << endmsg; // // Get ByteStreamCnvSvc: // sc = m_ByteStreamEventAccess.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endreq; + log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endmsg; return sc; } @@ -99,10 +99,10 @@ StatusCode MuCTPIByteStreamCnv::initialize() { // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get MuCTPIByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get MuCTPIByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to MuCTPIByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to MuCTPIByteStreamTool" << endmsg; } #ifdef CTP_MUCTPI_HAVE_SAME_ROS @@ -111,10 +111,10 @@ StatusCode MuCTPIByteStreamCnv::initialize() { // sc = m_ctp_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get CTPByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get CTPByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg; } // @@ -122,10 +122,10 @@ StatusCode MuCTPIByteStreamCnv::initialize() { // sc = m_ctp_rec_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg; } #endif @@ -134,10 +134,10 @@ StatusCode MuCTPIByteStreamCnv::initialize() { // sc = m_robDataProvider.retrieve(); if( sc.isFailure() ) { - log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endreq; + log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endmsg; // return is disabled for Write BS which does not requre ROBDataProviderSvc } else { - log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endreq; + log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg; } // @@ -157,16 +157,16 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p MsgStream log( messageService(), "MuCTPIByteStreamCnv" ); - log << MSG::DEBUG << "createObj() called" << endreq; + log << MSG::DEBUG << "createObj() called" << endmsg; ByteStreamAddress *pBS_Addr; pBS_Addr = dynamic_cast< ByteStreamAddress* >( pAddr ); if ( !pBS_Addr ) { - log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq ; + log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg ; return StatusCode::FAILURE; } - log << MSG::DEBUG << " Creating Objects " << *( pBS_Addr->par() ) << endreq; + log << MSG::DEBUG << " Creating Objects " << *( pBS_Addr->par() ) << endmsg; // // Get SourceID: @@ -174,7 +174,7 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p const uint32_t robId = m_srcIdMap->getRobID( m_srcIdMap->getRodID() ); log << MSG::DEBUG << " expected ROB sub-detector ID: " << std::hex - << robId << std::dec << endreq; + << robId << std::dec << endmsg; std::vector< uint32_t > vID; vID.push_back( robId ); @@ -211,7 +211,7 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p m_robDataProvider->getROBData( vID, robFrags ); if( robFrags.size() == 0 ) { - log << MSG::WARNING << "No MuCTPI ROB fragments found!" << endreq; + log << MSG::WARNING << "No MuCTPI ROB fragments found!" << endmsg; MuCTPI_RDO* result = new MuCTPI_RDO; pObj = SG::asStorable( result ); @@ -224,7 +224,7 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p MuCTPI_RDO* result = 0; StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result ); if( sc.isFailure() ) { - log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endreq; + log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endmsg; if (result!=0){ delete result; result=0; @@ -249,27 +249,27 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p sc = m_ctp_tool->convert( ROBData( *it ).getROBFragment(), ctp_result ); if ( sc.isFailure() ) { - log << MSG::ERROR << "Failed to create CTP_RDO " << endreq; + log << MSG::ERROR << "Failed to create CTP_RDO " << endmsg; return sc; } SG::asStorable( ctp_result ) ; sc = m_storeGate->record( ctp_result, "CTP_RDO" ); if( sc.isFailure() ) { - log << MSG::ERROR << "Cannot record CTP_RDO " << endreq; + log << MSG::ERROR << "Cannot record CTP_RDO " << endmsg; return sc; } sc = m_ctp_rec_tool->convert( ROBData( *it ).getROBFragment(), ctp_rio_result, log ); if( sc.isFailure() ) { - log << MSG::ERROR << "Failed to create CTP_RIO object" << endreq; + log << MSG::ERROR << "Failed to create CTP_RIO object" << endmsg; return sc; } SG::asStorable( ctp_rio_result ) ; sc = m_storeGate->record( ctp_rio_result, "CTP_RIO" ); if( sc.isFailure() ) { - log << MSG::ERROR << "Cannot record CTP_RIO " << endreq; + log << MSG::ERROR << "Cannot record CTP_RIO " << endmsg; return sc; } @@ -289,13 +289,13 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p StatusCode MuCTPIByteStreamCnv::createRep( DataObject* pObj, IOpaqueAddress*& pAddr ) { MsgStream log( messageService(), "MuCTPIByteStreamCnv" ); - log << MSG::DEBUG << "createRep() called" << endreq; + log << MSG::DEBUG << "createRep() called" << endmsg; RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent(); MuCTPI_RDO* result; if( ! SG::fromStorable( pObj, result ) ) { - log << MSG::ERROR << " Cannot cast to MuCTPI_RDO" << endreq; + log << MSG::ERROR << " Cannot cast to MuCTPI_RDO" << endmsg; return StatusCode::FAILURE; } diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx index 016e758160c..ab6c0e13e57 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx +++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx @@ -68,17 +68,17 @@ StatusCode RecCTPByteStreamCnv::initialize() { } MsgStream log( messageService(), "RecCTPByteStreamCnv" ); - log << MSG::DEBUG << "RecCTPByteStreamCnv in initialize()" << endreq; + log << MSG::DEBUG << "RecCTPByteStreamCnv in initialize()" << endmsg; // // Get RecCTPByteStreamTool: // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endreq; + log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg; } // @@ -86,10 +86,10 @@ StatusCode RecCTPByteStreamCnv::initialize() { // sc = m_robDataProvider.retrieve(); if( sc.isFailure() ) { - log << MSG::FATAL << "Can't get ROBDataProviderSvc" << endreq; + log << MSG::FATAL << "Can't get ROBDataProviderSvc" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endreq; + log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg; } // @@ -109,16 +109,16 @@ StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p MsgStream log( messageService(), "RecCTPByteStreamCnv" ); - log << MSG::DEBUG << "RecCTPByteStreamCnv::createObj() called" << endreq; + log << MSG::DEBUG << "RecCTPByteStreamCnv::createObj() called" << endmsg; ByteStreamAddress *pBS_Addr; pBS_Addr = dynamic_cast< ByteStreamAddress* >( pAddr ); if( !pBS_Addr ) { - log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq ; + log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg ; return StatusCode::FAILURE; } - log << MSG::DEBUG << " Creating Objects: " << *( pBS_Addr->par() ) << endreq; + log << MSG::DEBUG << " Creating Objects: " << *( pBS_Addr->par() ) << endmsg; // // Get SourceID: @@ -126,7 +126,7 @@ StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p const uint32_t robId = m_srcIdMap->getRobID( m_srcIdMap->getRodID() ); log << MSG::DEBUG << "expected ROB sub-detector ID: " << std::hex - << robId << std::dec << endreq; + << robId << std::dec << endmsg; std::vector< uint32_t > vID; vID.push_back( robId ); @@ -138,7 +138,7 @@ StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p // size check if ( robFrags.size() != 1 ) { log << MSG::WARNING << " Number of ROB fragments for source ID 0x" << MSG::hex << robId - << " is " << robFrags.size() << endreq; + << " is " << robFrags.size() << endmsg; CTP_RIO* result = new CTP_RIO; pObj = SG::asStorable( result ) ; @@ -150,7 +150,7 @@ StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result ); if ( sc.isFailure() ) { - log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endreq; + log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endmsg; return sc; } pObj = SG::asStorable( result ); diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx index 0cf70c00245..8865b34a7e4 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx +++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx @@ -67,17 +67,17 @@ StatusCode RecMuCTPIByteStreamCnv::initialize() { } MsgStream log( messageService(), "RecMuCTPIByteStreamCnv" ); - log << MSG::DEBUG << "RecMuCTPIByteStreamCnv in initialize()" << endreq; + log << MSG::DEBUG << "RecMuCTPIByteStreamCnv in initialize()" << endmsg; // // Get RecMuCTPIByteStreamTool: // sc = m_tool.retrieve(); if( sc.isFailure() ) { - log << MSG::ERROR << "Can't get RecMuCTPIByteStreamTool" << endreq; + log << MSG::ERROR << "Can't get RecMuCTPIByteStreamTool" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to RecMuCTPIByteStreamTool" << endreq; + log << MSG::DEBUG << "Connected to RecMuCTPIByteStreamTool" << endmsg; } // @@ -85,10 +85,10 @@ StatusCode RecMuCTPIByteStreamCnv::initialize() { // sc = m_robDataProvider.retrieve(); if( sc.isFailure() ) { - log << MSG::ERROR << "Can't get ROBDataProviderSvc" << endreq; + log << MSG::ERROR << "Can't get ROBDataProviderSvc" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endreq; + log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg; } // @@ -108,16 +108,16 @@ StatusCode RecMuCTPIByteStreamCnv::initialize() { StatusCode RecMuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) { MsgStream log( messageService(), "RecMuCTPIByteStreamCnv" ); - log << MSG::DEBUG << "executing createObj()" << endreq; + log << MSG::DEBUG << "executing createObj()" << endmsg; ByteStreamAddress *pBS_Addr; pBS_Addr = dynamic_cast< ByteStreamAddress* >( pAddr ); if ( !pBS_Addr ) { - log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endreq ; + log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg ; return StatusCode::FAILURE; } - log << MSG::DEBUG << " Creating Objects " << *( pBS_Addr->par() ) << endreq; + log << MSG::DEBUG << " Creating Objects " << *( pBS_Addr->par() ) << endmsg; // get SourceID const uint32_t robId = m_srcIdMap->getRobID( m_srcIdMap->getRodID() ); @@ -140,7 +140,7 @@ StatusCode RecMuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject* // size check if ( robFrags.size() != 1 ) { log << MSG::WARNING << " Number of ROB fragments for source ROB ID " << MSG::hex << newRobId << " (ROD ID " - << m_srcIdMap->getRodID() << MSG::dec << ") is " << robFrags.size() << endreq; + << m_srcIdMap->getRodID() << MSG::dec << ") is " << robFrags.size() << endmsg; MuCTPI_RIO * result = new MuCTPI_RIO; pObj = SG::asStorable( result ) ; return StatusCode::SUCCESS; @@ -152,7 +152,7 @@ StatusCode RecMuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject* // Convert to Object StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result ); if ( sc.isFailure() ) { - log << MSG::ERROR << " Failed to create Objects " << *( pBS_Addr->par() ) << endreq; + log << MSG::ERROR << " Failed to create Objects " << *( pBS_Addr->par() ) << endmsg; return sc; } pObj = SG::asStorable( result ) ; diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx index 8ec3ec32081..0f0fa68ca6b 100755 --- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx +++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx @@ -86,66 +86,66 @@ StatusCode RoIBResultByteStreamTool::initialize() { ServiceHandle< IProperty > p_ByteStreamAddressProviderSvc( "ByteStreamAddressProviderSvc", name() ); sc = p_ByteStreamAddressProviderSvc.retrieve(); if( sc.isFailure() ) { - log << MSG::ERROR << "Can't get ByteStreamAddressProviderSvc" << endreq; + log << MSG::ERROR << "Can't get ByteStreamAddressProviderSvc" << endmsg; return sc; } else { - log << MSG::DEBUG << "Connected to " << p_ByteStreamAddressProviderSvc.name() << endreq; + log << MSG::DEBUG << "Connected to " << p_ByteStreamAddressProviderSvc.name() << endmsg; UnsignedIntegerProperty ctpModuleID; ctpModuleID.setName("CTPModuleID"); if (ctpModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("CTPModuleID"))) { m_ctpModuleID = ctpModuleID.value() ; - log << MSG::DEBUG << " ---> getProperty('CTPModuleID') = " << ctpModuleID << endreq; + log << MSG::DEBUG << " ---> getProperty('CTPModuleID') = " << ctpModuleID << endmsg; } else { - log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CTPModuleID') failed." << endreq; + log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CTPModuleID') failed." << endmsg; } UnsignedIntegerProperty muCTPIModuleID; muCTPIModuleID.setName("MuCTPIModuleID"); if (muCTPIModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("MuCTPIModuleID"))) { m_muCTPIModuleID = muCTPIModuleID.value() ; - log << MSG::DEBUG << " ---> getProperty('MuCTPIModuleID') = " << muCTPIModuleID << endreq; + log << MSG::DEBUG << " ---> getProperty('MuCTPIModuleID') = " << muCTPIModuleID << endmsg; } else { - log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('MuCTPIModuleID') failed." << endreq; + log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('MuCTPIModuleID') failed." << endmsg; } UnsignedIntegerArrayProperty jetProcModuleID; jetProcModuleID.setName("JetProcModuleID"); if (jetProcModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("JetProcModuleID"))) { m_jetModuleID = jetProcModuleID.value() ; - log << MSG::DEBUG << " ---> getProperty('JetProcModuleID') = " << jetProcModuleID << endreq; + log << MSG::DEBUG << " ---> getProperty('JetProcModuleID') = " << jetProcModuleID << endmsg; } else { - log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('JetProcModuleID') failed." << endreq; + log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('JetProcModuleID') failed." << endmsg; } UnsignedIntegerArrayProperty caloClusterProcModuleID; caloClusterProcModuleID.setName("CaloClusterProcModuleID"); if (caloClusterProcModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("CaloClusterProcModuleID"))) { m_emModuleID = caloClusterProcModuleID.value() ; - log << MSG::DEBUG << " ---> getProperty('CaloClusterProcModuleID') = " << caloClusterProcModuleID << endreq; + log << MSG::DEBUG << " ---> getProperty('CaloClusterProcModuleID') = " << caloClusterProcModuleID << endmsg; } else { - log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CaloClusterProcModuleID') failed." << endreq; + log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('CaloClusterProcModuleID') failed." << endmsg; } UnsignedIntegerArrayProperty l1TopoModuleID; l1TopoModuleID.setName("TopoProcModuleID"); if (l1TopoModuleID.assign(p_ByteStreamAddressProviderSvc->getProperty("TopoProcModuleID"))) { m_l1TopoModuleID = l1TopoModuleID.value(); - log << MSG::DEBUG << " ---> getProperty('TopoProcModuleID') = " << l1TopoModuleID << endreq; + log << MSG::DEBUG << " ---> getProperty('TopoProcModuleID') = " << l1TopoModuleID << endmsg; } else { - log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('TopoProcModuleID') failed." << endreq; + log << MSG::WARNING << p_ByteStreamAddressProviderSvc.name() << "::getProperty('TopoProcModuleID') failed." << endmsg; } } - log<<MSG::DEBUG << " -- Module IDs for: "<<endreq; - log<<MSG::DEBUG << " CTP = 0x" <<MSG::hex<< m_ctpModuleID <<MSG::dec<<endreq; - log<<MSG::DEBUG << " muCTPi = 0x" <<MSG::hex<< m_muCTPIModuleID <<MSG::dec<<endreq; + log<<MSG::DEBUG << " -- Module IDs for: "<<endmsg; + log<<MSG::DEBUG << " CTP = 0x" <<MSG::hex<< m_ctpModuleID <<MSG::dec<<endmsg; + log<<MSG::DEBUG << " muCTPi = 0x" <<MSG::hex<< m_muCTPIModuleID <<MSG::dec<<endmsg; log<<MSG::DEBUG << " Calorimeter Cluster Processor RoI = 0x" <<MSG::hex<< m_emModuleID[0] - << ", 0x" << m_emModuleID[1] << ", 0x" << m_emModuleID[2] << ", 0x" << m_emModuleID[3] <<MSG::dec<<endreq; + << ", 0x" << m_emModuleID[1] << ", 0x" << m_emModuleID[2] << ", 0x" << m_emModuleID[3] <<MSG::dec<<endmsg; log<<MSG::DEBUG << " Calorimeter Jet/Energy Processor RoI = 0x" <<MSG::hex<< m_jetModuleID[0] - << ", 0x" << m_jetModuleID[1] <<MSG::dec<<endreq; + << ", 0x" << m_jetModuleID[1] <<MSG::dec<<endmsg; - // log<<MSG::DEBUG << " L1Topo = 0x" <<MSG::hex<< m_l1TopoModuleID[0] << ", 0x" << m_l1TopoModuleID[1] <<MSG::dec<<endreq; + // log<<MSG::DEBUG << " L1Topo = 0x" <<MSG::hex<< m_l1TopoModuleID[0] << ", 0x" << m_l1TopoModuleID[1] <<MSG::dec<<endmsg; std::ostringstream topoModulesString; for (unsigned int mid: m_l1TopoModuleID){ topoModulesString << L1Topo::formatHex4(mid) << " "; @@ -176,44 +176,44 @@ StatusCode RoIBResultByteStreamTool::convert( ROIB::RoIBResult* result, RawEvent // Reset lumi-block number to 1 m_fea.setDetEvtType( 1 ); - log << MSG::DEBUG << "executing convert() from RDO to ROBFragments" << endreq; + log << MSG::DEBUG << "executing convert() from RDO to ROBFragments" << endmsg; // I use only this one pointer now to fill the RODs: FullEventAssembler< L1SrcIdMap >::RODDATA* theROD; /** CTP ROD */ - log << MSG::VERBOSE << " Dumping CTP RoI words:" << endreq; + log << MSG::VERBOSE << " Dumping CTP RoI words:" << endmsg; eformat::helper::SourceIdentifier helpCTPID( eformat::TDAQ_CTP, m_ctpModuleID ); uint32_t rodIdCTP = helpCTPID.code(); theROD = m_fea.getRodData( rodIdCTP ); const std::vector< ROIB::CTPRoI >& CTPRoIVec = result->cTPResult().roIVec(); for( std::vector< ROIB::CTPRoI >::const_iterator j = CTPRoIVec.begin(); j != CTPRoIVec.end(); ++j ) { - log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endreq; + log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg; theROD->push_back( j->roIWord() ); } /** Muon ROD */ - log << MSG::VERBOSE << " Dumping MuCTPI RoI words:" << endreq; + log << MSG::VERBOSE << " Dumping MuCTPI RoI words:" << endmsg; eformat::helper::SourceIdentifier helpMuonID( eformat::TDAQ_MUON_CTP_INTERFACE, m_muCTPIModuleID ); uint32_t rodIdMuon = helpMuonID.code(); theROD = m_fea.getRodData( rodIdMuon ); const std::vector< ROIB::MuCTPIRoI >& MuCTPIRoIVec = result->muCTPIResult().roIVec(); for( std::vector< ROIB::MuCTPIRoI >::const_iterator j = MuCTPIRoIVec.begin(); j != MuCTPIRoIVec.end(); ++j ) { - log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endreq; + log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg; theROD->push_back( j->roIWord() ); } /** Jet/Energy ROD */ const std::vector< ROIB::JetEnergyResult >& jetEnergyResultVector = result->jetEnergyResult(); for( unsigned int slink = 0; slink < jetEnergyResultVector.size(); ++slink ) { - log << MSG::VERBOSE << " Dumping Jet/Energy " << slink << " RoI words:" << endreq; + log << MSG::VERBOSE << " Dumping Jet/Energy " << slink << " RoI words:" << endmsg; eformat::helper::SourceIdentifier helpJetID( eformat::TDAQ_CALO_JET_PROC_ROI, m_jetModuleID[slink] ); theROD = m_fea.getRodData( helpJetID.code() ); const std::vector< ROIB::JetEnergyRoI >& JetEnergyRoIVec = jetEnergyResultVector[ slink ].roIVec(); for( std::vector< ROIB::JetEnergyRoI >::const_iterator j = JetEnergyRoIVec.begin(); j != JetEnergyRoIVec.end(); ++j ) { - log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endreq; + log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg; theROD->push_back( j->roIWord() ); } } @@ -221,42 +221,42 @@ StatusCode RoIBResultByteStreamTool::convert( ROIB::RoIBResult* result, RawEvent /* EMTau RODs */ const std::vector< ROIB::EMTauResult >& eMTauRDOResultVector = result->eMTauResult(); for( unsigned int slink = 0; slink < eMTauRDOResultVector.size(); ++slink ) { - log << MSG::VERBOSE << " Dumping EM/Tau " << slink << " RoI words:" << endreq; + log << MSG::VERBOSE << " Dumping EM/Tau " << slink << " RoI words:" << endmsg; eformat::helper::SourceIdentifier helpEMTauID( eformat::TDAQ_CALO_CLUSTER_PROC_ROI, m_emModuleID[slink]); theROD = m_fea.getRodData( helpEMTauID.code() ); const std::vector< ROIB::EMTauRoI >& EMTauRoIVec = eMTauRDOResultVector[ slink ].roIVec(); for( std::vector<ROIB::EMTauRoI>::const_iterator j = EMTauRoIVec.begin(); j != EMTauRoIVec.end(); ++j ) { - log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endreq; + log << MSG::VERBOSE << " 0x" << MSG::hex << std::setw( 8 ) << j->roIWord() << endmsg; theROD->push_back( j->roIWord() ); } } /** L1Topo ROD */ - log << MSG::VERBOSE << " Dumping L1Topo RoI words" << endreq; + log << MSG::VERBOSE << " Dumping L1Topo RoI words" << endmsg; const std::vector< ROIB::L1TopoResult >& l1TopoResultVector = result->l1TopoResult(); - log << MSG::VERBOSE << " Dumping L1Topo RoI words for " << l1TopoResultVector.size() << " RODs:" << endreq; + log << MSG::VERBOSE << " Dumping L1Topo RoI words for " << l1TopoResultVector.size() << " RODs:" << endmsg; unsigned int slink(0); for (auto & l1tr : l1TopoResultVector){ uint32_t sourceID = l1tr.rdo().getSourceID(); // needs to be a 16-bit module ID - log << MSG::VERBOSE << " for L1Topo source ID from RDO " << L1Topo::formatHex8(sourceID) << endreq; + log << MSG::VERBOSE << " for L1Topo source ID from RDO " << L1Topo::formatHex8(sourceID) << endmsg; if (sourceID == 0 && slink < m_l1TopoModuleID.size()){ sourceID = eformat::helper::SourceIdentifier( eformat::TDAQ_CALO_TOPO_PROC, m_l1TopoModuleID.at(slink) ).code(); - log << MSG::DEBUG << " (source ID in L1TopoRDO was zero so using Property for slink " << slink << ": " << L1Topo::formatHex8(sourceID) << ")" << endreq; + log << MSG::DEBUG << " (source ID in L1TopoRDO was zero so using Property for slink " << slink << ": " << L1Topo::formatHex8(sourceID) << ")" << endmsg; } else if (sourceID == 0){ sourceID=eformat::helper::SourceIdentifier( eformat::TDAQ_CALO_TOPO_PROC, 0 ).code(); - log << MSG::WARNING << " (source ID in L1TopoRDO was zero, no properties available for slink counter " << slink << ", so as a fall back, constructed module 0 with source ID " << L1Topo::formatHex8(sourceID) << ")" << endreq; + log << MSG::WARNING << " (source ID in L1TopoRDO was zero, no properties available for slink counter " << slink << ", so as a fall back, constructed module 0 with source ID " << L1Topo::formatHex8(sourceID) << ")" << endmsg; } theROD = m_fea.getRodData( sourceID ); for ( auto & word : l1tr.rdo().getDataWords()){ - log << MSG::VERBOSE << " " << MSG::hex << std::setw(8) << std::showbase << word << std::noshowbase << std::dec << endreq; + log << MSG::VERBOSE << " " << MSG::hex << std::setw(8) << std::showbase << word << std::noshowbase << std::dec << endmsg; theROD->push_back(word); } ++slink; } /** now fill them into the RawEvent re */ - log << MSG::DEBUG << "Now filling the event with the RoI Builder fragments" << endreq; + log << MSG::DEBUG << "Now filling the event with the RoI Builder fragments" << endmsg; m_fea.fill( re, log ); return StatusCode::SUCCESS; diff --git a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx index bd841d82815..79fbf6c085c 100644 --- a/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx +++ b/Trigger/TrigT1/TrigT1TRT/src/TrigT1TRT.cxx @@ -30,10 +30,10 @@ namespace LVL1 { } StatusCode TrigT1TRT::initialize() { - if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endreq; + if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endmsg; if (Algorithm::initialize().isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg; return StatusCode::FAILURE; } @@ -42,36 +42,36 @@ namespace LVL1 { // Connect to the LVL1ConfigSvc to retrieve threshold settings. sc = m_configSvc.retrieve(); if (sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() << endmsg; return sc; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() << endmsg; } // retrieve TRT Detector Manager sc = detStore()->retrieve(mgr, "TRT"); if (sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT DetectorManager" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT DetectorManager" << endmsg; return sc; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT DetectorManager" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT DetectorManager" << endmsg; } // retrieve TRT Helper sc = detStore()->retrieve(m_pTRTHelper,"TRT_ID"); if (sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT Helper" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to TRT Helper" << endmsg; return sc; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT Helper" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Connected to TRT Helper" << endmsg; } // retrieve TRT_StrawNeighbourService. if (m_TRTStrawNeighbourSvc.name() == "") { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "TRT_StrawNeighbourSvc not given." << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "TRT_StrawNeighbourSvc not given." << endmsg; } else { sc = m_TRTStrawNeighbourSvc.retrieve(); if(sc.isFailure()){ - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not get StrawNeighbourSvc!" << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Could not get StrawNeighbourSvc!" << endmsg; } } @@ -83,9 +83,9 @@ namespace LVL1 { std::vector<TrigConf::TriggerThreshold*>::iterator th_itr_end = thresholds.end(); for(;th_itr!=th_itr_end;th_itr++) { if(*th_itr == 0) continue; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endmsg; if ((*th_itr)->name() == "TRTfast") { m_cablestarts[0]=(*th_itr)->cableStart(); } @@ -94,16 +94,16 @@ namespace LVL1 { if(thresholds.size()==0) { - msg(MSG::WARNING) << "No TRT thresholds found. Checking NIM thresholds for known TRT thresholds. THIS IS A HACK!"<<endreq; + msg(MSG::WARNING) << "No TRT thresholds found. Checking NIM thresholds for known TRT thresholds. THIS IS A HACK!"<<endmsg; thresholds = m_configSvc->thresholdConfig()->getThresholdVector(TrigConf::L1DataDef::NIM); th_itr = thresholds.begin(); th_itr_end = thresholds.end(); for(;th_itr!=th_itr_end;th_itr++) { if(*th_itr == 0) continue; if ((*th_itr)->name() == "NIMDIR25") { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endreq; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold name=" << (*th_itr)->name() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Threshold value=" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "1-bit Thershold cablestart=" << (*th_itr)->cableStart() << endmsg; m_cablestarts[0]=(*th_itr)->cableStart(); } } @@ -221,7 +221,7 @@ namespace LVL1 { } StatusCode TrigT1TRT::execute() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg; StatusCode sc; std::string containerName; @@ -259,13 +259,13 @@ namespace LVL1 { m_TRTRDO = 0; sc = evtStore()->retrieve( m_TRTRDO, containerName); if( sc.isFailure() || !m_TRTRDO ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << containerName << " not found" << endreq; - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "This event will be skipped." << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << containerName << " not found" << endmsg; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "This event will be skipped." << endmsg; return StatusCode::SUCCESS; } else { if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved" - << endreq; + << endmsg; } // Loop over all Lvl 1 TRT hits @@ -307,7 +307,7 @@ namespace LVL1 { m_chip = mat_chip_barrel[m_phi_module][m_strawNumber]; m_board = BarrelChipToBoard(m_chip); if (m_board < 0) { - if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failure in BarrelChipToBoard" << endreq; + if (msgLvl(MSG::FATAL)) msg(MSG::FATAL) << "Failure in BarrelChipToBoard" << endmsg; return StatusCode::FAILURE; } @@ -364,22 +364,22 @@ namespace LVL1 { } } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " cableWord: " << cableWord0 << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " cableWord: " << cableWord0 << endmsg; // Record the CTP trigger word in StoreGate. TrtCTP *trtCTP = new TrtCTP(cableWord0); containerName = DEFAULT_TrtCTPLocation; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "returning "<< trtCTP->dump() << endreq; - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << trtCTP->print() << endreq; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "returning "<< trtCTP->dump() << endmsg; + if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << trtCTP->print() << endmsg; sc = evtStore()->record(trtCTP, containerName, false); if(sc.isFailure()) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endmsg; return StatusCode::FAILURE; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " registered successfully " << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << containerName << " registered successfully " << endmsg; } return StatusCode::SUCCESS; diff --git a/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx b/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx index 2a9ddc5452d..8cd7c2bf1f9 100644 --- a/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx +++ b/Trigger/TrigT1/TrigT1ZDC/src/TrigT1ZDC.cxx @@ -40,13 +40,13 @@ namespace LVL1 { } StatusCode TrigT1ZDC::initialize() { - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "Initialising" << endmsg; StatusCode sc; sc = Algorithm::initialize(); if (sc.isFailure()) { - if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endreq; + if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg; return sc; } @@ -55,24 +55,24 @@ namespace LVL1 { sc = detStore().retrieve(); if (sc.isFailure()) { if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << detStore().typeAndName() - << endreq; + << endmsg; return sc; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Connected to " << detStore().typeAndName() - << endreq; + << endmsg; } // Connect to the LVL1ConfigSvc to retrieve threshold settings. sc = m_configSvc.retrieve(); if (sc.isFailure()) { if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName() - << endreq; + << endmsg; return sc; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName() - << endreq; + << endmsg; } // Connect to StoreGate service to retrieve input ZDC @@ -80,19 +80,19 @@ namespace LVL1 { sc = evtStore().retrieve(); if (sc.isFailure()) { if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to " << evtStore().typeAndName() - << endreq; + << endmsg; return sc; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << "Connected to " << evtStore().typeAndName() - << endreq; + << endmsg; } // Retrieve ZDC identifier helper from det store //sc = m_detStore->retrieve(m_tileTBID); //if (sc.isFailure()) { // m_log << MSG::ERROR - // << "Unable to retrieve TileTBID helper from DetectorStore" << endreq; + // << "Unable to retrieve TileTBID helper from DetectorStore" << endmsg; // return sc; //} @@ -111,36 +111,36 @@ namespace LVL1 { if((*th_itr)->name() == "ZDC_A") { m_threshold_a = (*th_itr)->triggerThresholdValue(0, 0)->ptcut(); // threshold in GeV m_cablestart_a = (*th_itr)->cableStart(); - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "m_threshold_a=" << m_threshold_a << " m_cablestart_a=" << m_cablestart_a << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "m_threshold_a=" << m_threshold_a << " m_cablestart_a=" << m_cablestart_a << endmsg; } else if((*th_itr)->name() == "ZDC_C") { m_threshold_c = (*th_itr)->triggerThresholdValue(0, 0)->ptcut(); // threshold in GeV m_cablestart_c = (*th_itr)->cableStart(); - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "m_threshold_c=" << m_threshold_c << " m_cablestart_c=" << m_cablestart_c << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "m_threshold_c=" << m_threshold_c << " m_cablestart_c=" << m_cablestart_c << endmsg; } else if((*th_itr)->name() == "ZDC_AND") { //Legacy m_cablestart_ac = (*th_itr)->cableStart(); - if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "(legacy ZDC coincidence) m_cablestart_ac=" << m_cablestart_ac << endreq; + if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "(legacy ZDC coincidence) m_cablestart_ac=" << m_cablestart_ac << endmsg; } } - if(msgLvl(MSG::INFO) && m_zdcIncludeLHCf) msg(MSG::INFO) << "LHCf Included, NO photons taken by ZDC" << endreq; - if(msgLvl(MSG::INFO) && !m_zdcIncludeLHCf) msg(MSG::INFO) << "LHCf Not Included, photons taken by ZDC" << endreq; + if(msgLvl(MSG::INFO) && m_zdcIncludeLHCf) msg(MSG::INFO) << "LHCf Included, NO photons taken by ZDC" << endmsg; + if(msgLvl(MSG::INFO) && !m_zdcIncludeLHCf) msg(MSG::INFO) << "LHCf Not Included, photons taken by ZDC" << endmsg; //Zero internal ZDC counters m_passedA = 0; m_passedC = 0; m_passedAC = 0; if(m_threshold_a == -1) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_A Lvl 1 threshold not set. Trigger will be disabled." << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_A Lvl 1 threshold not set. Trigger will be disabled." << endmsg; m_threshold_a = 10000000; } if(m_threshold_c == -1) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_C Lvl 1 threshold not set. Trigger will be disabled." << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_C Lvl 1 threshold not set. Trigger will be disabled." << endmsg; m_threshold_c = 10000000; } if(m_threshold_a != m_threshold_c) { - if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_A and ZDC_C Lvl 1 thresholds are not equal. Are you sure you want to do that?" << endreq; + if(msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "ZDC_A and ZDC_C Lvl 1 thresholds are not equal. Are you sure you want to do that?" << endmsg; } // The ZDC simulation is currently not ready for use. Use truth @@ -150,7 +150,7 @@ namespace LVL1 { IPartPropSvc* partPropSvc = 0; sc = service("PartPropSvc", partPropSvc, true); if (sc.isFailure()) { - msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endreq; + msg(MSG::FATAL) << " Could not initialize Particle Properties Service" << endmsg; return sc; } @@ -158,7 +158,7 @@ namespace LVL1 { } StatusCode TrigT1ZDC::execute() { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg; StatusCode sc; std::string containerName; @@ -174,7 +174,7 @@ namespace LVL1 { const McEventCollection *mcEventCollection = 0; sc = evtStore()->retrieve(mcEventCollection, m_mcEventCollectionKey); if( sc.isFailure() || !mcEventCollection ) { - if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Error retrieving " << m_mcEventCollectionKey << endreq; + if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Error retrieving " << m_mcEventCollectionKey << endmsg; return sc; } @@ -257,8 +257,8 @@ namespace LVL1 { sc=m_storeGate->retrieve( m_zdcContainer, containerName); if( sc.isFailure() || !m_zdcContainer ) { if(!m_badDataFound) { - msg(MSG::WARNING) << containerName << " not found" << endreq; - msg(MSG::WARNING) << "The ZDC trigger will be disabled for the rest of the run." << endreq; + msg(MSG::WARNING) << containerName << " not found" << endmsg; + msg(MSG::WARNING) << "The ZDC trigger will be disabled for the rest of the run." << endmsg; } else { m_badDataFound = true; @@ -267,14 +267,14 @@ namespace LVL1 { } else { msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved" - << endreq; + << endmsg; }*/ // Logic handling trigger simulation goes here... if(msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "ZDC Energy : C side = " << energyECC/1000. << "(GeV), A side = " << energyECA/1000. << "(GeV)" << endreq; - msg(MSG::DEBUG) << "ZDC Cable Word: " << std::bitset<std::numeric_limits<unsigned int>::digits>(cableWord) << endreq; + msg(MSG::DEBUG) << "ZDC Energy : C side = " << energyECC/1000. << "(GeV), A side = " << energyECA/1000. << "(GeV)" << endmsg; + msg(MSG::DEBUG) << "ZDC Cable Word: " << std::bitset<std::numeric_limits<unsigned int>::digits>(cableWord) << endmsg; } // Record the CTP trigger word in StoreGate. @@ -287,19 +287,19 @@ namespace LVL1 { sc=evtStore()->record(zdcCTP, containerName, false); if(sc.isFailure()) { - if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endreq; + if(msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Failed to register " << containerName << endmsg; return sc; } else if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << containerName << " registered successfully " - << endreq; + << endmsg; } return StatusCode::SUCCESS; } StatusCode TrigT1ZDC::finalize() { - msg(MSG::INFO) << "ZDC Finalize: m_passedA:" << m_passedA << ", m_passedC:" << m_passedC << ", m_passedAC:" << m_passedAC << endreq; + msg(MSG::INFO) << "ZDC Finalize: m_passedA:" << m_passedA << ", m_passedC:" << m_passedC << ", m_passedAC:" << m_passedAC << endmsg; return StatusCode::SUCCESS; } } diff --git a/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx index 19513485dad..f1d00cc1a9a 100755 --- a/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx +++ b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx @@ -72,17 +72,17 @@ StatusCode IDScanHitFilter::initialize() m_dPhidRCut = 0.3/m_pTcutInMeV; - athenaLog << MSG::INFO << "IDScanHitFilter constructed " << endreq; - athenaLog << MSG::INFO << "phiBinSize set to " << m_phiBinSize << endreq; - athenaLog << MSG::INFO << "etaBinSize set to " << m_etaBinSize << endreq; - athenaLog << MSG::INFO << "layerThreshold set to " << m_layerThreshold << endreq; - athenaLog << MSG::INFO << "enhanceZeroLayer set to " << m_enhanceLayer0 << endreq; - athenaLog << MSG::INFO << "Clone removal set to " << m_cloneRemoval << endreq; - athenaLog << MSG::INFO << "dphidrcut set to " << m_dPhidRCut << endreq; + athenaLog << MSG::INFO << "IDScanHitFilter constructed " << endmsg; + athenaLog << MSG::INFO << "phiBinSize set to " << m_phiBinSize << endmsg; + athenaLog << MSG::INFO << "etaBinSize set to " << m_etaBinSize << endmsg; + athenaLog << MSG::INFO << "layerThreshold set to " << m_layerThreshold << endmsg; + athenaLog << MSG::INFO << "enhanceZeroLayer set to " << m_enhanceLayer0 << endmsg; + athenaLog << MSG::INFO << "Clone removal set to " << m_cloneRemoval << endmsg; + athenaLog << MSG::INFO << "dphidrcut set to " << m_dPhidRCut << endmsg; if (m_numberingTool.retrieve().isFailure()){ athenaLog << MSG::FATAL << "Tool " << m_numberingTool - << " not found " << endreq; + << " not found " << endmsg; return StatusCode::FAILURE; } @@ -133,7 +133,7 @@ void IDScanHitFilter::findTracks( std::vector<const TrigSiSpacePoint* > spVec, T setLayerThresholdTmp(getLayerThreshold()-double(missing_layers)); athenaLog << MSG::DEBUG << "m_layerThreshold=" << m_layerThreshold - << "\tm_layerThresholdTmp=" << m_layerThresholdTmp << endreq; + << "\tm_layerThresholdTmp=" << m_layerThresholdTmp << endmsg; // 0. check if RoI is in [0,2pi] boundary (boundary for the space point definition!) // and calculate phi offset <- now done in spacepoints themselves!!! @@ -151,7 +151,7 @@ void IDScanHitFilter::findTracks( std::vector<const TrigSiSpacePoint* > spVec, T } if (this->outputLevel() <= MSG::DEBUG) athenaLog << MSG::DEBUG << "REGTEST / Made " << m_internalSPs->size() - << " IdScanSpPoints. Proceeding to HitFilter." << endreq; + << " IdScanSpPoints. Proceeding to HitFilter." << endmsg; if (m_printDiagnosticMessages) std::cout << "IdScanMain DIAGNOSTIC " << " Made " << m_internalSPs->size() << " IdScanSpPoints. Proceeding to HitFilter." << std::endl; @@ -203,7 +203,7 @@ void IDScanHitFilter::makeTracks( GroupList& idScanGroups, TrigInDetTrackCollect if (this->outputLevel() <= MSG::DEBUG) athenaLog << MSG::DEBUG << "REGTEST / group phi0/ptInv/eta: " << phi0 << " / " << gItr->getPtInv() << " / " - << gItr->getEta() << endreq; + << gItr->getEta() << endmsg; if (m_printDiagnosticMessages) std::cout << "IdScanMain DIAGNOSTIC " << " group phi0/ptInv/eta: " << phi0 << " / " diff --git a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx index 7fb28bd00e8..065f0fcc79f 100755 --- a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx +++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx @@ -69,8 +69,8 @@ StatusCode IDScanZFinder::initialize() MsgStream athenaLog( msgSvc(), name() ); if ( sc.isFailure() ){ - athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endreq; - // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endreq; + athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endmsg; + // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endmsg; return sc; } @@ -84,26 +84,26 @@ StatusCode IDScanZFinder::initialize() /// NB: These only have to go here, because they need to write to the msgsvc, and because /// is rubbish, we can't pass in a pointer to a (non-athena) sub algorithm. if ( m_phiBinSize < ZFinder_MinPhiSliceSize ){ - athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endreq; + athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endmsg; athenaLog << MSG::WARNING << "Requested PhiBinSize of " << m_phiBinSize << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize - << " degrees). Set to the minimum value." << endreq; + << " degrees). Set to the minimum value." << endmsg; // m_phiBinSize = ZFinder_MinPhiSliceSize; } // NB: This should go into the InitializeInternal !!!! if ( m_dphideta > 0 ){ - athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endreq; + athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endmsg; athenaLog << MSG::WARNING << "Requested DPhiDEta of " << m_dphideta - << " is positive. Setting to its negative!" << endreq; + << " is positive. Setting to its negative!" << endmsg; // m_dphideta *= -1.; } if (m_numberingTool.retrieve().isFailure()){ athenaLog << MSG::FATAL << "Tool " << m_numberingTool - << " not found " << endreq; + << " not found " << endmsg; return StatusCode::FAILURE; } @@ -124,35 +124,35 @@ StatusCode IDScanZFinder::initialize() /// endcap pixel layer initializeInternal(maxSiliconLayerNum,offsetEndcapPixels-1); - athenaLog << MSG::INFO << "IDScanZFinder constructed: name() " << name() << endreq; - athenaLog << MSG::INFO << "IDScanZFinderInternal version: " << getVersion() << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::PixOnly set to " << m_pixOnly << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::FullScanMode " << m_fullScanMode << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::PhiBinSize set to " << m_phiBinSize << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::# of peaks to consider: " << m_numberOfPeaks << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::z bin size " << m_minZBinSize << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::eta coeff " << m_zBinSizeEtaCoeff << endreq; + athenaLog << MSG::INFO << "IDScanZFinder constructed: name() " << name() << endmsg; + athenaLog << MSG::INFO << "IDScanZFinderInternal version: " << getVersion() << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::PixOnly set to " << m_pixOnly << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::FullScanMode " << m_fullScanMode << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::PhiBinSize set to " << m_phiBinSize << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::# of peaks to consider: " << m_numberOfPeaks << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::z bin size " << m_minZBinSize << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::eta coeff " << m_zBinSizeEtaCoeff << endmsg; - athenaLog << MSG::INFO << "IDScanZFinder::m_nFirstLayers = " << m_nFirstLayers << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_phiBinSize = " << m_phiBinSize << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_dphideta = " << m_dphideta << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_minZBinSize = " << m_minZBinSize << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_chargeAware = " << m_chargeAware << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endreq; + athenaLog << MSG::INFO << "IDScanZFinder::m_nFirstLayers = " << m_nFirstLayers << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_phiBinSize = " << m_phiBinSize << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_dphideta = " << m_dphideta << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_minZBinSize = " << m_minZBinSize << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_chargeAware = " << m_chargeAware << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endmsg; - athenaLog << MSG::INFO << "IDScanZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxMixing = " << m_vrtxMixing << endreq; - athenaLog << MSG::INFO << "IDScanZFinder::m_preferCentralZ = " << m_preferCentralZ << endreq; + athenaLog << MSG::INFO << "IDScanZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxMixing = " << m_vrtxMixing << endmsg; + athenaLog << MSG::INFO << "IDScanZFinder::m_preferCentralZ = " << m_preferCentralZ << endmsg; - athenaLog << MSG::INFO << "IDScanZFinder::m_trustSPprovider = " << m_trustSPprovider << endreq; + athenaLog << MSG::INFO << "IDScanZFinder::m_trustSPprovider = " << m_trustSPprovider << endmsg; - athenaLog << MSG::INFO << "IDScanZFinder::m_tripletMode = " << m_tripletMode << endreq; + athenaLog << MSG::INFO << "IDScanZFinder::m_tripletMode = " << m_tripletMode << endmsg; - athenaLog << MSG::INFO << "IDScanZFinder::m_weigthThreshold = " << m_weightThreshold << endreq; + athenaLog << MSG::INFO << "IDScanZFinder::m_weigthThreshold = " << m_weightThreshold << endmsg; return sc; } @@ -170,19 +170,19 @@ TrigVertexCollection* IDScanZFinder::findZ( const std::vector<const TrigSiSpaceP // int outputLevel = msgSvc()->outputLevel( name() ); std::vector<vertex>* vertices = findZInternal( spVec, roi); - //athenaLog << MSG::INFO << "RoI: " << *RoI << endreq; - //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endreq; + //athenaLog << MSG::INFO << "RoI: " << *RoI << endmsg; + //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endmsg; - athenaLog << MSG::DEBUG << "roi: " << roi << endreq; - athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endreq; + athenaLog << MSG::DEBUG << "roi: " << roi << endmsg; + athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endmsg; if ( GetInternalStatus()==-1 ) { - // athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endreq; - // athenaLog << MSG::ERROR << "Exiting ZFinder..." << endreq; - athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endreq; - athenaLog << MSG::WARNING << "Exiting ZFinder..." << endreq; + // athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endmsg; + // athenaLog << MSG::ERROR << "Exiting ZFinder..." << endmsg; + athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endmsg; + athenaLog << MSG::WARNING << "Exiting ZFinder..." << endmsg; } for ( unsigned int i=0 ; i<vertices->size() ; i++ ) { diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx index a5f2c2a8e38..d2d7a323c3c 100755 --- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx +++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx @@ -71,8 +71,8 @@ StatusCode TrigZFinder::initialize() MsgStream athenaLog( msgSvc(), name() ); if ( sc.isFailure() ){ - athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endreq; - // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endreq; + athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endmsg; + // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endmsg; return sc; } @@ -86,26 +86,26 @@ StatusCode TrigZFinder::initialize() /// NB: These only have to go here, because they need to write to the msgsvc, and because /// is rubbish, we can't pass in a pointer to a (non-athena) sub algorithm. if ( m_phiBinSize < ZFinder_MinPhiSliceSize ){ - athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endreq; + athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endmsg; athenaLog << MSG::WARNING << "Requested PhiBinSize of " << m_phiBinSize << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize - << " degrees). Set to the minimum value." << endreq; + << " degrees). Set to the minimum value." << endmsg; // m_phiBinSize = ZFinder_MinPhiSliceSize; } // NB: This should go into the InitializeInternal !!!! if ( m_dphideta > 0 ){ - athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endreq; + athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endmsg; athenaLog << MSG::WARNING << "Requested DPhiDEta of " << m_dphideta - << " is positive. Setting to its negative!" << endreq; + << " is positive. Setting to its negative!" << endmsg; // m_dphideta *= -1.; } if (m_numberingTool.retrieve().isFailure()){ athenaLog << MSG::FATAL << "Tool " << m_numberingTool - << " not found " << endreq; + << " not found " << endmsg; return StatusCode::FAILURE; } @@ -127,34 +127,34 @@ StatusCode TrigZFinder::initialize() initializeInternal(maxSiliconLayerNum,offsetEndcapPixels-1); - athenaLog << MSG::INFO << "TrigZFinder constructed: name() " << name() << endreq; - athenaLog << MSG::INFO << "TrigZFinder::PixOnly set to " << m_pixOnly << endreq; - athenaLog << MSG::INFO << "TrigZFinder::FullScanMode " << m_fullScanMode << endreq; - athenaLog << MSG::INFO << "TrigZFinder::PhiBinSize set to " << m_phiBinSize << endreq; - athenaLog << MSG::INFO << "TrigZFinder::# of peaks to consider: " << m_numberOfPeaks << endreq; - athenaLog << MSG::INFO << "TrigZFinder::z bin size " << m_minZBinSize << endreq; - athenaLog << MSG::INFO << "TrigZFinder::eta coeff " << m_zBinSizeEtaCoeff << endreq; + athenaLog << MSG::INFO << "TrigZFinder constructed: name() " << name() << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::PixOnly set to " << m_pixOnly << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::FullScanMode " << m_fullScanMode << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::PhiBinSize set to " << m_phiBinSize << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::# of peaks to consider: " << m_numberOfPeaks << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::z bin size " << m_minZBinSize << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::eta coeff " << m_zBinSizeEtaCoeff << endmsg; - athenaLog << MSG::INFO << "TrigZFinder::m_nFirstLayers = " << m_nFirstLayers << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_phiBinSize = " << m_phiBinSize << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_dphideta = " << m_dphideta << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_minZBinSize = " << m_minZBinSize << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_chargeAware = " << m_chargeAware << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endreq; + athenaLog << MSG::INFO << "TrigZFinder::m_nFirstLayers = " << m_nFirstLayers << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_phiBinSize = " << m_phiBinSize << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_dphideta = " << m_dphideta << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_minZBinSize = " << m_minZBinSize << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_chargeAware = " << m_chargeAware << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endmsg; - athenaLog << MSG::INFO << "TrigZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_vrtxMixing = " << m_vrtxMixing << endreq; - athenaLog << MSG::INFO << "TrigZFinder::m_preferCentralZ = " << m_preferCentralZ << endreq; + athenaLog << MSG::INFO << "TrigZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_vrtxMixing = " << m_vrtxMixing << endmsg; + athenaLog << MSG::INFO << "TrigZFinder::m_preferCentralZ = " << m_preferCentralZ << endmsg; - athenaLog << MSG::INFO << "TrigZFinder::m_trustSPprovider = " << m_trustSPprovider << endreq; + athenaLog << MSG::INFO << "TrigZFinder::m_trustSPprovider = " << m_trustSPprovider << endmsg; - athenaLog << MSG::INFO << "TrigZFinder::m_tripletMode = " << m_tripletMode << endreq; + athenaLog << MSG::INFO << "TrigZFinder::m_tripletMode = " << m_tripletMode << endmsg; - athenaLog << MSG::INFO << "TrigZFinder::m_weigthThreshold = " << m_weightThreshold << endreq; + athenaLog << MSG::INFO << "TrigZFinder::m_weigthThreshold = " << m_weightThreshold << endmsg; return sc; } @@ -172,19 +172,19 @@ TrigVertexCollection* TrigZFinder::findZ( const std::vector<TrigSiSpacePointBase // int outputLevel = msgSvc()->outputLevel( name() ); std::vector<vertex>* vertices = findZInternal( spVec, roi); - //athenaLog << MSG::INFO << "RoI: " << *RoI << endreq; - //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endreq; + //athenaLog << MSG::INFO << "RoI: " << *RoI << endmsg; + //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endmsg; - athenaLog << MSG::DEBUG << "roi: " << roi << endreq; - athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endreq; + athenaLog << MSG::DEBUG << "roi: " << roi << endmsg; + athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endmsg; if ( GetInternalStatus()==-1 ) { - // athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endreq; - // athenaLog << MSG::ERROR << "Exiting ZFinder..." << endreq; - athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endreq; - athenaLog << MSG::WARNING << "Exiting ZFinder..." << endreq; + // athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endmsg; + // athenaLog << MSG::ERROR << "Exiting ZFinder..." << endmsg; + athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endmsg; + athenaLog << MSG::WARNING << "Exiting ZFinder..." << endmsg; } for ( unsigned int i=0 ; i<vertices->size() ; i++ ) { diff --git a/Trigger/TrigTools/TrigFTKTrackConverter/src/TrigFTKUncertiantyTool.cxx b/Trigger/TrigTools/TrigFTKTrackConverter/src/TrigFTKUncertiantyTool.cxx index ada18031b65..dc92e5a3ebd 100644 --- a/Trigger/TrigTools/TrigFTKTrackConverter/src/TrigFTKUncertiantyTool.cxx +++ b/Trigger/TrigTools/TrigFTKTrackConverter/src/TrigFTKUncertiantyTool.cxx @@ -50,7 +50,7 @@ StatusCode TrigFTKUncertiantyTool::initialize() { LoadConstants(); - athenaLog << MSG::INFO << "TrigFTKUncertiantyTool initialized "<< endreq; + athenaLog << MSG::INFO << "TrigFTKUncertiantyTool initialized "<< endmsg; return sc; } @@ -66,10 +66,10 @@ double TrigFTKUncertiantyTool::getParamCovMtx(const FTKTrack *trk, int id0, int { MsgStream athenaLog(msgSvc(), name()); int outputLevel = msgSvc()->outputLevel( name() ); - athenaLog << MSG::VERBOSE << "In getParamCovMtx: id0: " << id0 << " id1: " << id1 << endreq; + athenaLog << MSG::VERBOSE << "In getParamCovMtx: id0: " << id0 << " id1: " << id1 << endmsg; if(!trk){ - athenaLog << MSG::ERROR << "FTK Track is Null" << endreq; + athenaLog << MSG::ERROR << "FTK Track is Null" << endmsg; return -99; } @@ -82,14 +82,14 @@ double TrigFTKUncertiantyTool::getParamCovMtx(const FTKTrack *trk, int id0, int bool hasBL = (trk->getBitmask()&(1<<0)); if(outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: has BL " << hasBL << endreq; + athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: has BL " << hasBL << endmsg; double trkIpt (trk->getHalfInvPt()); // NOTE: this is 1./(2xpt) double trkEta (trk->getEta() ); if(outputLevel <= MSG::VERBOSE){ - athenaLog << MSG::VERBOSE << "TrigFTKUncertiantyTool:: trkIpt " << trkIpt << endreq; - athenaLog << MSG::VERBOSE << "TrigFTKUncertiantyTool:: trkEta " << trkEta << endreq; + athenaLog << MSG::VERBOSE << "TrigFTKUncertiantyTool:: trkIpt " << trkIpt << endmsg; + athenaLog << MSG::VERBOSE << "TrigFTKUncertiantyTool:: trkEta " << trkEta << endmsg; } double sigmaTP = -1.0; @@ -118,8 +118,8 @@ double TrigFTKUncertiantyTool::getParamCovMtx(const FTKTrack *trk, int id0, int if(outputLevel <= MSG::DEBUG){ athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: sigmaTP (" << sigmaTP <<") = sqrt("<<allConsts[hasBL].par0(lookUpParam,trkEta) - << "+" << allConsts[hasBL].par1(lookUpParam,trkEta) << "*" << trkIpt << "**2)" << endreq; - athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: (sqrt)cov " << sigmaTP*sigmaTP << endreq; + << "+" << allConsts[hasBL].par1(lookUpParam,trkEta) << "*" << trkIpt << "**2)" << endmsg; + athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: (sqrt)cov " << sigmaTP*sigmaTP << endmsg; } // @@ -130,13 +130,13 @@ double TrigFTKUncertiantyTool::getParamCovMtx(const FTKTrack *trk, int id0, int if(outputLevel <= MSG::DEBUG){ athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: sigmaTP (" << sigmaTP <<") = "<<allConsts[hasBL].par0(lookUpParam,trkEta) - << "+" << allConsts[hasBL].par1(lookUpParam,trkEta) << "*" << fabs(trkIpt) << endreq; - athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: (linear)cov " << sigmaTP*sigmaTP << endreq; + << "+" << allConsts[hasBL].par1(lookUpParam,trkEta) << "*" << fabs(trkIpt) << endmsg; + athenaLog << MSG::DEBUG << "TrigFTKUncertiantyTool:: (linear)cov " << sigmaTP*sigmaTP << endmsg; } } if(sigmaTP < 0) - athenaLog << MSG::ERROR << " sigma TP" << sigmaTP << endreq; + athenaLog << MSG::ERROR << " sigma TP" << sigmaTP << endmsg; // // Convert eta to theta diff --git a/Trigger/TrigTools/TrigIDUtils/src/TestPixelModuleDisablingSvc.cxx b/Trigger/TrigTools/TrigIDUtils/src/TestPixelModuleDisablingSvc.cxx index b5965d6a3e3..6db0c57084e 100644 --- a/Trigger/TrigTools/TrigIDUtils/src/TestPixelModuleDisablingSvc.cxx +++ b/Trigger/TrigTools/TrigIDUtils/src/TestPixelModuleDisablingSvc.cxx @@ -80,7 +80,7 @@ void TestPixelModuleDisablingSvc::initModules(){ for (auto it=m_moduleList.begin(); it!=m_moduleList.end(); ++it){ Identifier moduleId = m_pixelID->wafer_id(*it); disabled_modules.insert(moduleId); - ATH_MSG_INFO("inserting " << moduleId.getString() << endreq); + ATH_MSG_INFO("inserting " << moduleId.getString() << endmsg); } } diff --git a/Trigger/TrigTools/TrigInDetRecoTools/TrigInDetRecoTools/TrigL2DataConversionUtils.h b/Trigger/TrigTools/TrigInDetRecoTools/TrigInDetRecoTools/TrigL2DataConversionUtils.h index b1af3510f82..01b5d3b0928 100644 --- a/Trigger/TrigTools/TrigInDetRecoTools/TrigInDetRecoTools/TrigL2DataConversionUtils.h +++ b/Trigger/TrigTools/TrigInDetRecoTools/TrigInDetRecoTools/TrigL2DataConversionUtils.h @@ -75,10 +75,10 @@ class TrigL2SpacePointCollectionConverter { } StatusCode sc= m_outputContainer->addCollection( spacepointCollection, spacepointCollection->identifyHash() ); if (sc.isSuccess()){ - // athenaLog << MSG::INFO << spacepointCollection->size() <<" SCT SpacePoints successfully added to Container ! " <<(*idIt) << endreq; + // athenaLog << MSG::INFO << spacepointCollection->size() <<" SCT SpacePoints successfully added to Container ! " <<(*idIt) << endmsg; } else{ - //athenaLog << MSG::WARNING << "Failed to add SCT SpacePoints to container" << endreq; + //athenaLog << MSG::WARNING << "Failed to add SCT SpacePoints to container" << endmsg; delete spacepointCollection; } } diff --git a/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx b/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx index 2310caafc85..58bc4c93377 100755 --- a/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx +++ b/Trigger/TrigTools/TrigInDetTrackExtrapolator/src/TrigInDetTrackExtrapolator.cxx @@ -48,17 +48,17 @@ StatusCode TrigInDetTrackExtrapolator::initialize() MsgStream athenaLog(msgSvc(), name()); m_outputLevel=msgSvc()->outputLevel( name() ); - athenaLog << MSG::INFO <<"Using Athena magnetic field service"<<endreq; + athenaLog << MSG::INFO <<"Using Athena magnetic field service"<<endmsg; sc = m_MagFieldSvc.retrieve(); if(sc.isFailure()) { - athenaLog << MSG::ERROR << "Unable to retrieve Athena MagFieldService" << endreq; + athenaLog << MSG::ERROR << "Unable to retrieve Athena MagFieldService" << endmsg; return StatusCode::FAILURE; } ITrigTimerSvc* timerSvc; StatusCode scTime = service( "TrigTimerSvc", timerSvc); if( scTime.isFailure() ) { - athenaLog << MSG::INFO<< "Unable to locate Service TrigTimerSvc " << endreq; + athenaLog << MSG::INFO<< "Unable to locate Service TrigTimerSvc " << endmsg; m_timers = false; } else{ @@ -69,7 +69,7 @@ StatusCode TrigInDetTrackExtrapolator::initialize() if ( m_timers ) { m_timer[0] = timerSvc->addItem("TrigExtrap"); } - athenaLog << MSG::INFO << "TrigInDetTrackExtrapolator constructed "<< endreq; + athenaLog << MSG::INFO << "TrigInDetTrackExtrapolator constructed "<< endmsg; return sc; } @@ -151,21 +151,21 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToBarrel(const Trig { if (m_outputLevel <= MSG::ERROR) athenaLog << MSG::ERROR << "TrigInDetTrack has no parameters - extrapolation failed" - << endreq; + << endmsg; return NULL; } if(fabs(pP->pT())<m_minPt) { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endreq; + athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endmsg; return NULL; } if(pP->surfaceType()==TrigInDetTrackFitPar::PERIGEE) { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "Parameters at perigee are retrieved" << endreq; + athenaLog << MSG::DEBUG << "Parameters at perigee are retrieved" << endmsg; double Rk[6],P[5],Theta; P[0]=pP->a0(); @@ -191,7 +191,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToBarrel(const Trig { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Parameters at cylinder surface R="<<pP->surfaceCoordinate()<< - " are retrieved"<< endreq; + " are retrieved"<< endmsg; } else { @@ -199,13 +199,13 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToBarrel(const Trig { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Parameters at disk surface Z="<<pP->surfaceCoordinate()<< - " are retrieved"<< endreq; + " are retrieved"<< endmsg; } else { if (m_outputLevel <= MSG::ERROR) athenaLog << MSG::ERROR << "TrigInDetTrackFitPar type is unknown - extrapolation failed" - << endreq; + << endmsg; return NULL; } } @@ -224,7 +224,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToBarrel(const Trig if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Track coordinates at R="<<Radius<< - " X="<<Y[0]<<" Y="<<Y[1]<<" Z="<<Y[2]<<" r="<<sqrt(Y[0]*Y[0]+Y[1]*Y[1])<<endreq; + " X="<<Y[0]<<" Y="<<Y[1]<<" Z="<<Y[2]<<" r="<<sqrt(Y[0]*Y[0]+Y[1]*Y[1])<<endmsg; double Phi0=atan2(Y[1],Y[0]); double eta=-log(sin(0.5*pFinalState->m_getTrackState(3))/cos(0.5*pFinalState->m_getTrackState(3))); @@ -270,7 +270,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToEndcap(const Trig { if (m_outputLevel <= MSG::ERROR) athenaLog << MSG::ERROR << "TrigInDetTrack has no parameters - extrapolation failed" - << endreq; + << endmsg; return NULL; } @@ -278,14 +278,14 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToEndcap(const Trig { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endreq; + athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endmsg; return NULL; } if(pP->surfaceType()==TrigInDetTrackFitPar::PERIGEE) { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "Parameters at perigee point are retrieved" << endreq; + athenaLog << MSG::DEBUG << "Parameters at perigee point are retrieved" << endmsg; double Rk[5],Theta; Rk[0]=pP->a0(); @@ -322,7 +322,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToEndcap(const Trig { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Parameters at cylinder surface R="<<pP->surfaceCoordinate()<< - " are retrieved"<< endreq; + " are retrieved"<< endmsg; } else { @@ -330,13 +330,13 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToEndcap(const Trig { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Parameters at disk surface Z="<<pP->surfaceCoordinate()<< - " are retrieved"<< endreq; + " are retrieved"<< endmsg; } else { if (m_outputLevel <= MSG::ERROR) athenaLog << MSG::ERROR << "TrigInDetTrackFitPar type is unknown - extrapolation failed" - << endreq; + << endmsg; return NULL; } } @@ -354,7 +354,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateToEndcap(const Trig if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Track coordinates at Z="<<Zcoordinate<< - " X="<<Y[0]<<" Y="<<Y[1]<<" Z="<<Y[2]<<" r="<<sqrt(Y[0]*Y[0]+Y[1]*Y[1])<<endreq; + " X="<<Y[0]<<" Y="<<Y[1]<<" Z="<<Y[2]<<" r="<<sqrt(Y[0]*Y[0]+Y[1]*Y[1])<<endmsg; double Phi0=atan2(Y[1],Y[0]); double R0=sqrt(Y[0]*Y[0]+Y[1]*Y[1]); @@ -475,7 +475,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateBlindly(const TrigI { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Track coordinates at Z="<<Zcoordinate<< - " X="<<gP[0]<<" Y="<<gP[1]<<" Z="<<gP[2]<<" r="<<sqrt(gP[0]*gP[0]+gP[1]*gP[1])<<endreq; + " X="<<gP[0]<<" Y="<<gP[1]<<" Z="<<gP[2]<<" r="<<sqrt(gP[0]*gP[0]+gP[1]*gP[1])<<endmsg; double Phi0=atan2(gP[1],gP[0]); double phi=atan2(gV[1],gV[0]); @@ -496,7 +496,7 @@ TrigInDetTrackFitPar* TrigInDetTrackExtrapolator::extrapolateBlindly(const TrigI { if (m_outputLevel <= MSG::DEBUG) athenaLog << MSG::DEBUG << "Track coordinates at R="<<Radius<< - " X="<<gP[0]<<" Y="<<gP[1]<<" Z="<<gP[2]<<" r="<<sqrt(gP[0]*gP[0]+gP[1]*gP[1])<<endreq; + " X="<<gP[0]<<" Y="<<gP[1]<<" Z="<<gP[2]<<" r="<<sqrt(gP[0]*gP[0]+gP[1]*gP[1])<<endmsg; double Phi0=atan2(gP[1],gP[0]); double phi=atan2(gV[1],gV[0]); @@ -533,7 +533,7 @@ StatusCode TrigInDetTrackExtrapolator::extrapolateToCalo(const TrigInDetTrack* p { if (m_outputLevel <= MSG::ERROR) athenaLog << MSG::ERROR << "TrigInDetTrack has no parameters - extrapolation to Calo failed" - << endreq; + << endmsg; return StatusCode::FAILURE; } @@ -541,7 +541,7 @@ StatusCode TrigInDetTrackExtrapolator::extrapolateToCalo(const TrigInDetTrack* p { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endreq; + athenaLog << MSG::DEBUG << "Track pT is too low - skipping extrapolation" << endmsg; return StatusCode::FAILURE; } @@ -555,14 +555,14 @@ StatusCode TrigInDetTrackExtrapolator::extrapolateToCalo(const TrigInDetTrack* p if(fabs(d0)>R) { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "d0="<<d0<<" exceeds target surface radius="<<R<<endreq; + athenaLog << MSG::DEBUG << "d0="<<d0<<" exceeds target surface radius="<<R<<endmsg; return StatusCode::FAILURE; } if(fabs(z0)>fabs(Z)) { if (m_outputLevel <= MSG::DEBUG) - athenaLog << MSG::DEBUG << "z0="<<z0<<" is beyond target z="<<Z<<endreq; + athenaLog << MSG::DEBUG << "z0="<<z0<<" is beyond target z="<<Z<<endmsg; return StatusCode::FAILURE; } diff --git a/Trigger/TrigTools/TrigJetUtils/src/setupJetKeyDescriptor.cxx b/Trigger/TrigTools/TrigJetUtils/src/setupJetKeyDescriptor.cxx index 6549efb1f7c..707e53f566a 100644 --- a/Trigger/TrigTools/TrigJetUtils/src/setupJetKeyDescriptor.cxx +++ b/Trigger/TrigTools/TrigJetUtils/src/setupJetKeyDescriptor.cxx @@ -26,7 +26,7 @@ namespace TrigJetUtils { if( log.level() <= MSG::DEBUG ) { log << MSG::DEBUG << "Checking if StoreGate already contains a JetKeyMap ..." - << endreq; + << endmsg; } const JetKeyDescriptor* jetKeyDescrConst = 0; @@ -36,20 +36,20 @@ namespace TrigJetUtils { if( log.level() <= MSG::VERBOSE ) { log << MSG::VERBOSE << "StoreGate contains a JetKeyDescriptor with key <" - << storeKey << "> ! Trying to retrieve it " << endreq; + << storeKey << "> ! Trying to retrieve it " << endmsg; } if( sg->retrieve( jetKeyDescrConst, storeKey ).isFailure() ) { log << MSG::FATAL << "Couldn't retrieve JetKeyDescriptor with " - << "key: " << storeKey << endreq; + << "key: " << storeKey << endmsg; return StatusCode::FAILURE; } if( log.level() <= MSG::VERBOSE ) { - log << MSG::VERBOSE << "printing" << endreq; + log << MSG::VERBOSE << "printing" << endmsg; JetKeyDescriptorInstance::instance()->printOut( log ); log << MSG::VERBOSE << "PRINT >" << jetKeyDescrConst << "<" - << endreq; + << endmsg; } } else { @@ -62,12 +62,12 @@ namespace TrigJetUtils { if( log.level() <= MSG::DEBUG ) { log << MSG::DEBUG << "Trying to record JetKeyDescriptor wit key <" - << storeKey << "> into StoreGate !" << endreq; + << storeKey << "> into StoreGate !" << endmsg; } if( sg->record( jetKeyDescr, storeKey ).isFailure() ) { log << MSG::WARNING << "Error recording JetKeyMap with key <" << storeKey << "> into StoreGate !" - << " Giving up!" << endreq; + << " Giving up!" << endmsg; } } diff --git a/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx b/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx index 0289077e106..2abf892ca2a 100644 --- a/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx +++ b/Trigger/TrigTools/TrigMuonBackExtrapolator/src/TrigMuonBackExtrapolator.cxx @@ -33,7 +33,7 @@ TrigMuonBackExtrapolator::~TrigMuonBackExtrapolator() StatusCode TrigMuonBackExtrapolator::initialize() { - msg(MSG::INFO) << "Initializing the MuonBackExtrapolator" << endreq; + msg(MSG::INFO) << "Initializing the MuonBackExtrapolator" << endmsg; ATH_CHECK( AthAlgTool::initialize() ); return StatusCode::SUCCESS; } @@ -42,7 +42,7 @@ TrigMuonBackExtrapolator::initialize() StatusCode TrigMuonBackExtrapolator::finalize() { - msg(MSG::INFO) << "Finalizing the MuonBackExtrapolator" << endreq; + msg(MSG::INFO) << "Finalizing the MuonBackExtrapolator" << endmsg; ATH_CHECK( AthAlgTool::finalize() ); return StatusCode::SUCCESS; } @@ -556,7 +556,7 @@ void TrigMuonBackExtrapolator::init_LUT() { - msg(MSG::INFO) << "TrigMuonBackExtrapolator LUT loaded" << endreq; + msg(MSG::INFO) << "TrigMuonBackExtrapolator LUT loaded" << endmsg; //Barrel data_Barrel_Param[0][0][0] = -0.344175; data_Barrel_Param[0][0][1] = -0.007004; diff --git a/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx b/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx index 8c7e1426545..2a0cf7ccde0 100644 --- a/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx +++ b/Trigger/TrigTools/TrigMuonRoITools/src/TrigMuonRoITool.cxx @@ -40,7 +40,7 @@ TrigMuonRoITool::~TrigMuonRoITool() StatusCode TrigMuonRoITool::initialize() { - msg(MSG::INFO) << "Initializing TrigMuonRoITool - package version " << PACKAGE_VERSION << endreq ; + msg(MSG::INFO) << "Initializing TrigMuonRoITool - package version " << PACKAGE_VERSION << endmsg ; ATH_CHECK( AthAlgTool::initialize() ); ATH_CHECK( evtStore().retrieve() ); @@ -48,7 +48,7 @@ StatusCode TrigMuonRoITool::initialize() // Print the property values msg(MSG::INFO) << " ROB ID: DAQ muCTPi = " << m_daqMuCTPiROBid - << std::setw(6) << " (=0x" << MSG::hex << m_daqMuCTPiROBid.value() << MSG::dec << ")" << endreq; + << std::setw(6) << " (=0x" << MSG::hex << m_daqMuCTPiROBid.value() << MSG::dec << ")" << endmsg; // Build the vector with ROB Ids to retrieve m_muCTPiRobIds.push_back(m_daqMuCTPiROBid.value()); @@ -59,7 +59,7 @@ StatusCode TrigMuonRoITool::initialize() StatusCode TrigMuonRoITool::finalize() { - msg(MSG::INFO) << "Finalizing TrigMuonRoITool - package version " << PACKAGE_VERSION << endreq ; + msg(MSG::INFO) << "Finalizing TrigMuonRoITool - package version " << PACKAGE_VERSION << endmsg ; ATH_CHECK( AthAlgTool::finalize() ); return StatusCode::SUCCESS; @@ -104,7 +104,7 @@ void TrigMuonRoITool::decodeMuCTPi() { // StatusCode sc = m_storeGateSvc->retrieve(p_EventInfo); StatusCode sc = evtStore()->retrieve(p_EventInfo); if ((sc.isFailure()) || (p_EventInfo == 0)) { - msg(MSG::WARNING) << "Can't get EventInfo object for checking data validity." << endreq; + msg(MSG::WARNING) << "Can't get EventInfo object for checking data validity." << endmsg; m_inTime_muCTPIRoIs.clear(); m_outOfTime_muCTPIRoIs.clear(); return; @@ -121,14 +121,14 @@ void TrigMuonRoITool::decodeMuCTPi() { // information is still valid if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " decodeMuCTPi: Stored information is still valid. Complete EventID = " - << *(p_EventInfo->event_ID()) << endreq; + << *(p_EventInfo->event_ID()) << endmsg; } return ; } else { // information is outdated if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " decodeMuCTPi: Stored information needs to be updated. Complete EventID = " - << *(p_EventInfo->event_ID()) << endreq; + << *(p_EventInfo->event_ID()) << endmsg; } } } @@ -148,7 +148,7 @@ void TrigMuonRoITool::decodeMuCTPi() { muCTPiRobFragmentVec.reserve(m_muCTPiRobIds.size()); m_robDataProviderSvc->getROBData(m_muCTPiRobIds,muCTPiRobFragmentVec); if (muCTPiRobFragmentVec.size()==0) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " decodeMuCTPi: No muCTPi ROB found." << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " decodeMuCTPi: No muCTPi ROB found." << endmsg; return; } @@ -157,7 +157,7 @@ void TrigMuonRoITool::decodeMuCTPi() { msg(MSG::DEBUG) << " decodeMuCTPi: ROB id = 0x" << std::setw(6) << MSG::hex << muCTPiRobFragmentVec[0]->source_id() << MSG::dec - << endreq; + << endmsg; } if (muCTPiRobFragmentVec[0]->source_id() != (uint32_t)m_daqMuCTPiROBid.value()) { @@ -167,7 +167,7 @@ void TrigMuonRoITool::decodeMuCTPi() { << std::setw(6) << MSG::hex << muCTPiRobFragmentVec[0]->source_id() << MSG::dec << " does not match requested ROB id = 0x" << std::setw(6) << MSG::hex << m_daqMuCTPiROBid.value() << MSG::dec - << endreq; + << endmsg; } // reset msg() stream flags to original values msg().flags(log_flags_save); @@ -205,20 +205,20 @@ void TrigMuonRoITool::decodeMuCTPi() { msg(MSG::DEBUG) << "ROB ID 0x" << MSG::hex << robId << " ROD ID 0x" << rodId << MSG::dec << " ROB fragment size " << robFragSize << " ROD fragment size " << rodFragSize - << endreq; + << endmsg; msg(MSG::DEBUG) << " ROD Header L1 ID " << evtNum << " ROD Header BCID " << bcId << " ROD Header Format version " << formatVersion - << endreq; + << endmsg; } OFFLINE_FRAGMENTS_NAMESPACE::PointerType it_data; muCTPiRobFragmentVec[0]->rod_data( it_data ); const uint32_t ndata = muCTPiRobFragmentVec[0]->rod_ndata(); if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << " Dumping RoI Words:" << endreq; - msg(MSG::DEBUG) << " number of data words: " << ndata << endreq; + msg(MSG::DEBUG) << " Dumping RoI Words:" << endmsg; + msg(MSG::DEBUG) << " number of data words: " << ndata << endmsg; } // candidate multiplicity @@ -230,7 +230,7 @@ void TrigMuonRoITool::decodeMuCTPi() { candidateMultiplicity.push_back( static_cast< uint32_t >( *it_data ) ); if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " 0x" << MSG::hex << std::setw( 8 ) << std::setfill( '0' ) - << ( *it_data ) << " (candidate multiplicity)" << std::setfill( log_fill_char_save ) << endreq; + << ( *it_data ) << " (candidate multiplicity)" << std::setfill( log_fill_char_save ) << endmsg; } } else { dataWord.push_back( static_cast< uint32_t >( *it_data ) ); @@ -239,7 +239,7 @@ void TrigMuonRoITool::decodeMuCTPi() { << ( *it_data ) << " (candidate word)" << " (--> RoI word = 0x" << MSG::hex << std::setw( 8 ) << std::setfill( '0' ) << mirodToRoIBDataWord( *it_data ) << ")" - << std::setfill( log_fill_char_save ) << endreq; + << std::setfill( log_fill_char_save ) << endmsg; } } } @@ -282,19 +282,19 @@ void TrigMuonRoITool::decodeMuCTPi() { // print contents of RoI arrays if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "=================================================" << endreq; - msg(MSG::DEBUG) << " RoIs in time with event BCID: Number of RoIs = " << m_inTime_muCTPIRoIs.size() << endreq; - msg(MSG::DEBUG) << "=================================================" << endreq; + msg(MSG::DEBUG) << "=================================================" << endmsg; + msg(MSG::DEBUG) << " RoIs in time with event BCID: Number of RoIs = " << m_inTime_muCTPIRoIs.size() << endmsg; + msg(MSG::DEBUG) << "=================================================" << endmsg; for (std::vector< ROIB::MuCTPIRoI >::iterator it = m_inTime_muCTPIRoIs.begin(); it != m_inTime_muCTPIRoIs.end(); ++it) { dumpRoIBDataWord((*it).roIWord()); } - msg(MSG::DEBUG) << "=====================================================" << endreq; - msg(MSG::DEBUG) << " RoIs out of time with event BCID: Number of RoIs = " << m_outOfTime_muCTPIRoIs.size() << endreq; - msg(MSG::DEBUG) << "=====================================================" << endreq; + msg(MSG::DEBUG) << "=====================================================" << endmsg; + msg(MSG::DEBUG) << " RoIs out of time with event BCID: Number of RoIs = " << m_outOfTime_muCTPIRoIs.size() << endmsg; + msg(MSG::DEBUG) << "=====================================================" << endmsg; for (std::vector< std::pair<ROIB::MuCTPIRoI,int> >::iterator it = m_outOfTime_muCTPIRoIs.begin(); it != m_outOfTime_muCTPIRoIs.end(); ++it) { - msg(MSG::DEBUG) << " Difference(RoI(BCID) - Event(BCID)) = " << (*it).second << endreq; - msg(MSG::DEBUG) << " ------------------------------------- " << endreq; + msg(MSG::DEBUG) << " Difference(RoI(BCID) - Event(BCID)) = " << (*it).second << endmsg; + msg(MSG::DEBUG) << " ------------------------------------- " << endmsg; dumpRoIBDataWord(((*it).first).roIWord()); } } @@ -323,21 +323,21 @@ void TrigMuonRoITool::dumpRoIBDataWord( uint32_t data_word ) { loc = "BARREL"; msg(MSG::DEBUG) << "RoIB word : 0x" - << MSG::hex << roI.roIWord() << MSG::dec << endreq; - msg(MSG::DEBUG) << "Threshold : pt" << roI.pt() << endreq; - msg(MSG::DEBUG) << "Sector location : " << loc << endreq; + << MSG::hex << roI.roIWord() << MSG::dec << endmsg; + msg(MSG::DEBUG) << "Threshold : pt" << roI.pt() << endmsg; + msg(MSG::DEBUG) << "Sector location : " << loc << endmsg; std::string sectorOffset(""); if ((roI.getSectorAddress() & MuCTPI_RDO::SECTOR_HEMISPHERE_MASK) && (roI.getSectorLocation() == MuCTPI_RDO::BARREL)) sectorOffset = " + 32 for Hemisphere = 1 "; - msg(MSG::DEBUG) << "Sector ID : " << roI.getSectorID() << sectorOffset << endreq; + msg(MSG::DEBUG) << "Sector ID : " << roI.getSectorID() << sectorOffset << endmsg; msg(MSG::DEBUG) << "Sector addr : 0x" << MSG::hex - << roI.getSectorAddress() << MSG::dec << endreq; - msg(MSG::DEBUG) << "Sector overflow : " << roI.getSectorOverflow() << endreq; - msg(MSG::DEBUG) << "RoI overflow : " << roI.getRoiOverflow() << endreq; - msg(MSG::DEBUG) << "RoI number : " << roI.getRoiNumber() << endreq; - msg(MSG::DEBUG) << "IsHighestPt : " << roI.getCandidateIsHighestPt() << endreq; - msg(MSG::DEBUG) << "Overlap : " << roI.getOverlapBits() << endreq; - msg(MSG::DEBUG) << "Hemisphere : " << (roI.getSectorAddress() & MuCTPI_RDO::SECTOR_HEMISPHERE_MASK) << endreq; - msg(MSG::DEBUG) << "=================================================" << endreq; + << roI.getSectorAddress() << MSG::dec << endmsg; + msg(MSG::DEBUG) << "Sector overflow : " << roI.getSectorOverflow() << endmsg; + msg(MSG::DEBUG) << "RoI overflow : " << roI.getRoiOverflow() << endmsg; + msg(MSG::DEBUG) << "RoI number : " << roI.getRoiNumber() << endmsg; + msg(MSG::DEBUG) << "IsHighestPt : " << roI.getCandidateIsHighestPt() << endmsg; + msg(MSG::DEBUG) << "Overlap : " << roI.getOverlapBits() << endmsg; + msg(MSG::DEBUG) << "Hemisphere : " << (roI.getSectorAddress() & MuCTPI_RDO::SECTOR_HEMISPHERE_MASK) << endmsg; + msg(MSG::DEBUG) << "=================================================" << endmsg; return; } diff --git a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DCCollByteStreamTool.cxx b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DCCollByteStreamTool.cxx index 3ad327c207e..5b088d2d95b 100755 --- a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DCCollByteStreamTool.cxx +++ b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DCCollByteStreamTool.cxx @@ -60,7 +60,7 @@ StatusCode TrigTRT_DCCollByteStreamTool::initialize() if(sc != StatusCode::SUCCESS) { - msg(MSG::ERROR) << "Failed to retrieve InDetDD::TRT ID helper"<< endreq; + msg(MSG::ERROR) << "Failed to retrieve InDetDD::TRT ID helper"<< endmsg; return StatusCode::FAILURE; } m_cntx = m_trt_id->straw_layer_context(); @@ -69,14 +69,14 @@ StatusCode TrigTRT_DCCollByteStreamTool::initialize() sc = m_driftCircleTool.retrieve(); if(sc.isFailure()) { - msg(MSG::ERROR) << "Could not get TRT_DriftCircleTool"<<endreq; + msg(MSG::ERROR) << "Could not get TRT_DriftCircleTool"<<endmsg; return sc; } sc = m_decoder.retrieve(); if(sc.isFailure()) { - msg(MSG::ERROR) << "Could not get TRT_RodDecoder tool"<<endreq; + msg(MSG::ERROR) << "Could not get TRT_RodDecoder tool"<<endmsg; return sc; } @@ -84,14 +84,14 @@ StatusCode TrigTRT_DCCollByteStreamTool::initialize() if(sc.isFailure()) { - msg(MSG::ERROR) << "Could not get TRT_CablingSvc"<<endreq; + msg(MSG::ERROR) << "Could not get TRT_CablingSvc"<<endmsg; return sc; } ITrigTimerSvc* timerSvc; StatusCode scTime = service( "TrigTimerSvc", timerSvc); if( scTime.isFailure() ) { - msg(MSG::INFO) << "Unable to locate Service TrigTimerSvc " << endreq; + msg(MSG::INFO) << "Unable to locate Service TrigTimerSvc " << endmsg; m_timers = false; } else{ @@ -108,7 +108,7 @@ StatusCode TrigTRT_DCCollByteStreamTool::initialize() } if (msgLvl(MSG::INFO)) - msg() << " Create new TRT_DriftCircleContainer with trtDriftCircleContainerName: " << m_trtDriftCircleContainerName << endreq; + msg() << " Create new TRT_DriftCircleContainer with trtDriftCircleContainerName: " << m_trtDriftCircleContainerName << endmsg; m_trtDriftCircleContainer = new InDet::TRT_DriftCircleContainer(m_trt_id->straw_layer_hash_max()); @@ -149,8 +149,8 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, if (msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " Making TRT ClusterCollections for " <<listIds.size()<<" DetElements" - << endreq; - msg() << " Number of ROBS = " << vRobData.size() << endreq; + << endmsg; + msg() << " Number of ROBS = " << vRobData.size() << endmsg; } int nrob =0; //int nColl =0; @@ -167,35 +167,35 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, if(sc.isFailure()) { msg(MSG::WARNING) << "TRT DriftCircleContainer " << m_trtDriftCircleContainerName << - " cannot be recorded into StoreGate! "<<endreq; + " cannot be recorded into StoreGate! "<<endmsg; return sc; } else { if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "TRT DriftCircleContainer " << m_trtDriftCircleContainerName << - " recorded into StoreGate! "<<endreq; + " recorded into StoreGate! "<<endmsg; } m_rdoContainer->cleanup(); sc=evtStore()->record(m_rdoContainer,m_rdoContainerName,false); if(sc.isFailure()) { msg(MSG::WARNING) << "TRT_RDO Container " << m_rdoContainerName - <<" cannot be recorded in StoreGate !"<< endreq; + <<" cannot be recorded in StoreGate !"<< endmsg; return StatusCode::FAILURE; } else { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRT_RDO Container " << m_rdoContainerName - << " is recorded in StoreGate" << endreq; + << " is recorded in StoreGate" << endmsg; } } else { if(msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "TRT DriftCircleContainer " << m_trtDriftCircleContainerName << - " is found in StoreGate "<<endreq; + " is found in StoreGate "<<endmsg; } std::vector<IdentifierHash> reducedList; @@ -203,7 +203,7 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, if(vRobData.size() == 0) { - if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "0.0 Collections made for this ROB " <<endreq; + if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "0.0 Collections made for this ROB " <<endmsg; return scData; } @@ -244,9 +244,9 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, continue; if(msgLvl(MSG::VERBOSE)) { msg() << " Collection " << (*it) - << " has " << (*rdo_it)->size() << " RDOs " << endreq; + << " has " << (*rdo_it)->size() << " RDOs " << endmsg; msg() << " adding DC collection size= " << (*rdo_it)->size() << " hashId=" << - (*rdo_it)->identifyHash()<<endreq; + (*rdo_it)->identifyHash()<<endmsg; } if((*rdo_it)->size() !=0 ) { @@ -260,22 +260,22 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, if(sc.isFailure()) { if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " failed register TRT_DriftCircle collection (hashId)"<< - p_rio->identifyHash()<<endreq; + p_rio->identifyHash()<<endmsg; delete p_rio; } else { if(msgLvl(MSG::DEBUG)) { msg(MSG::DEBUG) << " Store a TRT_DriftCircle collection with Key " - << p_rio->identifyHash()<<endreq; + << p_rio->identifyHash()<<endmsg; InDet::TRT_DriftCircleContainer::const_iterator dcCollIt=m_trtDriftCircleContainer->indexFind(p_rio->identifyHash()); if(dcCollIt==m_trtDriftCircleContainer->end()) { - msg() << "not found for hashId="<<p_rio->identifyHash()<<endreq; + msg() << "not found for hashId="<<p_rio->identifyHash()<<endmsg; continue; } - msg() << "Found, size="<<(*dcCollIt)->size()<<endreq; + msg() << "Found, size="<<(*dcCollIt)->size()<<endmsg; } } } else { @@ -286,17 +286,17 @@ StatusCode TrigTRT_DCCollByteStreamTool::convert(VROBDATA& vRobData, if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Reconstructed RecDriftCircles "<<RecDriftCircles - <<" in the ROI "<<endreq; + <<" in the ROI "<<endmsg; if(msgLvl(MSG::DEBUG)) { if(bs_failure) { - msg() <<" FAILURE in TRT_RodDecoder"<<endreq; + msg() <<" FAILURE in TRT_RodDecoder"<<endmsg; } else - msg() <<"Total number of recoverable errors "<<n_recov_errors<<endreq; + msg() <<"Total number of recoverable errors "<<n_recov_errors<<endmsg; } if(bs_failure) { diff --git a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx index 1c289acdd7e..636dd1da099 100755 --- a/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx +++ b/Trigger/TrigTools/TrigOfflineDriftCircleTool/src/TrigTRT_DriftCircleProviderTool.cxx @@ -65,8 +65,8 @@ StatusCode TrigTRT_DriftCircleProviderTool::initialize() StatusCode sc = AthAlgTool::initialize(); #ifndef NDEBUG - msg(MSG::DEBUG) << "TrigTRT_DriftCircleProviderTool: in initialize" << endreq; - msg(MSG::INFO) << "RegionSelectorToolName: " << m_regionSelectorToolName << endreq; + msg(MSG::DEBUG) << "TrigTRT_DriftCircleProviderTool: in initialize" << endmsg; + msg(MSG::INFO) << "RegionSelectorToolName: " << m_regionSelectorToolName << endmsg; #endif // Get the region selector tool @@ -74,33 +74,33 @@ StatusCode TrigTRT_DriftCircleProviderTool::initialize() sc= m_regionSelector.retrieve(); if ( sc.isFailure() ) { msg(MSG::FATAL) - << "Unable to retrieve RegionSelector " << m_regionSelector << endreq; + << "Unable to retrieve RegionSelector " << m_regionSelector << endmsg; return sc; }; sc= m_TRT_DCCollBSTool.retrieve(); if(sc.isFailure()) { - msg(MSG::FATAL) << " Could not get TrigTRT_DCCollByteStreamTool tool"<<endreq; + msg(MSG::FATAL) << " Could not get TrigTRT_DCCollByteStreamTool tool"<<endmsg; return sc; } // Get ROBDataProvider sc = m_robDataProvider.retrieve(); if( sc.isFailure() ) { - msg(MSG::FATAL) << " Can't get ROBDataProviderSvc " << endreq; + msg(MSG::FATAL) << " Can't get ROBDataProviderSvc " << endmsg; return sc; } sc = m_trtByteStreamErrorService.retrieve(); if (sc.isFailure()) { - msg(MSG::FATAL) << "Failed to retrieve service " << m_trtByteStreamErrorService << endreq; + msg(MSG::FATAL) << "Failed to retrieve service " << m_trtByteStreamErrorService << endmsg; return sc; } ITrigTimerSvc* timerSvc; StatusCode scTime = service( "TrigTimerSvc", timerSvc); if( scTime.isFailure() ) { - msg(MSG::INFO) << "Unable to locate Service TrigTimerSvc " << endreq; + msg(MSG::INFO) << "Unable to locate Service TrigTimerSvc " << endmsg; m_timers = false; } else{ @@ -145,10 +145,10 @@ StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(const IRoiDescriptor if (m_uIntListOfTRT_Robs.size() > 0) { if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG)<< " Pre-loading the following TRT RoBs: " << endreq; + msg(MSG::DEBUG)<< " Pre-loading the following TRT RoBs: " << endmsg; for ( std::vector<unsigned int>::iterator iTrtRob=m_uIntListOfTRT_Robs.begin() ; iTrtRob!=m_uIntListOfTRT_Robs.end() ; iTrtRob++) { - msg(MSG::DEBUG) << *iTrtRob << " == 0x" << std::hex << *iTrtRob << std::dec << endreq; + msg(MSG::DEBUG) << *iTrtRob << " == 0x" << std::hex << *iTrtRob << std::dec << endmsg; } } m_robDataProvider->addROBData( m_uIntListOfTRT_Robs ); @@ -165,7 +165,7 @@ StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(const IRoiDescriptor if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "REGTEST / TRT : Roi contains " - << listOfTRTIds.size() << " det. Elements" << endreq; + << listOfTRTIds.size() << " det. Elements" << endmsg; std::vector<const ROBF*> v; @@ -244,7 +244,7 @@ StatusCode TrigTRT_DriftCircleProviderTool::fillCollections(std::vector<Identifi #ifndef NDEBUG if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "REGTEST / TRT : Roi contains " - << listOfTRTIds.size() << " det. Elements" << endreq; + << listOfTRTIds.size() << " det. Elements" << endmsg; #endif if(m_timers) m_timer[1]->resume(); diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaGapCalibration.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaGapCalibration.cxx index 83282e1bfec..fbfec7a217b 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaGapCalibration.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaGapCalibration.cxx @@ -29,7 +29,7 @@ StatusCode EgammaGapCalibration::initialize(){ CHECK (CaloRec::ToolWithConstantsMixin::initialize() ); m_log = new MsgStream(AthAlgTool::msgSvc(), name() ); - (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endmsg; return StatusCode::SUCCESS; @@ -38,7 +38,7 @@ StatusCode EgammaGapCalibration::initialize(){ StatusCode EgammaGapCalibration::finalize(){ - (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endmsg; delete m_log; return StatusCode::SUCCESS; @@ -50,9 +50,9 @@ void EgammaGapCalibration::makeCorrection(xAOD::TrigEMCluster* clus, #ifndef NDEBUG (*m_log) << MSG::DEBUG << "makeCorrection for tool : " - << name() << endreq; + << name() << endmsg; (*m_log) << MSG::DEBUG << "Cluster E input : " << - clus->energy() << endreq; + clus->energy() << endmsg; #endif float the_aeta=(clus->eta()); if (the_aeta<0) the_aeta=-the_aeta; @@ -68,7 +68,7 @@ void EgammaGapCalibration::makeCorrection(xAOD::TrigEMCluster* clus, clus->setEt(clus->energy()/cosh(clus->eta())); #ifndef NDEBUG (*m_log) << MSG::DEBUG << "Cluster E output : " << - clus->energy() << endreq; + clus->energy() << endmsg; #endif } diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsCalibration.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsCalibration.cxx index ad38a277dd1..e2bdf7738ad 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsCalibration.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsCalibration.cxx @@ -30,7 +30,7 @@ StatusCode EgammaHitsCalibration::initialize(){ CHECK (CaloRec::ToolWithConstantsMixin::initialize() ); m_log = new MsgStream(AthAlgTool::msgSvc(), name() ); - (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endmsg; @@ -51,7 +51,7 @@ StatusCode EgammaHitsCalibration::initialize(){ } StatusCode EgammaHitsCalibration::finalize(){ - (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endmsg; delete m_showerDepth; delete m_log; delete m_interp_barriers; @@ -68,9 +68,9 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, if (the_aeta >= m_etamax) return; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "************************************************************************************************" << endreq; - (*m_log) << MSG::DEBUG << " USING CALIBHITS CALIBRATION " << endreq; - (*m_log) << MSG::DEBUG << "************************************************************************************************" << endreq; + (*m_log) << MSG::DEBUG << "************************************************************************************************" << endmsg; + (*m_log) << MSG::DEBUG << " USING CALIBHITS CALIBRATION " << endmsg; + (*m_log) << MSG::DEBUG << "************************************************************************************************" << endmsg; #endif int si; if (the_aeta < m_eta_start_crack) @@ -91,16 +91,16 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, } #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Check etas -------------------------------------------------------------------"<< endreq; - (*m_log) << MSG::DEBUG << "Eta --> " << the_aeta << " Bin --> " << ibin <<" Cluster eta = " << clus->eta() << endreq; - - (*m_log) << MSG::DEBUG << "Check calibration coefficients -----------------------------------------------"<< endreq; - (*m_log) << MSG::DEBUG << "Accordion : " << m_correction[0][ibin][0] <<" " << m_correction[0][ibin][1] << " " << m_correction[0][ibin][2] << " " << m_correction[0][ibin][3] << endreq; - (*m_log) << MSG::DEBUG << "OutOfCOne : " << m_correction[1][ibin][0] <<" " << m_correction[1][ibin][1] << " " << m_correction[1][ibin][2] << " " << m_correction[1][ibin][3] << endreq; - (*m_log) << MSG::DEBUG << "Leakage : " << m_correction[2][ibin][0] <<" " << m_correction[2][ibin][1] << " " << m_correction[2][ibin][2] << " " << m_correction[2][ibin][3] << endreq; - (*m_log) << MSG::DEBUG << "Front offset: " << m_correction[3][ibin_frontCorr][0] <<" " <<m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] <<endreq; - (*m_log) << MSG::DEBUG << "Front Slope : " << m_correction[4][ibin_frontCorr][0] <<" " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endreq; - (*m_log) << MSG::DEBUG << "Second order: " << m_correction[5][ibin_frontCorr][0] << " " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << endreq; + (*m_log) << MSG::DEBUG << "Check etas -------------------------------------------------------------------"<< endmsg; + (*m_log) << MSG::DEBUG << "Eta --> " << the_aeta << " Bin --> " << ibin <<" Cluster eta = " << clus->eta() << endmsg; + + (*m_log) << MSG::DEBUG << "Check calibration coefficients -----------------------------------------------"<< endmsg; + (*m_log) << MSG::DEBUG << "Accordion : " << m_correction[0][ibin][0] <<" " << m_correction[0][ibin][1] << " " << m_correction[0][ibin][2] << " " << m_correction[0][ibin][3] << endmsg; + (*m_log) << MSG::DEBUG << "OutOfCOne : " << m_correction[1][ibin][0] <<" " << m_correction[1][ibin][1] << " " << m_correction[1][ibin][2] << " " << m_correction[1][ibin][3] << endmsg; + (*m_log) << MSG::DEBUG << "Leakage : " << m_correction[2][ibin][0] <<" " << m_correction[2][ibin][1] << " " << m_correction[2][ibin][2] << " " << m_correction[2][ibin][3] << endmsg; + (*m_log) << MSG::DEBUG << "Front offset: " << m_correction[3][ibin_frontCorr][0] <<" " <<m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] <<endmsg; + (*m_log) << MSG::DEBUG << "Front Slope : " << m_correction[4][ibin_frontCorr][0] <<" " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endmsg; + (*m_log) << MSG::DEBUG << "Second order: " << m_correction[5][ibin_frontCorr][0] << " " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << endmsg; #endif float shower_lbary = (*m_showerDepth).depth(the_aeta,clus); @@ -110,7 +110,7 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, if (shower_lbary < 5. || shower_lbary > 25.){ shower_lbary = 15.; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "replace pathological depth by 15 X0" << endreq; + (*m_log) << MSG::DEBUG << "replace pathological depth by 15 X0" << endmsg; #endif } @@ -121,13 +121,13 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, for (int sampling=1; sampling<4; sampling++) { eacc_base += clus->energy(EgammaHitsShowerDepth::m_samps[si][sampling]); #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Barrel/endcap = " << si << " Sampling = " << sampling << " Energy -->> " << clus->energy(EgammaHitsShowerDepth::m_samps[si][sampling]) << endreq; + (*m_log) << MSG::DEBUG << "Barrel/endcap = " << si << " Sampling = " << sampling << " Energy -->> " << clus->energy(EgammaHitsShowerDepth::m_samps[si][sampling]) << endmsg; #endif } float eps_base = clus->energy (EgammaHitsShowerDepth::m_samps[si][0]); #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "E accordion base --->>>> " << eacc_base << " Eps base " << eps_base << endreq; + (*m_log) << MSG::DEBUG << "E accordion base --->>>> " << eacc_base << " Eps base " << eps_base << endmsg; #endif @@ -137,9 +137,9 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, float depth_max = 20. + 3. * (eacc_base+eps_base) * 1e-6; // divided by TeV #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Raw energy ---->> " << (eacc_base+eps_base) << endreq ; + (*m_log) << MSG::DEBUG << "Raw energy ---->> " << (eacc_base+eps_base) << endmsg ; (*m_log) << MSG::DEBUG << "Bary max for this event ---->> " << depth_max - << endreq ; + << endmsg ; #endif if ( shower_lbary > depth_max ) { @@ -147,7 +147,7 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, //shower_lbary = depth_max; #ifndef NDEBUG (*m_log) << MSG::DEBUG << " replace pathological depth by 15 X0 " - << endreq; + << endmsg; #endif } // ------------------------------------------------------------- @@ -196,11 +196,11 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, e_front_reco=WpsOff + WpsSlo*(eps_base); #ifndef NDEBUG - (*m_log) << MSG::DEBUG << " raw event " << raw_energy << endreq; - (*m_log) << MSG::DEBUG << " froffset coeff " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << endreq; - (*m_log) << MSG::DEBUG << " frslope coeff " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endreq; - (*m_log) << MSG::DEBUG << " WpsOff,WpsSlo " << WpsOff << " " << WpsSlo << endreq; - (*m_log) << MSG::DEBUG << " eps_base, efront_reco " << eps_base << " " << e_front_reco << endreq; + (*m_log) << MSG::DEBUG << " raw event " << raw_energy << endmsg; + (*m_log) << MSG::DEBUG << " froffset coeff " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << endmsg; + (*m_log) << MSG::DEBUG << " frslope coeff " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endmsg; + (*m_log) << MSG::DEBUG << " WpsOff,WpsSlo " << WpsOff << " " << WpsSlo << endmsg; + (*m_log) << MSG::DEBUG << " eps_base, efront_reco " << eps_base << " " << e_front_reco << endmsg; #endif } else{ @@ -214,12 +214,12 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, e_front_reco=WpsOff + WpsSlo*(eps_base) + WpsSlo2*(eps_base)*(eps_base); if (e_front_reco<0.) e_front_reco= eps_base; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << " raw energy " << raw_energy << endreq; - (*m_log) << MSG::DEBUG << "p1 " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << " " << WpsOff << endreq; - (*m_log) << MSG::DEBUG << "p2 " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << " " << WpsSlo << endreq; - (*m_log) << MSG::DEBUG << "p3 " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << " " << WpsSlo2 << endreq; - (*m_log) << MSG::DEBUG << " WpsOff, WpsSlo, WpsSlo2 " << WpsOff << " " << WpsSlo << " " << WpsSlo2 << endreq; - (*m_log) << MSG::DEBUG << " eps_base, efront_reco " << eps_base << " " << e_front_reco << endreq; + (*m_log) << MSG::DEBUG << " raw energy " << raw_energy << endmsg; + (*m_log) << MSG::DEBUG << "p1 " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << " " << WpsOff << endmsg; + (*m_log) << MSG::DEBUG << "p2 " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << " " << WpsSlo << endmsg; + (*m_log) << MSG::DEBUG << "p3 " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << " " << WpsSlo2 << endmsg; + (*m_log) << MSG::DEBUG << " WpsOff, WpsSlo, WpsSlo2 " << WpsOff << " " << WpsSlo << " " << WpsSlo2 << endmsg; + (*m_log) << MSG::DEBUG << " eps_base, efront_reco " << eps_base << " " << e_front_reco << endmsg; #endif } @@ -231,9 +231,9 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, float p3 = m_correction[5][ibin_frontCorr][1] + m_correction[5][ibin_frontCorr][2] * raw_energy + m_correction[5][ibin_frontCorr][3] * raw_energy * raw_energy ; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "p1 " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << endreq; - (*m_log) << MSG::DEBUG << "p2 " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endreq; - (*m_log) << MSG::DEBUG << "p3 " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << endreq; + (*m_log) << MSG::DEBUG << "p1 " << m_correction[3][ibin_frontCorr][1] << " " << m_correction[3][ibin_frontCorr][2] << " " << m_correction[3][ibin_frontCorr][3] << endmsg; + (*m_log) << MSG::DEBUG << "p2 " << m_correction[4][ibin_frontCorr][1] << " " << m_correction[4][ibin_frontCorr][2] << " " << m_correction[4][ibin_frontCorr][3] << endmsg; + (*m_log) << MSG::DEBUG << "p3 " << m_correction[5][ibin_frontCorr][1] << " " << m_correction[5][ibin_frontCorr][2] << " " << m_correction[5][ibin_frontCorr][3] << endmsg; #endif e_front_reco= (p1 + p2 * shower_lbary + p3 * shower_lbary * shower_lbary); @@ -247,11 +247,11 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, float e_calo_reco =e_front_reco + e_leak_reco + e_acc_reco; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Final reco energy ---------------------- " << e_calo_reco << endreq; - (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Front ---------------------- " << e_front_reco << endreq; - (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Accordion ------------------ " << e_acc_reco << endreq; - (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::out of cone ---------------- " << acc_corr*(eacc_base )*(e_out_perc)/100 << endreq; - (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Leakage -------------------- " << e_leak_reco << endreq; + (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Final reco energy ---------------------- " << e_calo_reco << endmsg; + (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Front ---------------------- " << e_front_reco << endmsg; + (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Accordion ------------------ " << e_acc_reco << endmsg; + (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::out of cone ---------------- " << acc_corr*(eacc_base )*(e_out_perc)/100 << endmsg; + (*m_log) << MSG::DEBUG << "CaloSwCalibrationHits::Leakage -------------------- " << e_leak_reco << endmsg; #endif @@ -285,8 +285,8 @@ void EgammaHitsCalibration::makeCorrection(xAOD::TrigEMCluster* clus, // total energy float e_temp = 0; for (int nl = 0 ; nl< 4 ; nl++) e_temp += clus->energy (EgammaHitsShowerDepth::m_samps[si][nl]); - (*m_log) << MSG::DEBUG << "---------- Sum of the sampling energy --- >> " << e_temp << " EcaloReco = " << e_calo_reco << endreq; - (*m_log) << MSG::DEBUG << "CaloSwCalibHitsCalibration Energy after correction --> " << clus->energy() << endreq; + (*m_log) << MSG::DEBUG << "---------- Sum of the sampling energy --- >> " << e_temp << " EcaloReco = " << e_calo_reco << endmsg; + (*m_log) << MSG::DEBUG << "CaloSwCalibHitsCalibration Energy after correction --> " << clus->energy() << endmsg; #endif clus->setEnergy(e_calo_reco); diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsShowerDepth.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsShowerDepth.cxx index c0b8cb98998..d6b20ceeae9 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsShowerDepth.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaHitsShowerDepth.cxx @@ -88,7 +88,7 @@ float EgammaHitsShowerDepth::depth (const float &aeta, float depth = rsum / esum; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Shower barycenter ---->> " << depth << endreq; + (*m_log) << MSG::DEBUG << "Shower barycenter ---->> " << depth << endmsg; #endif return depth; diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaLWCalibration.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaLWCalibration.cxx index 505744f717c..85b0cbd6614 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaLWCalibration.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaLWCalibration.cxx @@ -29,7 +29,7 @@ StatusCode EgammaLWCalibration::initialize(){ CHECK (CaloRec::ToolWithConstantsMixin::initialize() ); m_log = new MsgStream(AthAlgTool::msgSvc(), name() ); - (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endmsg; // Initialize here to speed up m_samps[0][0]=CaloSampling::PreSamplerB; @@ -50,7 +50,7 @@ StatusCode EgammaLWCalibration::initialize(){ } StatusCode EgammaLWCalibration::finalize(){ - (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endmsg; delete m_log; delete m_interp_barriers; return StatusCode::SUCCESS; @@ -61,9 +61,9 @@ void EgammaLWCalibration::makeCorrection(xAOD::TrigEMCluster* clus, #ifndef NDEBUG (*m_log) << MSG::DEBUG << "makeCorrection for tool : " - << name() << endreq; + << name() << endmsg; (*m_log) << MSG::DEBUG << "Cluster E input : " << - clus->energy() << endreq; + clus->energy() << endmsg; #endif float the_aeta=(clus->eta()); if (the_aeta<0) the_aeta=-the_aeta; @@ -104,7 +104,7 @@ void EgammaLWCalibration::makeCorrection(xAOD::TrigEMCluster* clus, clus->setEt(clus->energy()/cosh(clus->eta())); #ifndef NDEBUG (*m_log) << MSG::DEBUG << "Cluster E output : " << - clus->energy() << endreq; + clus->energy() << endmsg; #endif } diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaSshapeCalibration.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaSshapeCalibration.cxx index 588c58b0678..4739092c945 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaSshapeCalibration.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaSshapeCalibration.cxx @@ -38,7 +38,7 @@ StatusCode EgammaSshapeCalibration::initialize(){ m_log = new MsgStream(AthAlgTool::msgSvc(), name() ); CHECK(AthAlgTool::initialize()); CHECK(CaloRec::ToolWithConstantsMixin::initialize()); - (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endmsg; return StatusCode::SUCCESS; } @@ -61,37 +61,37 @@ void EgammaSshapeCalibration::makeCorrection(xAOD::TrigEMCluster* clus, #ifndef NDEBUG (*m_log) << MSG::DEBUG << "caloDDE->descriptor()->is_lar_em_barrel() = " - << caloDDE->descriptor()->is_lar_em_barrel() << endreq; + << caloDDE->descriptor()->is_lar_em_barrel() << endmsg; (*m_log) << MSG::DEBUG << "caloDDE->descriptor()->is_lar_em_endcap() = " - << caloDDE->descriptor()->is_lar_em_endcap() << endreq; + << caloDDE->descriptor()->is_lar_em_endcap() << endmsg; - (*m_log) << MSG::DEBUG << "m_isRange_barrel=" << m_isRange_barrel << endreq; + (*m_log) << MSG::DEBUG << "m_isRange_barrel=" << m_isRange_barrel << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::PreSamplerB) = " - << clus->energy(CaloSampling::PreSamplerB) << endreq; + << clus->energy(CaloSampling::PreSamplerB) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EMB1) = " - << clus->energy(CaloSampling::EMB1) << endreq; + << clus->energy(CaloSampling::EMB1) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EMB2) = " - << clus->energy(CaloSampling::EMB2) << endreq; + << clus->energy(CaloSampling::EMB2) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EMB3) = " - << clus->energy(CaloSampling::EMB3) << endreq; + << clus->energy(CaloSampling::EMB3) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::PreSamplerE) = " - << clus->energy(CaloSampling::PreSamplerE) << endreq; + << clus->energy(CaloSampling::PreSamplerE) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EME1) = " - << clus->energy(CaloSampling::EME1) << endreq; + << clus->energy(CaloSampling::EME1) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EME2) = " - << clus->energy(CaloSampling::EME2) << endreq; + << clus->energy(CaloSampling::EME2) << endmsg; (*m_log) << MSG::DEBUG << "clus->energy(CaloSampling::EME3) = " - << clus->energy(CaloSampling::EME3) << endreq; + << clus->energy(CaloSampling::EME3) << endmsg; if((caloDDE->descriptor()->is_lar_em_barrel() && m_isRange_barrel) || (caloDDE->descriptor()->is_lar_em_endcap() && !m_isRange_barrel)) (*m_log) << MSG::DEBUG - << "[GOOD]: seedCell location and selected eta range agree" << endreq; + << "[GOOD]: seedCell location and selected eta range agree" << endmsg; else if((caloDDE->descriptor()->is_lar_em_barrel() && !m_isRange_barrel) || (caloDDE->descriptor()->is_lar_em_endcap() && m_isRange_barrel)) (*m_log) << MSG::DEBUG - << "[BAD]: seedCell location and selected eta range disagree !!" << endreq; + << "[BAD]: seedCell location and selected eta range disagree !!" << endmsg; #endif // check if seedCell is in barrel or end-cap for correct range selection @@ -122,12 +122,12 @@ void EgammaSshapeCalibration::makeCorrection(xAOD::TrigEMCluster* clus, double aeta = fabs(eta - elt_eta + elt_eta_raw); #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "eta = " << eta << endreq; - (*m_log) << MSG::DEBUG << "elt_eta = " << elt_eta << endreq; - (*m_log) << MSG::DEBUG << "elt_deta = " << elt_deta << endreq; - (*m_log) << MSG::DEBUG << "elt_eta_raw = " << elt_eta_raw << endreq; - (*m_log) << MSG::DEBUG << "u = " << u << endreq; - (*m_log) << MSG::DEBUG << "aeta = " << aeta << endreq; + (*m_log) << MSG::DEBUG << "eta = " << eta << endmsg; + (*m_log) << MSG::DEBUG << "elt_eta = " << elt_eta << endmsg; + (*m_log) << MSG::DEBUG << "elt_deta = " << elt_deta << endmsg; + (*m_log) << MSG::DEBUG << "elt_eta_raw = " << elt_eta_raw << endmsg; + (*m_log) << MSG::DEBUG << "u = " << u << endmsg; + (*m_log) << MSG::DEBUG << "aeta = " << aeta << endmsg; #endif // Find the appropriate region @@ -222,9 +222,9 @@ void EgammaSshapeCalibration::makeCorrection(xAOD::TrigEMCluster* clus, clus->setEta(eta+offs); #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Before correction : " << eta << endreq; - (*m_log) << MSG::DEBUG << "offset =" << offs << endreq; - (*m_log) << MSG::DEBUG << "After correction : " << eta+offs << endreq; + (*m_log) << MSG::DEBUG << "Before correction : " << eta << endmsg; + (*m_log) << MSG::DEBUG << "offset =" << offs << endmsg; + (*m_log) << MSG::DEBUG << "After correction : " << eta+offs << endmsg; #endif delete builder; diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaTransitionRegions.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaTransitionRegions.cxx index e17ce0df4a0..c38fb639622 100644 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaTransitionRegions.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/EgammaTransitionRegions.cxx @@ -39,7 +39,7 @@ StatusCode EgammaTransitionRegions::initialize(){ CHECK (CaloRec::ToolWithConstantsMixin::initialize() ); m_log = new MsgStream(AthAlgTool::msgSvc(), name() ); - (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Initialize Tool : " << name() << endmsg; @@ -49,7 +49,7 @@ StatusCode EgammaTransitionRegions::initialize(){ } StatusCode EgammaTransitionRegions::finalize(){ - (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endreq; + (*m_log) << MSG::DEBUG << "Finalize Tool : " << name() << endmsg; delete m_log; return StatusCode::SUCCESS; } @@ -64,17 +64,17 @@ void EgammaTransitionRegions::makeCorrection(xAOD::TrigEMCluster* clus, //if (the_aeta >= m_etamax) return; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "************************************************************************************************" << endreq; - (*m_log) << MSG::DEBUG << " USING TRANSITION REGION " << endreq; - (*m_log) << MSG::DEBUG << "************************************************************************************************" << endreq; + (*m_log) << MSG::DEBUG << "************************************************************************************************" << endmsg; + (*m_log) << MSG::DEBUG << " USING TRANSITION REGION " << endmsg; + (*m_log) << MSG::DEBUG << "************************************************************************************************" << endmsg; #endif CaloRec::Array<1> tr00 = m_correction[0]; CaloRec::Array<1> tr08 = m_correction[1]; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "************************************************************************************************" << endreq; - (*m_log) << MSG::DEBUG << "the_aeta ::::: " << the_aeta << endreq; + (*m_log) << MSG::DEBUG << "************************************************************************************************" << endmsg; + (*m_log) << MSG::DEBUG << "the_aeta ::::: " << the_aeta << endmsg; #endif double corr = 1.0; @@ -84,15 +84,15 @@ void EgammaTransitionRegions::makeCorrection(xAOD::TrigEMCluster* clus, if (the_aeta < m_etamax_TR00 && the_aeta > m_etamin_TR00 ) { #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Applying correction for eta = 0 (loose) " << endreq; - (*m_log) << MSG::DEBUG << tr00[0] << " " << tr00[1] << " " << tr00[2] << endreq; + (*m_log) << MSG::DEBUG << "Applying correction for eta = 0 (loose) " << endmsg; + (*m_log) << MSG::DEBUG << tr00[0] << " " << tr00[1] << " " << tr00[2] << endmsg; #endif corr = ( tr00[0] - tr00[1] / (exp( tr00[2] - the_aeta ) + exp( tr00[3]*( the_aeta - tr00[4]))+tr00[5])); } else if ( the_aeta < m_etamin_TR00 ) { corr = tr00[6]; #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Applying correction for eta = 0 (tight) " << endreq; + (*m_log) << MSG::DEBUG << "Applying correction for eta = 0 (tight) " << endmsg; #endif } @@ -102,8 +102,8 @@ void EgammaTransitionRegions::makeCorrection(xAOD::TrigEMCluster* clus, if (the_aeta < m_etamax_TR08 && the_aeta > m_etamin_TR08 ) { #ifndef NDEBUG - (*m_log) << MSG::DEBUG << "Applying correction for eta = 0.8 (loose) " << endreq; - (*m_log) << MSG::DEBUG << tr08[0] << " " << tr08[1] << " " << tr08[2] << endreq; + (*m_log) << MSG::DEBUG << "Applying correction for eta = 0.8 (loose) " << endmsg; + (*m_log) << MSG::DEBUG << tr08[0] << " " << tr08[1] << " " << tr08[2] << endmsg; #endif corr = (tr08[0] - tr08[1] / (exp( tr08[2] - the_aeta ) + exp( tr08[3] *( the_aeta - tr08[4] )) + tr08[5] )); @@ -112,7 +112,7 @@ void EgammaTransitionRegions::makeCorrection(xAOD::TrigEMCluster* clus, #ifndef NDEBUG (*m_log) << MSG::DEBUG << "EgammaTransitionRegions::Energy before correction --> " << clus->energy() - << " Correction --> " << corr << endreq; + << " Correction --> " << corr << endmsg; #endif if ( corr == 1 ) return; diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2GSCalibTool.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2GSCalibTool.cxx index 722b3db4b4a..dad33e508c4 100755 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2GSCalibTool.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2GSCalibTool.cxx @@ -98,7 +98,7 @@ double T2GSCalibTool::CalculateCorrection(double jetProperty, { // Say hello if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE - << "In JetPropertyInvertResponseTool::CalculateCorrection" << endreq; + << "In JetPropertyInvertResponseTool::CalculateCorrection" << endmsg; int eta_index = -1; double corr = 0; @@ -109,7 +109,7 @@ double T2GSCalibTool::CalculateCorrection(double jetProperty, // This correction can be asymmetric in eta, so go across the whole range if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE - << "Looking up jet eta position in table" << endreq; + << "Looking up jet eta position in table" << endmsg; for(unsigned int i=0; i < m_etaBins.size() - 1; i++) { if (eta < m_etaBins.at(0)) eta_index = 0; else if (eta >= m_etaBins.at(m_etaBins.size()-1)) eta_index = m_etaBins.size(); @@ -120,9 +120,9 @@ double T2GSCalibTool::CalculateCorrection(double jetProperty, } // Checking if the correction can be interpolated or extrapolated - if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Checking if pT and fraction are in the range of the correction" << endreq; - // if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " m_ptbins size"<< m_ptBins.size() << " " << m_propertyBins.size() << endreq; - // if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " eta_index"<< eta_index << " " << m_ptBins[eta_index].size()-1 << endreq; + if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Checking if pT and fraction are in the range of the correction" << endmsg; + // if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " m_ptbins size"<< m_ptBins.size() << " " << m_propertyBins.size() << endmsg; + // if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << " eta_index"<< eta_index << " " << m_ptBins[eta_index].size()-1 << endmsg; double maxX = (m_ptBins[eta_index][m_ptBins[eta_index].size()-1] +m_ptBins[eta_index][m_ptBins[eta_index].size()-2])/2; @@ -150,7 +150,7 @@ double T2GSCalibTool::CalculateCorrection(double jetProperty, } - if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Obtained correction value" << endreq; + if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Obtained correction value" << endmsg; // Print out some info for debugging if(outputLevel() <= MSG::DEBUG) m_log << MSG::DEBUG @@ -159,7 +159,7 @@ double T2GSCalibTool::CalculateCorrection(double jetProperty, << " property value: " << jetProperty // << " property: " << m_propertyName << " response = " << corr - << endreq; + << endmsg; return corr; } @@ -188,11 +188,11 @@ double T2GSCalibTool::interpolate(double pT, double jetProperty, } if ((outputLevel() <= MSG::VERBOSE) && (pt_low_index == -1)){ - m_log << MSG::VERBOSE << "Problem in interpolation pt_low_index == -1" << endreq; + m_log << MSG::VERBOSE << "Problem in interpolation pt_low_index == -1" << endmsg; return 1; } if ((outputLevel() <= MSG::VERBOSE) && (prop_low_index == -1)){ - m_log << MSG::VERBOSE << "Problem in interpolation prop_low_index == -1" << endreq; + m_log << MSG::VERBOSE << "Problem in interpolation prop_low_index == -1" << endmsg; return 1; } @@ -278,7 +278,7 @@ double T2GSCalibTool::interpolate(double pT, double jetProperty, - //if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Interpolated value " << pT << " " << pt_low_index << " " << ptBins.at(pt_low_index) << " " << ptBins.at(pt_low_index+1) << " " << jetProperty << " " << prop_low_index << " " << propertyBins.at(prop_low_index) << " " << propertyBins.at(prop_low_index+1) << endreq; + //if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Interpolated value " << pT << " " << pt_low_index << " " << ptBins.at(pt_low_index) << " " << ptBins.at(pt_low_index+1) << " " << jetProperty << " " << prop_low_index << " " << propertyBins.at(prop_low_index) << " " << propertyBins.at(prop_low_index+1) << endmsg; return response; } @@ -352,7 +352,7 @@ double T2GSCalibTool::extrapolate(double pT, double jetProperty, extrapolated = linearInterpolation(x1, x2, z1, z2, x); } - if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Extrapolated correction value " << extrapolated << " " << indx << " " << indy << " " << jetProperty << endreq; + if (outputLevel() <= MSG::VERBOSE) m_log << MSG::VERBOSE << "Extrapolated correction value " << extrapolated << " " << indx << " " << indy << " " << jetProperty << endmsg; return extrapolated; diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2JESCalibTool.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2JESCalibTool.cxx index 1f5650e599a..0817a00d446 100755 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2JESCalibTool.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2JESCalibTool.cxx @@ -87,7 +87,7 @@ double T2JESCalibTool::c_energy(double EMe,double HADe,double eta) if ( EMscale_et < m_etcut ) { if ( outputLevel() <= MSG::DEBUG ) m_log << MSG::DEBUG << "Cluster transv. energy :" << EMscale_et - << ", below threshold :" << m_etcut << endreq; + << ", below threshold :" << m_etcut << endmsg; return 0.0; } diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx index 48b1784caa0..76995379d55 100755 --- a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx +++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx @@ -89,7 +89,7 @@ StatusCode T2SampCalibTool::initialize() //Locate the ptr to the conditions store - needed for dB sc = service("DetectorStore", m_detStore); if (!sc.isSuccess() || 0 == m_detStore) { - m_log << MSG::ERROR <<"Could not find DetStore" <<endreq; + m_log << MSG::ERROR <<"Could not find DetStore" <<endmsg; return StatusCode::FAILURE; } @@ -104,7 +104,7 @@ StatusCode T2SampCalibTool::initialize() if (sc.isFailure()) { m_log << MSG::ERROR << " Failed to create T2SampCalibTool dB object " - << endreq; + << endmsg; return StatusCode::FAILURE; } } @@ -114,7 +114,7 @@ StatusCode T2SampCalibTool::initialize() if (sc.isFailure()) { m_log << MSG::ERROR << " Failed to read T2SampCalibTool dB object " - << endreq; + << endmsg; //return StatusCode::FAILURE; } } @@ -124,7 +124,7 @@ StatusCode T2SampCalibTool::initialize() IIncidentSvc* incSvc; sc = service( "IncidentSvc", incSvc ); if (sc.isFailure()) { - m_log << MSG::ERROR << "Unable to get the IncidentSvc" << endreq; + m_log << MSG::ERROR << "Unable to get the IncidentSvc" << endmsg; return StatusCode::FAILURE; } incSvc->addListener(this, "BeginRun"); @@ -144,7 +144,7 @@ void T2SampCalibTool::handle(const Incident& inc) { if (sc.isFailure()) { m_log << MSG::ERROR << " Failed to read T2SampCalibTool dB object " - << endreq; + << endmsg; //return StatusCode::FAILURE; } }*/ @@ -153,7 +153,7 @@ void T2SampCalibTool::handle(const Incident& inc) { if (sc.isFailure()) { m_log << MSG::ERROR << " Failed to assign T2SampCalibTool calibration weights " - << endreq; + << endmsg; //return StatusCode::FAILURE; } } @@ -188,7 +188,7 @@ double T2SampCalibTool::c_energy(double EMe,double HADe, double eta) if ( etR < m_etcut ) { if ( outputLevel() <= MSG::DEBUG ) m_log << MSG::DEBUG << "Cluster transv. energy :" << etR << ", below threshold :" - << m_etcut << endreq; + << m_etcut << endmsg; return 0.0; } m_ieta = -1; @@ -233,7 +233,7 @@ double T2SampCalibTool::c_energy(double EMe,double HADe, double eta) if( eR < m_ecut || etf*eR < m_etcut) { if ( outputLevel() <= MSG::DEBUG ) m_log << MSG::DEBUG << "At iteration: " << count << ", cluster transv. energy :" - << etR << ", below threshold :" << m_etcut << endreq; + << etR << ", below threshold :" << m_etcut << endmsg; return 0.0; } @@ -269,7 +269,7 @@ double T2SampCalibTool::c_febenergy(double EMe,double HADe, if ( etR < m_etcut ) { if ( outputLevel() <= MSG::DEBUG ) m_log << MSG::DEBUG << "Cluster transv. energy :" << etR << ", below threshold :" - << m_etcut << endreq; + << m_etcut << endmsg; return 0.0; } m_ieta = -1; @@ -315,7 +315,7 @@ double T2SampCalibTool::c_febenergy(double EMe,double HADe, if( eR < m_ecut || etf*eR < m_etcut) { if ( outputLevel() <= MSG::DEBUG ) m_log << MSG::DEBUG << "At iteration: " << count << ", cluster transv. energy :" - << etR << ", below threshold :" << m_etcut << endreq; + << etR << ", below threshold :" << m_etcut << endmsg; return 0.0; } @@ -357,15 +357,15 @@ void T2SampCalibTool::get_weight(double e, double CaloWeight[2]) StatusCode T2SampCalibTool::readFromDb(){ StatusCode status; - m_log << MSG::DEBUG <<"T2SampCalibTool::Reading from dB..." <<endreq; + m_log << MSG::DEBUG <<"T2SampCalibTool::Reading from dB..." <<endmsg; //Register DataHandle status = m_detStore->regHandle(m_lvl2_calib_handle, m_obj_key); if (status.isFailure()) { - m_log << MSG::ERROR <<"Could not retrieve DataHandle for T2CaloJetCalib_dBObj" <<endreq; + m_log << MSG::ERROR <<"Could not retrieve DataHandle for T2CaloJetCalib_dBObj" <<endmsg; return( StatusCode::FAILURE); } else { - m_log << MSG::INFO << "Retrieved DataHandle for T2CaloJetCalib_dBObj " << endreq; + m_log << MSG::INFO << "Retrieved DataHandle for T2CaloJetCalib_dBObj " << endmsg; } return StatusCode::SUCCESS; } @@ -374,14 +374,14 @@ StatusCode T2SampCalibTool::readFromDb(){ StatusCode T2SampCalibTool::createCondObject(){ StatusCode sc; - m_log << MSG::INFO <<"Creating T2SampCalibTool dB object" <<endreq; + m_log << MSG::INFO <<"Creating T2SampCalibTool dB object" <<endmsg; ///////////////////////////////// // Create T2CaloJetCalib_dBObj // ///////////////////////////////// T2CaloJetCalib_dBObj* lvl2_calib = new T2CaloJetCalib_dBObj(); //Fill obj - m_log << MSG::INFO << "Setup T2CaloJetCalib_dBObj... " << endreq; + m_log << MSG::INFO << "Setup T2CaloJetCalib_dBObj... " << endmsg; //Use info from job option to fill dB objects lvl2_calib->set_eta_ranges(m_etareg); lvl2_calib->set_ve_cuts(m_vecut); @@ -389,7 +389,7 @@ StatusCode T2SampCalibTool::createCondObject(){ //Provide a key which is used as the name to create the folder sc = m_detStore->record(lvl2_calib, m_obj_key); if (sc.isFailure()) { - m_log <<MSG::ERROR <<"Could not record T2CaloJetCalib_dBObj" <<endreq; + m_log <<MSG::ERROR <<"Could not record T2CaloJetCalib_dBObj" <<endmsg; return( StatusCode::FAILURE); } return StatusCode::SUCCESS; @@ -399,41 +399,41 @@ StatusCode T2SampCalibTool::createCondObject(){ StatusCode T2SampCalibTool::printCondObjects(){ StatusCode sc; - m_log << MSG::INFO << "Printing T2SampCalibTool dB Calibration Info." << endreq; + m_log << MSG::INFO << "Printing T2SampCalibTool dB Calibration Info." << endmsg; //Retrieve T2CaloJetCalib_dBObj sc = m_detStore->retrieve(m_lvl2_calib, m_obj_key); if (sc.isFailure()) { - m_log << MSG::ERROR <<"Could not retrieve T2CaloJetCalib_dBObj" <<endreq; + m_log << MSG::ERROR <<"Could not retrieve T2CaloJetCalib_dBObj" <<endmsg; return( StatusCode::FAILURE); } else { - m_log << MSG::INFO << "Retrieved T2CaloJetCalib_dBObj " << endreq; + m_log << MSG::INFO << "Retrieved T2CaloJetCalib_dBObj " << endmsg; } if (m_lvl2_calib==0) { - m_log <<MSG::ERROR <<"T2CaloJetCalib_dBObj ptr is 0" <<endreq; + m_log <<MSG::ERROR <<"T2CaloJetCalib_dBObj ptr is 0" <<endmsg; return( StatusCode::FAILURE); } if(outputLevel() <= MSG::DEBUG){ int eta_size=(m_lvl2_calib->eta_ranges().size()); - m_log << MSG::DEBUG << "T2SampCalibTool::Number of eta bins: " << eta_size << endreq; + m_log << MSG::DEBUG << "T2SampCalibTool::Number of eta bins: " << eta_size << endmsg; for(int i=0;i<eta_size;++i){ m_log << MSG::DEBUG << "T2SampCalibTool::EtaRange["<<i<<"]: " << (m_lvl2_calib->eta_ranges()).at(i) - << endreq; + << endmsg; } int ve_size=(m_lvl2_calib->ve_cuts().size()); - m_log << MSG::DEBUG << "T2SampCalibTool::Number of ve bins: " << ve_size << endreq; + m_log << MSG::DEBUG << "T2SampCalibTool::Number of ve bins: " << ve_size << endmsg; for(int i=0;i<ve_size;++i){ m_log << MSG::DEBUG << "T2SampCalibTool::VECut["<<i<<"]: " << (m_lvl2_calib->ve_cuts()).at(i) - << endreq;; + << endmsg;; } int weight_size=(m_lvl2_calib->calib_weights().size()); - m_log << MSG::DEBUG << "T2SampCalibTool::Number of ve bins: " << ve_size << endreq; + m_log << MSG::DEBUG << "T2SampCalibTool::Number of ve bins: " << ve_size << endmsg; for(int i=0;i<weight_size;++i){ m_log << MSG::DEBUG << "T2SampCalibTool::Weights["<<i<<"]: " << (m_lvl2_calib->calib_weights()).at(i) - << endreq; + << endmsg; } } @@ -454,7 +454,7 @@ StatusCode T2SampCalibTool::assignWeights(){ m_etareg.at(i)=(m_lvl2_calib_handle->eta_ranges()).at(i); m_log << MSG::DEBUG << "T2SampCalibTool::EtaRanges["<<i<<"]: " << (m_lvl2_calib_handle->eta_ranges()).at(i) - << endreq; + << endmsg; } int ve_size=(m_lvl2_calib_handle->ve_cuts().size()); m_vecut.resize(ve_size,0); @@ -462,7 +462,7 @@ StatusCode T2SampCalibTool::assignWeights(){ m_vecut.at(i) = (m_lvl2_calib_handle->ve_cuts()).at(i); m_log << MSG::DEBUG << "T2SampCalibTool::VECuts["<<i<<"]: " << (m_lvl2_calib_handle->ve_cuts()).at(i) - << endreq; + << endmsg; } int weight_size=(m_lvl2_calib_handle->calib_weights().size()); m_Weights.resize(weight_size,0); @@ -470,13 +470,13 @@ StatusCode T2SampCalibTool::assignWeights(){ m_Weights.at(i) = (m_lvl2_calib_handle->calib_weights()).at(i); m_log << MSG::DEBUG << "T2SampCalibTool::Weights["<<i<<"]: " << (m_lvl2_calib_handle->calib_weights()).at(i) - << endreq; + << endmsg; } } } if(outputLevel() <= MSG::DEBUG) - m_log << MSG::DEBUG << "T2SampCalib Weights: " << endreq; + m_log << MSG::DEBUG << "T2SampCalib Weights: " << endmsg; for(int i=0; i<m_nbin_eta; ++i) { @@ -489,10 +489,10 @@ StatusCode T2SampCalibTool::assignWeights(){ m_log << MSG::DEBUG << " m_wt["<<i<<"]["<<j<<"]["<<k<<"] =" << m_wt[i][j][k]; } if(outputLevel() <= MSG::DEBUG) - m_log << MSG::DEBUG << endreq; + m_log << MSG::DEBUG << endmsg; } if(outputLevel() <= MSG::DEBUG) - m_log << MSG::DEBUG << endreq; + m_log << MSG::DEBUG << endmsg; } return StatusCode::SUCCESS; } diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx b/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx index 9268ce3840f..97bfd05bd37 100755 --- a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx +++ b/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx @@ -64,15 +64,15 @@ StatusCode TrigTrackJetFinderTool::initialize() { StatusCode sc = AlgTool::initialize(); - msg(MSG::INFO) << "Initializing TrigTrackJetFinderTool" << endreq; + msg(MSG::INFO) << "Initializing TrigTrackJetFinderTool" << endmsg; if (msgLvl(MSG::DEBUG)) { - msg(MSG::DEBUG) << "declareProperty review:" << endreq; - msg(MSG::DEBUG) << " cone size (R,Z) = " << m_dr << ", " << m_dz << endreq; - msg(MSG::DEBUG) << " minimum seed pT = " << m_ptSeed << endreq; - msg(MSG::DEBUG) << " minimum jet pT = " << m_ptJet << endreq; - msg(MSG::DEBUG) << " minimum track pT = " << m_ptMin << endreq; - msg(MSG::DEBUG) << " minimum multiplicity = " << m_mult << endreq; + msg(MSG::DEBUG) << "declareProperty review:" << endmsg; + msg(MSG::DEBUG) << " cone size (R,Z) = " << m_dr << ", " << m_dz << endmsg; + msg(MSG::DEBUG) << " minimum seed pT = " << m_ptSeed << endmsg; + msg(MSG::DEBUG) << " minimum jet pT = " << m_ptJet << endmsg; + msg(MSG::DEBUG) << " minimum track pT = " << m_ptMin << endmsg; + msg(MSG::DEBUG) << " minimum multiplicity = " << m_mult << endmsg; } return sc; @@ -85,7 +85,7 @@ StatusCode TrigTrackJetFinderTool::initialize() { void TrigTrackJetFinderTool::clear() { if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << "Clearing internal track classe" << endreq; + msg(MSG::VERBOSE) << "Clearing internal track classe" << endmsg; m_attributesOfTracks.clear(); } @@ -101,7 +101,7 @@ void TrigTrackJetFinderTool::addTrack(const TrigInDetTrack*& track, unsigned int if (defTrackSel) { if (fabs(track->param()->pT()) < m_ptMin && (fabs(track->param()->z0() - m_zpv) >= m_dz)) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT && deltaZ cut)" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT && deltaZ cut)" << endmsg; selTrack=false; } @@ -115,25 +115,25 @@ void TrigTrackJetFinderTool::addTrack(const TrigInDetTrack*& track, unsigned int m_trkSelChi2 = 0.001; if (fabs(track->param()->pT()) < m_trkSelPt) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT cut)" << endreq; selTrack=false; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT cut)" << endmsg; selTrack=false; } if (track->siSpacePoints()) { if ((*track->siSpacePoints())[0]->layer()) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (missing b-layer hit)" << endreq; selTrack=false; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (missing b-layer hit)" << endmsg; selTrack=false; } if ((int)track->siSpacePoints()->size() < m_trkSelSiHits) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (too few silicon hits)" << endreq; selTrack=false; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (too few silicon hits)" << endmsg; selTrack=false; } if (TMath::Prob(track->chi2(),(int)track->siSpacePoints()->size()*3-5) <= m_trkSelChi2) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (chi2 cut)" << endreq; selTrack=false; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (chi2 cut)" << endmsg; selTrack=false; } } } if (!selTrack) return; - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " selected" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " selected" << endmsg; TrackAttributes p(track, i); m_attributesOfTracks.push_back(p); @@ -155,7 +155,7 @@ void TrigTrackJetFinderTool::addTrack(const Rec::TrackParticle*& track, unsigned if (fabs(pT) >= m_ptMin && (fabs(z0 - m_zpv) < m_dz)) { if (msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endreq; + msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endmsg; m_attributesOfTracks.push_back(p); @@ -163,7 +163,7 @@ void TrigTrackJetFinderTool::addTrack(const Rec::TrackParticle*& track, unsigned if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Selected track " << i+1 << " not added for finding the track-jet direction since pT " - << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endreq; + << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endmsg; } @@ -184,7 +184,7 @@ void TrigTrackJetFinderTool::addTrack(const Trk::Track*& track, unsigned int i) if (fabs(pT) >= m_ptMin && (fabs(z0 - m_zpv) < m_dz)) { if (msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endreq; + msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endmsg; m_attributesOfTracks.push_back(p); @@ -192,7 +192,7 @@ void TrigTrackJetFinderTool::addTrack(const Trk::Track*& track, unsigned int i) if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Selected track " << i+1 << " not added for finding the track-jet direction since pT " - << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endreq; + << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endmsg; } @@ -206,7 +206,7 @@ void TrigTrackJetFinderTool::addTrack(const Trk::Track*& track, unsigned int i) void TrigTrackJetFinderTool::inputPrimaryVertexZ(const float& zPV) { if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << "Z primary vertex " << zPV << endreq; + msg(MSG::VERBOSE) << "Z primary vertex " << zPV << endmsg; m_zpv = zPV; } @@ -223,13 +223,13 @@ void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, fl jetEta = 0, jetPhi = 0; if (msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Number of input tracks = " << m_attributesOfTracks.size() << endreq; + msg(MSG::DEBUG) << "Number of input tracks = " << m_attributesOfTracks.size() << endmsg; if(m_attributesOfTracks.size() < m_mult) { jetEta = -99; jetPhi = -99; if (msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Seed multiplicity is below threshold " << m_mult << ". Not computing track-jet direction." << endreq; + msg(MSG::DEBUG) << "Seed multiplicity is below threshold " << m_mult << ". Not computing track-jet direction." << endmsg; return; } @@ -240,7 +240,7 @@ void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, fl jetEta = -99; jetPhi = -99; if (msgLvl(MSG::DEBUG)) - msg(MSG::DEBUG) << "Highest-pT seed is below threshold " << m_ptSeed << ". Not computing track-jet direction." << endreq; + msg(MSG::DEBUG) << "Highest-pT seed is below threshold " << m_ptSeed << ". Not computing track-jet direction." << endmsg; return; } @@ -255,12 +255,12 @@ void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, fl jetPhi = phiCorr(atan2(jetPy,jetPx)); if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << " jetP = " << jetP << " jetEta = " << jetEta << " jetPhi = " << jetPhi << endreq; + msg(MSG::VERBOSE) << " jetP = " << jetP << " jetEta = " << jetEta << " jetPhi = " << jetPhi << endmsg; for(unsigned int j=1; j < m_attributesOfTracks.size(); j++) { if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << "Considering seed " << m_attributesOfTracks[j].Id()+1 << endreq; + msg(MSG::VERBOSE) << "Considering seed " << m_attributesOfTracks[j].Id()+1 << endmsg; float pEta = m_attributesOfTracks[j].Eta(); float pPhi = m_attributesOfTracks[j].Phi(); @@ -270,7 +270,7 @@ void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, fl if(dr<m_dr) { if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << " deltaR matching between seed and jet direction satisfied (" << dr << ">" << m_dr << ")" << endreq; + msg(MSG::VERBOSE) << " deltaR matching between seed and jet direction satisfied (" << dr << ">" << m_dr << ")" << endmsg; jetPx += m_attributesOfTracks[j].Px(); jetPy += m_attributesOfTracks[j].Py(); @@ -282,7 +282,7 @@ void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, fl jetPhi = atan2(jetPy,jetPx); if (msgLvl(MSG::VERBOSE)) - msg(MSG::VERBOSE) << " jetP+= " << jetP << " jetEta+= " << jetEta << " jetPhi+= " << jetPhi << endreq; + msg(MSG::VERBOSE) << " jetP+= " << jetP << " jetEta+= " << jetEta << " jetPhi+= " << jetPhi << endmsg; } } @@ -321,7 +321,7 @@ StatusCode TrigTrackJetFinderTool::finalize() { StatusCode sc = AlgTool::finalize(); - msg(MSG::INFO) << "Finalizing TrigTrackJetFinderTool" << endreq; + msg(MSG::INFO) << "Finalizing TrigTrackJetFinderTool" << endmsg; return sc; } diff --git a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruth.cxx b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruth.cxx index 5003678144c..77e36893c66 100644 --- a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruth.cxx +++ b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruth.cxx @@ -35,13 +35,13 @@ int TrigInDetTrackTruth::addMatch(HepMcParticleLink p_tru_part,TrigIDHitStats hi std::string thisName("TrigInDetTrackTruth::addMatch"); MsgStream log(Athena::getMessageSvc(), thisName); - log << MSG::DEBUG<< "Inserting HepMcParticleLink and TrigIDHitStats to TrigInDetTrackTruth map" << endreq; + log << MSG::DEBUG<< "Inserting HepMcParticleLink and TrigIDHitStats to TrigInDetTrackTruth map" << endmsg; int indx = index(p_tru_part); if ( indx >= 0 ) { // HepMcParticleLink already exists: replace in vectors log << MSG::DEBUG<< "HepMcParticleLink already in map: replacing" - << endreq; + << endmsg; m_true_part_vec[indx] = p_tru_part; m_nr_common_hits[indx] = hits; } else { @@ -97,7 +97,7 @@ int TrigInDetTrackTruth::updateFamilyTree() std::string thisName("TrigInDetTrackTruth::updateFamilyTree"); MsgStream log(Athena::getMessageSvc(), thisName); - log << MSG::DEBUG<< "In TrigInDetTrackTruth::updateFamilyTree()" << endreq; + log << MSG::DEBUG<< "In TrigInDetTrackTruth::updateFamilyTree()" << endmsg; int nr_mothers_found=0; int child=-1; @@ -107,7 +107,7 @@ int TrigInDetTrackTruth::updateFamilyTree() { child++; /* get production vertex GenParticle pointed to by this link */ - log << MSG::DEBUG<< "Looking for mother of matching particle nr "<<child<<endreq; + log << MSG::DEBUG<< "Looking for mother of matching particle nr "<<child<<endmsg; // first get GenParticle pointer if ( !it1->isValid() ) continue; @@ -117,17 +117,17 @@ int TrigInDetTrackTruth::updateFamilyTree() << p_child->pdg_id() << "; status=" << p_child->status() << "; pT=" << p_child->momentum().perp() << "; searches mother..." - << endreq; + << endmsg; // then get production vertex (check against null) HepMC::GenVertex* p_child_vtx = p_child->production_vertex(); if ( p_child_vtx == NULL ) { - log << MSG::DEBUG<<"GenVertex pointer null: jump to next particle"<<endreq; + log << MSG::DEBUG<<"GenVertex pointer null: jump to next particle"<<endmsg; continue; } log << MSG::DEBUG<< "GenParticle "<< child << " comes from vertex with pointer " - << p_child_vtx << endreq; + << p_child_vtx << endmsg; /* find mother: there should be only one for final state particles (particles which can leave energy deposits in detectors) */ @@ -136,14 +136,14 @@ int TrigInDetTrackTruth::updateFamilyTree() // check a mother was found if ( p_mum == p_child_vtx->particles_in_const_end() ) { - log << MSG::DEBUG<< "Mother not found: go to next particle" <<endreq; + log << MSG::DEBUG<< "Mother not found: go to next particle" <<endmsg; continue; } log << MSG::DEBUG<< "Mother GenParticle (" << *p_mum << ") found; PDG id=" << (*p_mum)->pdg_id() << "; status=" << (*p_mum)->status() << "; pT=" << (*p_mum)->momentum().perp() << "; does it match track?" - << endreq; + << endmsg; // mother is (*p_mum); still have to see if it is a match to this track std::vector<HepMcParticleLink>::iterator it2=m_true_part_vec.begin(); @@ -151,7 +151,7 @@ int TrigInDetTrackTruth::updateFamilyTree() for (unsigned int mum=0; it2 != end; ++it2, ++mum) { log << MSG::DEBUG << "* Trying daughter index=" << child - << " and mother index=" << mum << endreq; + << " and mother index=" << mum << endmsg; if ( *p_mum == *it2 ) { // mother also matches track m_family_tree.push_back( std::pair<unsigned int, unsigned int>(mum,child) ); @@ -160,16 +160,16 @@ int TrigInDetTrackTruth::updateFamilyTree() log << MSG::DEBUG << "* Mother also matches track! " << nr_mothers_found - << " mother-daughter relations found so far" << endreq; + << " mother-daughter relations found so far" << endmsg; log << MSG::DEBUG << "Daughter "<< child <<" (PDG id=" << p_child->pdg_id() << "; pT=" << p_child->momentum().perp() << ") comes from mother " << mum << " (PDG id=" << (*p_mum)->status() << "; pT=" << p_child->momentum().perp() - << ")" << endreq; + << ")" << endmsg; } } if (!mum_found) log << MSG::DEBUG << "* Mother doesn't match track" - << endreq; + << endmsg; } return nr_mothers_found; } diff --git a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruthMap.cxx b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruthMap.cxx index b8fa32d4a03..f684d6dd536 100644 --- a/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruthMap.cxx +++ b/Trigger/TrigTruthEvent/TrigInDetTruthEvent/src/TrigInDetTrackTruthMap.cxx @@ -36,7 +36,7 @@ void TrigInDetTrackTruthMap::addMatch(const TrigInDetTrackCollection* trkColl, std::string thisName("TrigInDetTrackTruthMap::addMatch"); MsgStream log(Athena::getMessageSvc(), thisName); - log << MSG::DEBUG << "Adding TrigInDetTrack to map" << endreq; + log << MSG::DEBUG << "Adding TrigInDetTrack to map" << endmsg; // check entry for this track doesn't exist (otherwise we have a multimap) const TrigInDetTrack* p_trig_trk((*trkColl)[trk_indx]); @@ -46,10 +46,10 @@ void TrigInDetTrackTruthMap::addMatch(const TrigInDetTrackCollection* trkColl, m_elink_vec.push_back(p_trk_lnk); bool status = m_elink_vec.back().toPersistent(); if (!status) - log << MSG::DEBUG << "ERROR: could not set ElementLink persistent" << endreq; + log << MSG::DEBUG << "ERROR: could not set ElementLink persistent" << endmsg; m_truth_vec.push_back(p_trk_tru); } else { - log << MSG::DEBUG << "TrigInDetTrack already in map!" << endreq; + log << MSG::DEBUG << "TrigInDetTrack already in map!" << endmsg; } } @@ -84,7 +84,7 @@ const TrigInDetTrackTruth* TrigInDetTrackTruthMap::truth(const TrigInDetTrack* p std::string thisName("TrigInDetTrackTruthMap::truth"); MsgStream log(Athena::getMessageSvc(), thisName); - log << MSG::DEBUG<<"Searching truth for track at ptr="<<p_trig_trk<<endreq; + log << MSG::DEBUG<<"Searching truth for track at ptr="<<p_trig_trk<<endmsg; // must loop over map because ElementLink is a unidirectional link for (unsigned int i=0; i < m_elink_vec.size(); ++i) { @@ -98,13 +98,13 @@ const TrigInDetTrackTruth* TrigInDetTrackTruthMap::truth(const TrigInDetTrack* p (*(m_elink_vec[i]))->param()->phi0() == p_trig_trk->param()->phi0()) { // found position in vector corresponding to this track pointer log << MSG::DEBUG << "Truth match for track at ptr=" << p_trig_trk - << " found in map at index " << i <<endreq; + << " found in map at index " << i <<endmsg; return &m_truth_vec[i]; } } } // didn't find it: return null pointer - log << MSG::DEBUG <<"Truth match for track at ptr="<<p_trig_trk <<" not in map"<<endreq; + log << MSG::DEBUG <<"Truth match for track at ptr="<<p_trig_trk <<" not in map"<<endmsg; return NULL; } @@ -231,7 +231,7 @@ void TrigInDetTrackTruthMap::print() const } oss << "---------------------------------------------------------------------------------------------------------------------------------" << std::endl; - log << MSG::DEBUG << oss.str() << endreq; + log << MSG::DEBUG << oss.str() << endmsg; } size_t TrigInDetTrackTruthMap::size() const diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.cxx b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.cxx index a7285b18c62..5ded76f1f61 100644 --- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.cxx +++ b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/src/TrigInDetTrackTruthMapCnv.cxx @@ -21,7 +21,7 @@ TrigInDetTrackTruthMapCnv::~TrigInDetTrackTruthMapCnv() {} TrigInDetTrackTruthMap_PERS* TrigInDetTrackTruthMapCnv::createPersistent(TrigInDetTrackTruthMap* transObj) { MsgStream mlog(messageService(), "TrigInDetTrackTruthMapConverter" ); - mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::createPersistent" << endreq; + mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::createPersistent" << endmsg; TrigInDetTrackTruthMap_PERS* persObj = m_trigInDetTrackTruthMapCnv_tlp2.createPersistent( transObj, mlog ); @@ -32,7 +32,7 @@ TrigInDetTrackTruthMap_PERS* TrigInDetTrackTruthMapCnv::createPersistent(TrigInD TrigInDetTrackTruthMap* TrigInDetTrackTruthMapCnv::createTransient() { MsgStream mlog(messageService(), "TrigInDetTrackTruthMapConverter" ); - mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::createTransient " << endreq; + mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::createTransient " << endmsg; static pool::Guid tlp1_guid("08892FEB-5706-4938-9226-F45C0AA662E7"); static pool::Guid tlp2_guid("02074F47-F290-4A48-B503-4DCAB4181B3D"); @@ -43,20 +43,20 @@ TrigInDetTrackTruthMap* TrigInDetTrackTruthMapCnv::createTransient() { if( compareClassGuid(tlp2_guid) ) { - mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading tlp2 persistent object" << endreq; + mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading tlp2 persistent object" << endmsg; poolReadObject< TrigInDetTrackTruthMap_PERS >( m_trigInDetTrackTruthMapCnv_tlp2 ); transObj = m_trigInDetTrackTruthMapCnv_tlp2.createTransient( mlog ); } else if( compareClassGuid(tlp1_guid) ) { - mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading tlp1 persistent object" << endreq; + mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading tlp1 persistent object" << endmsg; TrigInDetTrackTruthMapCnv_tlp1 tlp1_Converter; poolReadObject< TrigInDetTrackTruthMap_tlp1 >(tlp1_Converter); transObj = tlp1_Converter.createTransient( mlog ); } else if( compareClassGuid(p0_guid) ) { - mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading p0 persistent object" << endreq; + mlog << MSG::DEBUG << "TrigInDetTrackTruthMapCnv::reading p0 persistent object" << endmsg; // old version from before TP separation, just return it transObj = this->poolReadObject<TrigInDetTrackTruthMap>(); } diff --git a/Trigger/TrigValidation/TrigAnalysisTest/src/AthenaTestHarness.cxx b/Trigger/TrigValidation/TrigAnalysisTest/src/AthenaTestHarness.cxx index 9f0b97afcc0..6a1834dfbd4 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/src/AthenaTestHarness.cxx +++ b/Trigger/TrigValidation/TrigAnalysisTest/src/AthenaTestHarness.cxx @@ -25,22 +25,22 @@ StatusCode AthenaTestHarness::initialize() { // print out properties - msg(MSG::INFO) << "Initializing AthenaTestHarness ..." << endreq; + msg(MSG::INFO) << "Initializing AthenaTestHarness ..." << endmsg; StatusCode sc = m_trigDec.retrieve(); if ( sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endreq; + msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endmsg; return sc; } m_test = GetTrigAnalysisTest(m_test_name); if(!m_test){ - msg(MSG::ERROR) << "Could not retrieve the test: "<< m_test_name << endreq; + msg(MSG::ERROR) << "Could not retrieve the test: "<< m_test_name << endmsg; return StatusCode::FAILURE; } m_test->setEventStore( evtStore().operator->() ); // explicitly call the arrow operator - msg(MSG::INFO) << "Initialization successful" << endreq; + msg(MSG::INFO) << "Initialization successful" << endmsg; return StatusCode::SUCCESS; } @@ -52,7 +52,7 @@ StatusCode AthenaTestHarness::finalize() if(m_test->finalize()) return StatusCode::FAILURE; - msg(MSG::INFO) << "Finalised successfully" << endreq; + msg(MSG::INFO) << "Finalised successfully" << endmsg; return StatusCode::SUCCESS; } diff --git a/Trigger/TrigValidation/TrigAnalysisTest/src/TriggersFiredTest.cxx b/Trigger/TrigValidation/TrigAnalysisTest/src/TriggersFiredTest.cxx index b02b500f4b8..84047765610 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/src/TriggersFiredTest.cxx +++ b/Trigger/TrigValidation/TrigAnalysisTest/src/TriggersFiredTest.cxx @@ -31,13 +31,13 @@ StatusCode TriggersFiredTest::initialize() m_first_event=true; // print out properties - msg(MSG::INFO) << "Initializing TriggersFiredTest ..." << endreq; + msg(MSG::INFO) << "Initializing TriggersFiredTest ..." << endmsg; // get handle to trigger configuration //ToolHandle<TrigConf::ITrigConfigTool> configHandle(&m_configTool); //StatusCode sc = m_configHandle.retrieve(); //if ( sc.isFailure() ) { - // msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endreq; + // msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endmsg; // return sc; //} //sc = m_configHandle->initialize(); @@ -46,18 +46,18 @@ StatusCode TriggersFiredTest::initialize() //sc = m_trigDec.retrieve(); StatusCode sc = m_trigDec.retrieve(); if ( sc.isFailure() ) { - msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endreq; + msg(MSG::ERROR) << "Could not retrieve TrigDecisionTool!" << endmsg; return sc; } //m_trigDec->ExperimentalAndExpertMethods()->enable(); //sc = m_trigDec->setProperty("ConfigTool",m_configHandle); //sc = m_trigDec->setProperty("TrigDecisionKey","xTrigDecision"); //if ( sc.isFailure() ) { - // msg(MSG::ERROR) << "Some problem!" << endreq; + // msg(MSG::ERROR) << "Some problem!" << endmsg; // return sc; //} - msg(MSG::INFO) << "Initialization successful" << endreq; + msg(MSG::INFO) << "Initialization successful" << endmsg; return StatusCode::SUCCESS; } @@ -67,15 +67,15 @@ StatusCode TriggersFiredTest::finalize() { // print summary of trigger decisions for each level - msg(MSG::INFO) << "==========================================================" << endreq; - msg(MSG::INFO) << "TriggersFiredTest summary:" << endreq; - msg(MSG::INFO) << "==========================================================" << endreq; + msg(MSG::INFO) << "==========================================================" << endmsg; + msg(MSG::INFO) << "TriggersFiredTest summary:" << endmsg; + msg(MSG::INFO) << "==========================================================" << endmsg; // print out nr. of events passed in blocks of N events for specific chains (configurable) //msg(MSG::INFO) << "REGTEST Nr.events: "; - msg(MSG::INFO) << "Finalised successfully" << endreq; + msg(MSG::INFO) << "Finalised successfully" << endmsg; return StatusCode::SUCCESS; } @@ -83,7 +83,7 @@ StatusCode TriggersFiredTest::finalize() StatusCode TriggersFiredTest::execute() { - msg(MSG::INFO) << "TriggersFiredTest::execute" << endreq; + msg(MSG::INFO) << "TriggersFiredTest::execute" << endmsg; passed_l1 += m_trigDec->isPassed("L1_.*"); passed_hlt += m_trigDec->isPassed("HLT_.*"); @@ -93,7 +93,7 @@ StatusCode TriggersFiredTest::execute() m_first_event = false; auto chainGroups = m_trigDec->getChainGroup(".*"); for(auto &trig : chainGroups->getListOfTriggers()) { - msg(MSG::INFO) << " " << trig << " " << m_trigDec->isPassed(trig) << endreq; + msg(MSG::INFO) << " " << trig << " " << m_trigDec->isPassed(trig) << endmsg; } } diff --git a/graphics/EventDisplayFilters/src/FilterUsingMBTS.cxx b/graphics/EventDisplayFilters/src/FilterUsingMBTS.cxx index 75ccf364014..8a457613ad1 100644 --- a/graphics/EventDisplayFilters/src/FilterUsingMBTS.cxx +++ b/graphics/EventDisplayFilters/src/FilterUsingMBTS.cxx @@ -25,10 +25,10 @@ StatusCode FilterUsingMBTS::initialize() { MsgStream log(msgSvc(), name()); StatusCode sc; - log << MSG::INFO << "Initializing " << name() << endreq; + log << MSG::INFO << "Initializing " << name() << endmsg; sc = service( "StoreGateSvc", m_eventStore); if( sc.isFailure() ) { - log << MSG::FATAL << name() << ": Unable to locate Service StoreGateSvc" << endreq; + log << MSG::FATAL << name() << ": Unable to locate Service StoreGateSvc" << endmsg; return sc; } @@ -53,7 +53,7 @@ StatusCode FilterUsingMBTS::execute() sc = m_eventStore->retrieve(theCTP_RDO, "CTP_RDO"); if (sc.isFailure()) { log << MSG::WARNING - << "Could not find \"CTP_RDO\" in StoreGate" << endreq; + << "Could not find \"CTP_RDO\" in StoreGate" << endmsg; return sc; } CTP_Decoder ctp; @@ -69,16 +69,16 @@ StatusCode FilterUsingMBTS::execute() const std::vector < CTP_BC > &BCs = ctp.getBunchCrossings(); const CTP_BC & bunch = BCs[l1aBC]; unsigned int l1aBCID = bunch.getBCID(); - log << MSG::DEBUG << "Number of Bunches in CTP window: " << numberBC << endreq; - log << MSG::DEBUG << "Level 1 Accept Bunch: " << l1aBC << endreq; - log << MSG::DEBUG << "Level 1 Accept BCID: " << l1aBCID << endreq; + log << MSG::DEBUG << "Number of Bunches in CTP window: " << numberBC << endmsg; + log << MSG::DEBUG << "Level 1 Accept Bunch: " << l1aBC << endmsg; + log << MSG::DEBUG << "Level 1 Accept BCID: " << l1aBCID << endmsg; const std::bitset < 512 > TBP(bunch.getTBP()); for(int c=0;c<32;c++) // Loop over MBTS counters { // Check the L1 result for each MBTS counter if (TBP.test(m_ctpID[c])) { - log << MSG::INFO << "Trigger fired for : " << m_counterLabel[c] << endreq; + log << MSG::INFO << "Trigger fired for : " << m_counterLabel[c] << endmsg; if(c<16) m_nA++; else m_nC++; } @@ -88,12 +88,12 @@ StatusCode FilterUsingMBTS::execute() // Check if filter is passed if( (m_nA >= m_nA_required) && (m_nC >= m_nC_required) ) { - log << MSG::INFO << "MBTS filter passed" << endreq; + log << MSG::INFO << "MBTS filter passed" << endmsg; this->setFilterPassed(true); } else { - log << MSG::INFO << "MBTS filter failed" << endreq; + log << MSG::INFO << "MBTS filter failed" << endmsg; this->setFilterPassed(false); } diff --git a/graphics/EventDisplayFilters/src/FilterUsingMBTSTiming.cxx b/graphics/EventDisplayFilters/src/FilterUsingMBTSTiming.cxx index 244c060c129..114e1c528ba 100644 --- a/graphics/EventDisplayFilters/src/FilterUsingMBTSTiming.cxx +++ b/graphics/EventDisplayFilters/src/FilterUsingMBTSTiming.cxx @@ -24,7 +24,7 @@ StatusCode FilterUsingMBTSTiming::initialize() //Get tile identifier helper if (detStore()->retrieve(m_tileTBID).isFailure()){ - msg(MSG::ERROR) << "Unable to retrieve TileTBID helper" << endreq; + msg(MSG::ERROR) << "Unable to retrieve TileTBID helper" << endmsg; return StatusCode::FAILURE; } @@ -38,7 +38,7 @@ StatusCode FilterUsingMBTSTiming::execute() //Retrieve container from StoreGate const TileCellContainer *tileCellCnt = NULL; if (evtStore()->retrieve(tileCellCnt, m_mbtsContainerName).isFailure()) { - msg(MSG::WARNING) << "Unable to retrieving MBTS container with name " << m_mbtsContainerName << endreq; + msg(MSG::WARNING) << "Unable to retrieving MBTS container with name " << m_mbtsContainerName << endmsg; return StatusCode::SUCCESS; } @@ -58,7 +58,7 @@ StatusCode FilterUsingMBTSTiming::execute() msg(MSG::DEBUG) << "Energy = " << (*MBTSCellItr)->energy() << " pC\t"; msg(MSG::DEBUG) << "Time = " << (*MBTSCellItr)->time() << " ns\t"; - msg(MSG::DEBUG) << "Side = " << (( m_tileTBID->type((*MBTSCellItr)->ID()) > 0 ) ? "A" : "C") << endreq; + msg(MSG::DEBUG) << "Side = " << (( m_tileTBID->type((*MBTSCellItr)->ID()) > 0 ) ? "A" : "C") << endmsg; // cache type, module and channel // MBTS Id type is "side" +/- 1 @@ -73,23 +73,23 @@ StatusCode FilterUsingMBTSTiming::execute() //Make sure we have a least n hits on each side if ( countA < 1 || countC < 1 ){ - msg(MSG::INFO) << "Need at least one hit on each side" << endreq; + msg(MSG::INFO) << "Need at least one hit on each side" << endmsg; setFilterPassed(false); - msg(MSG::INFO ) << "Event is rejected" << endreq; + msg(MSG::INFO ) << "Event is rejected" << endmsg; return StatusCode::SUCCESS; } // Calculate the time difference float timeDiff = fabs(timeA/countA - timeC/countC); - msg(MSG::INFO) << "Calculated time difference of " << timeDiff << " ns" << endreq; + msg(MSG::INFO) << "Calculated time difference of " << timeDiff << " ns" << endmsg; //And cut if (timeDiff <= m_maxTimeDifference) { setFilterPassed(true); - msg(MSG::INFO ) << "Event is accepted" << endreq; + msg(MSG::INFO ) << "Event is accepted" << endmsg; } else { setFilterPassed(false); - msg(MSG::INFO ) << "Event is rejected" << endreq; + msg(MSG::INFO ) << "Event is rejected" << endmsg; } return StatusCode::SUCCESS; diff --git a/graphics/EventDisplayFilters/src/FilterUsingSpacePoints.cxx b/graphics/EventDisplayFilters/src/FilterUsingSpacePoints.cxx index 5faef87bf8f..37e70fb3576 100644 --- a/graphics/EventDisplayFilters/src/FilterUsingSpacePoints.cxx +++ b/graphics/EventDisplayFilters/src/FilterUsingSpacePoints.cxx @@ -23,10 +23,10 @@ StatusCode FilterUsingSpacePoints::initialize() { MsgStream log(msgSvc(), name()); StatusCode sc; - log << MSG::INFO << "Initializing " << name() << endreq; + log << MSG::INFO << "Initializing " << name() << endmsg; sc = service( "StoreGateSvc", m_eventStore); if( sc.isFailure() ) { - log << MSG::FATAL << name() << ": Unable to locate Service StoreGateSvc" << endreq; + log << MSG::FATAL << name() << ": Unable to locate Service StoreGateSvc" << endmsg; return sc; } @@ -41,7 +41,7 @@ StatusCode FilterUsingSpacePoints::execute() const SpacePointContainer* m_SpacePointContainer; if ( m_eventStore->retrieve(m_SpacePointContainer, m_SpacePointContainerName).isFailure() ){ - log << MSG::INFO << "Unable to retrieve SpacePoint container with name " << m_SpacePointContainerName << endreq; + log << MSG::INFO << "Unable to retrieve SpacePoint container with name " << m_SpacePointContainerName << endmsg; return StatusCode::FAILURE; } @@ -55,15 +55,15 @@ StatusCode FilterUsingSpacePoints::execute() //be verbose - log << MSG::DEBUG << "Number of SpacePoints is " << NSpacePoints << endreq; + log << MSG::DEBUG << "Number of SpacePoints is " << NSpacePoints << endmsg; //And cut if (NSpacePoints >= m_SpacePoints_required) { setFilterPassed(true); - log << MSG::INFO << "Event is accepted" << endreq; + log << MSG::INFO << "Event is accepted" << endmsg; } else { setFilterPassed(false); - log << MSG::INFO << "Event is rejected" << endreq; + log << MSG::INFO << "Event is rejected" << endmsg; } return StatusCode::SUCCESS; diff --git a/graphics/GeometryJiveXML/src/GeometryWriter.cxx b/graphics/GeometryJiveXML/src/GeometryWriter.cxx index 2725f3ea4a4..4efbc3990f4 100755 --- a/graphics/GeometryJiveXML/src/GeometryWriter.cxx +++ b/graphics/GeometryJiveXML/src/GeometryWriter.cxx @@ -37,42 +37,42 @@ namespace JiveXML { StatusCode GeometryWriter::writeGeometry() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "writeGeometry()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "writeGeometry()" << endmsg; std::ofstream outputFile("AGeometry.xml"); writeHeader(outputFile); if ( detStore()->retrieve(m_pixel_manager, "Pixel").isFailure() ){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::PixelDetectorManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::PixelDetectorManager" << endmsg; } else { if (detStore()->retrieve(m_pixelIdHelper, "PixelID").isFailure() ){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve PixelIDHelper" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve PixelIDHelper" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved PixelIDHelper" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved PixelIDHelper" << endmsg; writePixelGeometry(outputFile); } } if ( detStore()->retrieve(m_silicon_manager, "SCT").isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::SCT_DetectorManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::SCT_DetectorManager" << endmsg; } else { if (detStore()->retrieve(m_sctIdHelper, "SCT_ID").isFailure() ){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SCT_IDHelper" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve SCT_IDHelper" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved SCT_IDHelper" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved SCT_IDHelper" << endmsg; writeSCTGeometry(outputFile); } } if ( detStore()->retrieve(m_trt_manager, "TRT").isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::TRT_DetectorManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve InDetDD::TRT_DetectorManager" << endmsg; } else { // No SGKey ? As in graphics/VP1/VP1Systems/VP12DGeometrySystems/StoreGateGeometryReader // if (detStore()->retrieve(m_trtIdHelper, "TRT_ID").isFailure() ){ if (detStore()->retrieve(m_trtIdHelper, "").isFailure() ){ - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve TRT_IDHelper" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve TRT_IDHelper" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved TRT_IDHelper" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved TRT_IDHelper" << endmsg; writeTRTGeometry(outputFile); } } @@ -80,9 +80,9 @@ namespace JiveXML { writeSolenoidGeometry(outputFile); if ( detStore()->retrieve(m_calo_manager, "CaloMgr").isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve CaloDetDescrManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve CaloDetDescrManager" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved CaloDetDescrManager" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved CaloDetDescrManager" << endmsg; // Hardcoded LAr zMin, zMax, rMin, rMax m_larMin.reserve(m_numCaloTypes); m_larMax.reserve(m_numCaloTypes); @@ -114,16 +114,16 @@ namespace JiveXML { } if ( detStore()->retrieve(m_tile_manager, "Tile").isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve TileDetDescrManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve TileDetDescrManager" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved TileDetDescrManager" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved TileDetDescrManager" << endmsg; writeTILEGeometry(outputFile); } if ( detStore()->retrieve(m_lar_manager, "LArMgr").isFailure() ) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve LArDetectorManager" << endreq; + if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << "Could not retrieve LArDetectorManager" << endmsg; } else { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved LArDetectorManager" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved LArDetectorManager" << endmsg; // temporarily disable writting MBTS geometry. Non-trivial migration CLHEP->Eigen // jpt 19Dec13 /* writeMBTSGeometry(outputFile); @@ -317,7 +317,7 @@ namespace JiveXML { << " zMin=\"" << -zMax/10. << "\"" << " zMax=\"" << zMax/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Pixel barrel out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Pixel barrel out: " << out << endmsg; } if (element->isEndcap() && element->zMin() > 0 && m_pixelIdHelper->phi_module(element->identify()) == 0 @@ -353,7 +353,7 @@ namespace JiveXML { << " zMin=\"" << zMin/10. << "\"" << " zMax=\"" << zMax/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Pixel endcap out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Pixel endcap out: " << out << endmsg; } } } @@ -406,7 +406,7 @@ namespace JiveXML { << " zMin=\"" << -zMax/10. << "\"" << " zMax=\"" << zMax/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "SCT barrel out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "SCT barrel out: " << out << endmsg; } if (element->isEndcap() && element->zMin() > 0 && m_sctIdHelper->phi_module(element->identify()) == 0 @@ -452,7 +452,7 @@ namespace JiveXML { << " zMin=\"" << zMin/10. << "\"" << " zMax=\"" << zMax/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "SCT endcap out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "SCT endcap out: " << out << endmsg; } } } @@ -503,7 +503,7 @@ namespace JiveXML { << " zMin=\"" << -(posIn.z() + elementIn->strawLength()/2.)/10. << "\"" << " zMax=\"" << (posIn.z() + elementIn->strawLength()/2.)/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRT barrel out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRT barrel out: " << out << endmsg; } else { elementOut = m_trt_manager->getEndcapElement(1,//m_trtIdHelper->barrel_ec(id), m_trtIdHelper->layer_or_wheel(id), @@ -528,7 +528,7 @@ namespace JiveXML { << " zMin=\"" << posIn.z()/10. << "\"" << " zMax=\"" << posOut.z()/10. << "\"" << " />" << std::endl; - //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRT endcap out: " << out << endreq; + //if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "TRT endcap out: " << out << endmsg; } } diff --git a/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx b/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx index 72dbe46d669..c0f5d332e8d 100755 --- a/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx +++ b/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx @@ -22,13 +22,13 @@ namespace JiveXML { StatusCode MuonGeometryWriter::writeGeometry() { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "writeGeometry()" << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "writeGeometry()" << endmsg; std::ofstream outputFile("AMuonGeometry.xml"); writeHeader(outputFile); if ( detStore()->retrieve(m_muon_manager).isFailure() ) { - if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not retrieve MuonGM::MuonDetectorManager" << endreq; + if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not retrieve MuonGM::MuonDetectorManager" << endmsg; m_muon_manager = 0; return StatusCode::FAILURE; } else { @@ -103,7 +103,7 @@ namespace JiveXML { const MdtIdHelper *mdtIdHelper = m_muon_manager->mdtIdHelper(); int snMax = mdtIdHelper->stationNameIndexMax(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station types: " << snMax << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station types: " << snMax << endmsg; // Loop over all station types. for (int sn=0; sn<=snMax; sn++) { @@ -159,7 +159,7 @@ namespace JiveXML { if (station) stations->push_back(station); } - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station size: " << stations->size() << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station size: " << stations->size() << endmsg; // While there are stations that haven't been written to XML, stay in this loop. while (stations->size() > 0) { @@ -221,7 +221,7 @@ namespace JiveXML { // to-be-processed list. phiString += " " + DataType(phi2).toString(); - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " phiString " << phiString << endreq; + if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " phiString " << phiString << endmsg; stations->erase(it, it+1); } -- GitLab