From 1e50e2e686f2a15b66745608fc90f523b47ebd90 Mon Sep 17 00:00:00 2001 From: Susumu Oda <susumu.oda@cern.ch> Date: Tue, 11 Jun 2019 13:06:02 +0000 Subject: [PATCH] Remove print from SCT_ConditionsAlgorithms package. --- .../SCT_ConditionsAlgorithms/share/testBSError.py | 8 ++++++-- .../SCT_ConditionsAlgorithms/share/testCalibChipRead.py | 9 +++++++-- .../SCT_ConditionsAlgorithms/share/testCalibRead.py | 9 +++++++-- .../SCT_ConditionsAlgorithms/share/testConfig.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testDCSConditions.py | 8 ++++++-- .../SCT_ConditionsAlgorithms/share/testLinkMasking.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testMajority.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testModuleVeto.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testParameters.py | 9 +++++++-- .../SCT_ConditionsAlgorithms/share/testReadout.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testRodVeto.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testSensors.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testSilicon.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testStripVeto.py | 7 ++++++- .../SCT_ConditionsAlgorithms/share/testSummary.py | 9 +++++++-- .../SCT_ConditionsAlgorithms/share/testTdaqEnabled.py | 7 ++++++- 16 files changed, 100 insertions(+), 22 deletions(-) diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testBSError.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testBSError.py index dcce22f4d8b..6dba942c005 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testBSError.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testBSError.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testBSError") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup @@ -107,4 +112,3 @@ ServiceMgr.EventSelector.InputCollections = athenaCommonFlags.FilesInput.get_Val theApp.EvtMax = -1 ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M" - diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py index 5a405d4c1da..72db937400b 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibChipRead.py @@ -1,7 +1,12 @@ ################################################################################ -# Job options file to test the ReadCalibDataSvc +# Job options file to test the ReadCalibDataTool ################################################################################ +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testCalibChipRead") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -44,7 +49,7 @@ globalflags.ConditionsTag="COMCOND-BLKPA-RUN1-09" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set up conditions diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibRead.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibRead.py index 96dca38500c..d25c93ffb44 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibRead.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testCalibRead.py @@ -1,7 +1,12 @@ ################################################################################ -# Job options file to test the ReadCalibDataSvc +# Job options file to test the ReadCalibDataTool ################################################################################ +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testCalibRead") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -54,7 +59,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py index f80250768be..aa7705afcc3 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testConfig.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testConfig") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion = "ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testDCSConditions.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testDCSConditions.py index 0889b293a30..887011c2280 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testDCSConditions.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testDCSConditions.py @@ -4,6 +4,11 @@ # #============================================================== +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testDCSConditions") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Standard includes #-------------------------------------------------------------- @@ -39,8 +44,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags - +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testLinkMasking.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testLinkMasking.py index aacff0aa334..4a2404dc5f2 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testLinkMasking.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testLinkMasking.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testLinkMasking") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -31,7 +36,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMajority.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMajority.py index 92cfe1aeb23..c749b4d6173 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMajority.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMajority.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testMajority") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testModuleVeto.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testModuleVeto.py index 9927f93157b..a39c05dc7be 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testModuleVeto.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testModuleVeto.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testModuleVeto") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py index f1c7833ae13..3db839a88a9 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testParameters.py @@ -1,9 +1,14 @@ ############################################################### # -# Job options file to test DCS conditions tool +# Job options file to test conditions parameters tool # #============================================================== +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testParameters") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Standard includes #-------------------------------------------------------------- @@ -40,7 +45,7 @@ globalflags.ConditionsTag="COMCOND-BLKPA-RUN1-09" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) from RecExConfig.RecFlags import rec rec.projectName.set_Value_and_Lock("data12_8TeV") diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py index 491f5ae1c59..4da660eb533 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testReadout") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testRodVeto.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testRodVeto.py index 45fae2f58c1..ad65727fede 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testRodVeto.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testRodVeto.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testRodVeto") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -31,7 +36,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py index 0449507c005..1b4f7720c55 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSensors.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testSensors") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -32,7 +37,7 @@ globalflags.ConditionsTag="COMCOND-BLKPA-RUN1-09" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set up conditions diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSilicon.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSilicon.py index df50c9af434..64c992f2590 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSilicon.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSilicon.py @@ -2,6 +2,11 @@ useDB=True import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testSilicon") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -31,7 +36,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testStripVeto.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testStripVeto.py index f16c960a454..8bb8b109f94 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testStripVeto.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testStripVeto.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testStripVeto") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="geant4" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSummary.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSummary.py index 16ed95ddbef..481a61be5ea 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSummary.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testSummary.py @@ -1,5 +1,10 @@ import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testSummary") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -29,7 +34,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2015-03-01-00" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print globalflags +msg.info(globalflags) #-------------------------------------------------------------- # Set Detector setup @@ -74,7 +79,7 @@ job = AlgSequence() IOVDbSvc = Service("IOVDbSvc") from IOVDbSvc.CondDB import conddb IOVDbSvc.GlobalTag="CONDBR2-BLKPA-2017-06" -print "conddb.dbdata", conddb.dbdata +msg.info("conddb.dbdata", conddb.dbdata) IOVDbSvc.OutputLevel = 3 from SCT_ConditionsTools.SCT_TdaqEnabledToolSetup import SCT_TdaqEnabledToolSetup diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py index 953f741a972..044eafd34f3 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py @@ -9,6 +9,11 @@ #-------------------------------------------------------------- import AthenaCommon.AtlasUnixStandardJob +# Setup logger +from AthenaCommon.Logging import logging +msg = logging.getLogger("testTdaqEnabled") +msg.setLevel(logging.INFO) + #-------------------------------------------------------------- # Thread-specific setup #-------------------------------------------------------------- @@ -41,7 +46,7 @@ globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01" globalflags.DetGeo="atlas" globalflags.InputFormat="pool" globalflags.DataSource="data" -print 'globalTags.DatabaseInstance', globalflags.DatabaseInstance +msg.info(globalflags) #-------------------------------------------------------------- -- GitLab