Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix DBG IBs warnings about EDM_ML_DEBUG redefined #34180

Merged
merged 2 commits into from
Jun 21, 2021
Merged

fix DBG IBs warnings about EDM_ML_DEBUG redefined #34180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50803b2
fix DBG IBs warnings about EDM_ML_DEBUG redefined
smuzaffar Jun 18, 2021
3e39408
updated ref log files
smuzaffar Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@
#include "TH2.h"
#include "TTree.h"

#define EDM_ML_DEBUG

namespace HcalMinbias {}

// constructors and destructor
Expand Down
2 changes: 0 additions & 2 deletions Calibration/HcalCalibAlgos/test/HcalIsoTrackStudy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@

#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"

#define EDM_ML_DEBUG

class HcalIsoTrackStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one::SharedResources> {
public:
explicit HcalIsoTrackStudy(edm::ParameterSet const&);
Expand Down
2 changes: 0 additions & 2 deletions DetectorDescription/DDCMS/plugins/dd4hep/DDDefinitions2Objects.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#include <unordered_map>
#include <utility>

#define EDM_ML_DEBUG

using namespace std;
using namespace dd4hep;
using namespace cms;
Expand Down
2 changes: 2 additions & 0 deletions FWCore/MessageService/test/UnitTestClient_Ad.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifndef EDM_ML_DEBUG
#define EDM_ML_DEBUG
#endif

#include "FWCore/MessageService/test/UnitTestClient_Ad.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down
2 changes: 2 additions & 0 deletions FWCore/MessageService/test/UnitTestClient_Hd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifndef EDM_ML_DEBUG
#define EDM_ML_DEBUG
#endif

#include "FWCore/MessageService/test/UnitTestClient_Hd.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down
2 changes: 2 additions & 0 deletions FWCore/MessageService/test/UnitTestClient_Nd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifndef EDM_ML_DEBUG
#define EDM_ML_DEBUG
#endif

#ifndef FWCore_MessageService_test_UnitTestClient_Nd_h
#define FWCore_MessageService_test_UnitTestClient_Nd_h
Expand Down
2 changes: 2 additions & 0 deletions FWCore/MessageService/test/UnitTestClient_Vd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifndef EDM_ML_DEBUG
#define EDM_ML_DEBUG
#endif

#include "FWCore/MessageService/test/UnitTestClient_Vd.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down
2 changes: 2 additions & 0 deletions FWCore/MessageService/test/standAloneTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifndef EDM_ML_DEBUG
#define EDM_ML_DEBUG
#endif
#include "FWCore/MessageLogger/interface/MessageLogger.h"

namespace edmtest {
Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/standAloneWithMessageLogger.cerr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ LogProblem was used to send cat_A
LogProblem was used to send cat_B
threshold DEBUG
%MSG-d cat_A:
standAloneTest.cpp:7
standAloneTest.cpp:9

%MSG
%MSG-d cat_A:
standAloneTest.cpp:8
standAloneTest.cpp:10
LogDebug.log was called
%MSG
%MSG-d cat_A:
standAloneTest.cpp:9
standAloneTest.cpp:11
LogDebug was used to send cat_A
%MSG
%MSG-d cat_B:
standAloneTest.cpp:10
standAloneTest.cpp:12
LogDebug was used to send cat_B
%MSG
LogTrace was used to send cat_A
Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/u13d_debugs.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
LogTrace was used to send this message
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:18
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:20
LogDebug was used to send this other message
%MSG
IfLogTrace was used to send this message
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:21
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:23
IfLogDebug was used to send this other message
%MSG
LogVerbatim was used to send this message
%MSG-i cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1
LogInfo was used to send this other message
%MSG
LogTrace was used to send this message
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:18
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:20
LogDebug was used to send this other message
%MSG
IfLogTrace was used to send this message
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:21
%MSG-d cat_B: UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:23
IfLogDebug was used to send this other message
%MSG
LogVerbatim was used to send this message
Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/u16_altDebugs.mmlog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp}
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:18
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:20
LogDebug was used to send this message
%MSG
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:19
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:21
LogDebug was used to send this other message
%MSG
%MSG-e cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1
Expand All @@ -24,10 +24,10 @@ LogInfo was used to send this message
LogInfo was used to send this other message
%MSG
Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp}
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:18
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:20
LogDebug was used to send this message
%MSG
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:19
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:21
LogDebug was used to send this other message
%MSG
%MSG-e cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2
Expand Down
8 changes: 4 additions & 4 deletions FWCore/MessageService/test/unit_test_outputs/u1d_debugs.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp}
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:18
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:20
LogDebug was used to send this message
%MSG
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:19
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:21
LogDebug was used to send this other message
%MSG
%MSG-e cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1
Expand All @@ -24,10 +24,10 @@ LogInfo was used to send this message
LogInfo was used to send this other message
%MSG
Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp}
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:18
%MSG-d cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:20
LogDebug was used to send this message
%MSG
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:19
%MSG-d cat_B: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:21
LogDebug was used to send this other message
%MSG
%MSG-e cat_A: UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2
Expand Down
10 changes: 5 additions & 5 deletions FWCore/MessageService/test/unit_test_outputs/u33d_all.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ T1 beginJob warning with identifier 11 event 0
%MSG-w cat_BJ: UTC_Vd1:ssm_1b@beginJob pre-events
T1 beginJob warning with identifier 12 event 0
%MSG
%MSG-d cat_BJ: UTC_Vd1:ssm_1b@beginJob pre-events UnitTestClient_Vd.cc:26
%MSG-d cat_BJ: UTC_Vd1:ssm_1b@beginJob pre-events UnitTestClient_Vd.cc:28
T1 beginJob debug with identifier 12 event 0
%MSG
%MSG-i cat_BR: UTC_Vd1:ssm_1a@beginRun Run: 1
Expand All @@ -13,7 +13,7 @@ T1 beginRun info with identifier 11 event 0
%MSG-i cat_BR: UTC_Vd1:ssm_1b@beginRun Run: 1
T1 beginRun info with identifier 12 event 0
%MSG
%MSG-d cat_BJ: UTC_Vd1:ssm_1b@beginRun Run: 1 UnitTestClient_Vd.cc:31
%MSG-d cat_BJ: UTC_Vd1:ssm_1b@beginRun Run: 1 UnitTestClient_Vd.cc:33
T1 beginRun debug with identifier 12 event 0
%MSG
%MSG-w cat_BL: UTC_Vd1:ssm_1a@beginLumi Run: 1 Lumi: 1
Expand All @@ -22,7 +22,7 @@ T1 beginLumi warning with identifier 11 event 0
%MSG-w cat_BL: UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1
T1 beginLumi warning with identifier 12 event 0
%MSG
%MSG-d cat_BL: UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1 UnitTestClient_Vd.cc:36
%MSG-d cat_BL: UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1 UnitTestClient_Vd.cc:38
T1 beginLumi debug with identifier 12 event 0
%MSG
Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp}
Expand Down Expand Up @@ -50,7 +50,7 @@ T1 analyze warning with identifier 12 event 0
%MSG-i cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 1
T1 analyze info with identifier 12 event 0
%MSG
%MSG-d cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 1 UnitTestClient_Vd.cc:20
%MSG-d cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 1 UnitTestClient_Vd.cc:22
T1 analyze debug with identifier 12 event 0
%MSG
%MSG-e cat_A: UTC_Vd2:ssm_2b Run: 1 Event: 1
Expand Down Expand Up @@ -87,7 +87,7 @@ T1 analyze warning with identifier 12 event 1
%MSG-i cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 2
T1 analyze info with identifier 12 event 1
%MSG
%MSG-d cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 2 UnitTestClient_Vd.cc:20
%MSG-d cat_A: UTC_Vd1:ssm_1b Run: 1 Event: 2 UnitTestClient_Vd.cc:22
T1 analyze debug with identifier 12 event 1
%MSG
%MSG-e cat_A: UTC_Vd2:ssm_2b Run: 1 Event: 2
Expand Down
1 change: 0 additions & 1 deletion Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDAlgorithmFactory.h"

#define EDM_ML_DEBUG
using namespace angle_units::operators;

class DDHCalTestBeamAlgo : public DDAlgorithm {
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HcalCommonData/test/HcalRecNumberingTester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"

#define EDM_ML_DEBUG

class HcalRecNumberingTester : public edm::one::EDAnalyzer<> {
public:
explicit HcalRecNumberingTester(const edm::ParameterSet&);
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HcalTestBeamData/plugins/HcalTB02ParametersESModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

#include <memory>

#define EDM_ML_DEBUG

class HcalTB02ParametersESModule : public edm::ESProducer {
public:
HcalTB02ParametersESModule(const edm::ParameterSet&);
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HcalTestBeamData/plugins/HcalTB06BeamParametersESModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

#include <memory>

#define EDM_ML_DEBUG

class HcalTB06ParametersESModule : public edm::ESProducer {
public:
HcalTB06ParametersESModule(const edm::ParameterSet&);
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HcalTestBeamData/src/HcalTB02ParametersFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#include "FWCore/Utilities/interface/Exception.h"
#include "Geometry/HcalTestBeamData/interface/HcalTB02ParametersFromDD.h"

#define EDM_ML_DEBUG

bool HcalTB02ParametersFromDD::build(const DDCompactView* cpv, HcalTB02Parameters& php, const std::string& name) {
DDSpecificsMatchesValueFilter filter{DDValue("ReadOutName", name, 0)};
DDFilteredView fv(*cpv, filter);
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HcalTestBeamData/src/HcalTB06BeamParametersFromDD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#include "FWCore/Utilities/interface/Exception.h"
#include "Geometry/HcalTestBeamData/interface/HcalTB06BeamParametersFromDD.h"

#define EDM_ML_DEBUG

bool HcalTB06BeamParametersFromDD::build(const DDCompactView* cpv,
HcalTB06BeamParameters& php,
const std::string& name1,
Expand Down
2 changes: 0 additions & 2 deletions SimG4CMS/CherenkovAnalysis/plugins/CherenkovAnalysis.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ Description: <one line class summary>
#include "FWCore/ServiceRegistry/interface/Service.h"
#include <TH1F.h>

#define EDM_ML_DEBUG

class CherenkovAnalysis : public edm::EDAnalyzer {
public:
explicit CherenkovAnalysis(const edm::ParameterSet &);
Expand Down
2 changes: 0 additions & 2 deletions SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
#include <TH1F.h>
#include <TH1I.h>

#define EDM_ML_DEBUG

class XtalDedxAnalysis : public edm::EDAnalyzer {
public:
explicit XtalDedxAnalysis(const edm::ParameterSet &);
Expand Down
2 changes: 0 additions & 2 deletions SimG4CMS/ShowerLibraryProducer/test/AnalyzeTuples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ Description: <one line class summary>
#include "TH1F.h"
#include "TH1I.h"

#define EDM_ML_DEBUG

class AnalyzeTuples : public edm::one::EDAnalyzer<edm::one::SharedResources> {
public:
explicit AnalyzeTuples(const edm::ParameterSet&);
Expand Down
1 change: 0 additions & 1 deletion Validation/Geometry/src/MaterialBudget.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "DD4hep/Filter.h"

#include <iostream>
#define EDM_ML_DEBUG

MaterialBudget::MaterialBudget(const edm::ParameterSet& p) {
edm::ParameterSet m_p = p.getParameter<edm::ParameterSet>("MaterialBudget");
Expand Down