From 9503dba8d02ca4931384f3313ac1c57b223e9571 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Tue, 21 Jul 2020 03:28:05 +0200
Subject: [PATCH] Fix DataQualityConfigurations ART test; fix small issues in
han configurations that caused warnings
---
.../config/Global/heavyions_run.config | 18 +++++------
.../config/HLT/HLTtau/collisions_run.config | 2 ++
.../config/L1Calo/collisions_run.config | 31 ++-----------------
.../config/L1Calo/cosmics_run.config | 17 ++--------
.../config/L1Calo/heavyions_run.config | 6 +---
.../config/TGC/collisions_run.config | 2 ++
.../config/Tile/collisions_run.config | 1 +
.../config/Tile/cosmics_run.config | 1 +
.../config/Tile/heavyions_run.config | 1 +
.../config/common/collisions_run.config | 5 +--
.../config/common/cosmics_run.config | 5 +--
.../config/common/heavyions_run.config | 9 ++----
.../DataQualityInterfaces/src/HanConfig.cxx | 28 ++++++++++-------
Tools/AthDataQuality/test/test_dqconfig.sh | 23 ++------------
14 files changed, 47 insertions(+), 102 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Global/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/Global/heavyions_run.config
index ad0814db376..1a2c6d9ff9d 100644
--- a/DataQuality/DataQualityConfigurations/config/Global/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Global/heavyions_run.config
@@ -76,7 +76,7 @@ dir GLOBAL {
algorithm = GLOBAL_GatherData/ref
dir Luminosity {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir AnyTrigger {
output = Global/Luminosity/AnyTrigger
hist aveMu_vs_LB {
@@ -595,7 +595,7 @@ dir GLOBAL {
# }
# }
dir DQTCaloCluster {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir DQTCaloCluster {
output = Global/CaloCluster
hist all_in_dir {
@@ -603,7 +603,7 @@ dir GLOBAL {
}
}
dir DQTGlobalWZFinder {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir DQTGlobalWZFinder {
output = Global/WZFinder
hist all_in_dir {
@@ -641,7 +641,7 @@ dir GLOBAL {
}
}
dir DQTMuonIDTrack {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir Trk {
output = Global/MuonInnerDetector
hist all_in_dir {
@@ -729,7 +729,7 @@ dir GLOBAL {
}
}
dir DQTRateMonTool {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir DQTRateMonTool {
output = Global/DQShift
hist e_gm_presence {
@@ -762,7 +762,7 @@ dir GLOBAL {
}
}
dir DQTSynch {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
dir BCID {
output = Global/Synchronization/BCID
hist m_diff_CTP_SCT_BCID {
@@ -1111,7 +1111,7 @@ dir GLOBAL {
}
dir DQTBackgroundMon {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
algorithm = BKG_GatherData/ref
dir BackgroundMon {
output = Global/Background
@@ -1187,7 +1187,7 @@ algorithm GLOBAL_GatherData {
libname = libdqm_algorithms.so
name = GatherData
algorithm ref {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
}
}
@@ -1195,7 +1195,7 @@ algorithm BKG_GatherData {
libname = libdqm_algorithms.so
name = GatherData
algorithm ref {
- reference = CentrallyManagedReferences
+ reference = CentrallyManagedReferences_HardProbes
}
}
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
index 70d314ca997..7683d833bd6 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
@@ -17050,6 +17050,7 @@ reference HLT_TauTrigger_ExpressReference {
file = data18_13TeV.00362661.express_express.merge.HIST.f993_h325._0001.1
path = run_362661
name = same_name
+ info = Run 362661, express_express
}
reference HLT_TauTrigger_MainReference {
@@ -17057,4 +17058,5 @@ reference HLT_TauTrigger_MainReference {
file = data18_13TeV.00362661.physics_Main.merge.HIST.f993_h325._0001.1
path = run_362661
name = same_name
+ info = Run 362661, physics_Main
}
diff --git a/DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config b/DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config
index a2b0be248cc..972a9051e51 100644
--- a/DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config
@@ -1,21 +1,3 @@
-# **********************************************************************
-# Id: collisions_run.config 752503 2016-06-03 15:56:33Z jfrost
-# ./common/collisions_run.config
-# **********************************************************************
-
-#############
-# Output
-#############
-
-output top_level {
- algorithm = WorstCaseSummary
-}
-
-# **********************************************************************
-# Id: collisions_run.config 748046 2016-05-18 14:03:03Z kwhalen
-# ./L1Calo/collisions_run.config
-# **********************************************************************
-
#############
# Output
#############
@@ -3640,7 +3622,6 @@ dir HLT {
dir L1Calo {
hist res_etVsEta@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/AbsResolutions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3650,7 +3631,6 @@ dir HLT {
dir L1Calo {
hist emClusVsEmIsol@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/Distributions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3660,7 +3640,6 @@ dir HLT {
dir L1Calo {
hist eff_et@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/Efficiency/L1Calo
}
@@ -3672,7 +3651,6 @@ dir HLT {
dir L1Calo {
hist emClusVsEmIsol@gsEM20VH {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM20VH/Distributions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3682,7 +3660,6 @@ dir HLT {
dir L1Calo {
hist eff_et@gsEM20VH {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM20VH/Efficiency/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3696,14 +3673,12 @@ dir HLT {
dir lowest_singletau {
dir TurnOnCurves {
hist TProfRecoL1PtEfficiency_shifter@gs {
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
algorithm = TAU_HistKolmogorovTest_MaxDist
display = StatBox
output = L1Calo/.GlobalSummary/TAU
description = Original location HLT/TRTAU/Shifter/lowest_singletau/TurnOnCurves
}
hist TProfRecoL1EtaEfficiency_shifter@gs {
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
algorithm = TAU_HistKolmogorovTest_MaxDist
display = StatBox
output = L1Calo/.GlobalSummary/TAU
@@ -3717,7 +3692,7 @@ dir HLT {
dir GLOBAL {
algorithm = GLOBAL_GatherData/ref
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
dir Luminosity {
dir AnyTrigger {
hist aveMu_vs_LB@gs {
@@ -3742,7 +3717,7 @@ dir GLOBAL {
dir L1Calo {
algorithm = L1Calo_GatherData
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
output = L1Calo
dir .GlobalSummary {
dir LumiRanges {
@@ -5744,7 +5719,7 @@ thresholds L1Calo_JetEfficiencies {
dir LVL1_Interfaces {
algorithm = LVL1Iface_GatherData
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
dir L1Topo {
hist l1topo_1d_CMXTobs {
output = L1Interfaces/L1Topo
diff --git a/DataQuality/DataQualityConfigurations/config/L1Calo/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/L1Calo/cosmics_run.config
index 6974d91e363..af64a912dc1 100644
--- a/DataQuality/DataQualityConfigurations/config/L1Calo/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/L1Calo/cosmics_run.config
@@ -1,7 +1,3 @@
-# **********************************************************************
-# $Id: cosmics_run.config 778796 2016-10-17 12:48:58Z jbarkelo $
-# **********************************************************************
-
#############
# Output
#############
@@ -3627,7 +3623,6 @@ dir HLT {
dir L1Calo {
hist res_etVsEta@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/AbsResolutions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3637,7 +3632,6 @@ dir HLT {
dir L1Calo {
hist emClusVsEmIsol@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/Distributions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3647,7 +3641,6 @@ dir HLT {
dir L1Calo {
hist eff_et@gsEM22VHI {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM22VHI/Efficiency/L1Calo
}
@@ -3659,7 +3652,6 @@ dir HLT {
dir L1Calo {
hist emClusVsEmIsol@gsEM20VH {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM20VH/Distributions/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3669,7 +3661,6 @@ dir HLT {
dir L1Calo {
hist eff_et@gsEM20VH {
display = StatBox
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
output = L1Calo/.GlobalSummary/EGamma
description = Original location HLT/TREG/Expert/L1_EM20VH/Efficiency/L1Calo. https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
}
@@ -3683,14 +3674,12 @@ dir HLT {
dir lowest_singletau {
dir TurnOnCurves {
hist TProfRecoL1PtEfficiency_shifter@gs {
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
algorithm = GatherData
display = StatBox
output = L1Calo/.GlobalSummary/TAU
description = Original location HLT/TRTAU/Shifter/lowest_singletau/TurnOnCurves
}
hist TProfRecoL1EtaEfficiency_shifter@gs {
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
algorithm = GatherData
display = StatBox
output = L1Calo/.GlobalSummary/TAU
@@ -3704,7 +3693,7 @@ dir HLT {
dir GLOBAL {
algorithm = GatherData
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
dir Luminosity {
dir AnyTrigger {
hist aveMu_vs_LB@gs {
@@ -3733,7 +3722,7 @@ dir GLOBAL {
dir L1Calo {
algorithm = L1Calo_GatherData
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
output = L1Calo
dir PPM {
dir SpareChannels {
@@ -5719,7 +5708,7 @@ thresholds L1Calo_JetEfficiencies {
dir LVL1_Interfaces {
algorithm = LVL1Iface_GatherData
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerMain
dir L1Topo {
hist l1topo_1d_CMXTobs {
output = L1Interfaces/L1Topo
diff --git a/DataQuality/DataQualityConfigurations/config/L1Calo/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/L1Calo/heavyions_run.config
index 8318f55c566..a66aded3423 100644
--- a/DataQuality/DataQualityConfigurations/config/L1Calo/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/L1Calo/heavyions_run.config
@@ -1,7 +1,3 @@
-# **********************************************************************
-# $Id: heavyions_run.config 778796 2016-10-17 12:48:58Z jbarkelo $
-# **********************************************************************
-
#############
# Output
#############
@@ -5734,7 +5730,7 @@ thresholds L1Calo_JetEfficiencies {
dir LVL1_Interfaces {
algorithm = LVL1Iface_GatherData
#reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
- reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;stream=physics_HardProbes:CentrallyManagedReferences_TriggerHardProbes;stream=physics_UPC:CentrallyManagedReferences_TriggerUPC;CentrallyManagedReferences_Trigger
+ reference = CentrallyManagedReferences_TriggerHardProbes
dir L1Topo {
hist l1topo_1d_CMXTobs {
output = L1Interfaces/L1Topo
diff --git a/DataQuality/DataQualityConfigurations/config/TGC/collisions_run.config b/DataQuality/DataQualityConfigurations/config/TGC/collisions_run.config
index dedb3230ac7..20bd3736fca 100644
--- a/DataQuality/DataQualityConfigurations/config/TGC/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/TGC/collisions_run.config
@@ -16,12 +16,14 @@ reference TGCShift2015thr_Ref {
file = data15_13TeV.00279813.express_express.merge.HIST.f628_h79._0001.1
path = run_279813
name = same_name
+ info = Run 279813, express_express
}
reference TGCShift2016thr_Ref {
location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
file = data16_13TeV.00304008.express_express.merge.HIST.f716_h151._0001.1
path = run_304008
name = same_name
+ info = Run 304008, express_express
}
#############
diff --git a/DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config
index 2b615a28aba..9d29a1ecabb 100644
--- a/DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Tile/collisions_run.config
@@ -40,6 +40,7 @@ reference TileReference {
file = data12_8TeV.00214160.express_express.merge.HIST.f486_m1252_harkusha_20150704._0001.1
path = run_214160
name = same_name
+ info = Run 214160, express_express
}
#############
diff --git a/DataQuality/DataQualityConfigurations/config/Tile/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/Tile/cosmics_run.config
index 1bc98e75c06..9440b3a35cc 100644
--- a/DataQuality/DataQualityConfigurations/config/Tile/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Tile/cosmics_run.config
@@ -31,6 +31,7 @@ reference TileReference {
file = data12_cos.00214303.express_express.merge.HIST.f487_m1252_harkusha_20141116._0001.1
path = run_214303
name = same_name
+ info = Run 214303, express_express
}
diff --git a/DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config
index 0925ff38e63..7f91ce916a8 100644
--- a/DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Tile/heavyions_run.config
@@ -39,6 +39,7 @@ reference TileReference {
file = data13_hip.00217999.express_express.merge.HIST.f514_m1291_harkusha_20151029._0001.1
path = run_217999
name = same_name
+ info = Run 217999, express_express
}
#############
diff --git a/DataQuality/DataQualityConfigurations/config/common/collisions_run.config b/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
index 77dd696f392..9da3e17599e 100644
--- a/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
@@ -1,7 +1,3 @@
-# **********************************************************************
-# $Id: collisions_run.config 778145 2016-10-12 22:16:13Z jfrost $
-# **********************************************************************
-
#######################
# References
#######################
@@ -127,4 +123,5 @@ compositeAlgorithm GatherData&Chi2NDF {
output top_level {
algorithm = WorstCaseSummary
+ reference = CentrallyManagedReferences
}
diff --git a/DataQuality/DataQualityConfigurations/config/common/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/common/cosmics_run.config
index a4d41029c33..3327a54eaed 100644
--- a/DataQuality/DataQualityConfigurations/config/common/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/common/cosmics_run.config
@@ -1,7 +1,3 @@
-# **********************************************************************
-# $Id$
-# **********************************************************************
-
#######################
# References
#######################
@@ -119,4 +115,5 @@ compositeAlgorithm GatherData&Chi2NDF {
output top_level {
algorithm = WorstCaseSummary
+ reference = CentrallyManagedReferences
}
diff --git a/DataQuality/DataQualityConfigurations/config/common/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/common/heavyions_run.config
index 0920c5e11ef..51be8d8f9ce 100644
--- a/DataQuality/DataQualityConfigurations/config/common/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/common/heavyions_run.config
@@ -1,7 +1,3 @@
-# **********************************************************************
-# $Id$
-# **********************************************************************
-
#######################
# References
#######################
@@ -38,7 +34,7 @@ reference CentrallyManagedReferences_TriggerMain {
name = same_name
}
-reference CentrallyManagedReference_UPC {
+reference CentrallyManagedReferences_UPC {
location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
file = data18_hi.00365678.physics_UPC.merge.HIST.f1022_h331._0001.1
path = run_365678
@@ -54,7 +50,7 @@ reference CentrallyManagedReferences_TriggerUPC {
name = same_name
}
-reference CentrallyManagedReference_HardProbes {
+reference CentrallyManagedReferences_HardProbes {
location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
file = data18_hi.00365678.physics_HardProbes.merge.HIST.f1021_h331._0001.1
path = run_365678
@@ -150,4 +146,5 @@ compositeAlgorithm GatherData&Chi2NDF {
output top_level {
algorithm = WorstCaseSummary
+ reference = CentrallyManagedReferences_HardProbes
}
diff --git a/DataQuality/DataQualityInterfaces/src/HanConfig.cxx b/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
index 050601694e4..3c2addf9f96 100644
--- a/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
@@ -340,10 +340,14 @@ Visit( const MiniConfigTreeNode* node ) const
if( fileName != "" && name != "" && name != "same_name" ) {
fileName = SplitReference(node->GetAttribute("location"), fileName);
std::string refInfo = node->GetAttribute("info");
+ if (refInfo == "") {
+ std::cerr << "INFO: Reference " << name << " is defined without an \"info\" attribute. Consider adding one"
+ << std::endl;
+ }
std::unique_ptr<TFile> infile( TFile::Open(fileName.c_str()) );
TKey* key = getObjKey( infile.get(), name );
if( key == 0 ) {
- std::cerr << "HanConfig::RefVisitor::Visit(): Reference not found: \"" << name << "\"\n";
+ std::cerr << "WARNING: HanConfig::RefVisitor::Visit(): Reference not found: \"" << name << "\"\n";
return;
}
// TDirectory* dir = ChangeOutputDir( m_outfile, name, m_directories );
@@ -495,6 +499,10 @@ GetAlgorithmConfiguration( HanConfigAssessor* dqpar, const std::string& algID,
std::string algRefName( m_refConfig.GetStringAttribute(thisRefID,"name") );
std::string algRefPath( m_refConfig.GetStringAttribute(thisRefID,"path") );
std::string algRefInfo( m_refConfig.GetStringAttribute(thisRefID,"info") );
+ if (algRefInfo == "") {
+ std::cerr << "INFO: Reference " << thisRefID << " is defined without an \"info\" attribute. Consider adding one"
+ << std::endl;
+ }
absAlgRefName = "";
if( algRefPath != "" ) {
absAlgRefName += algRefPath;
@@ -541,11 +549,9 @@ GetAlgorithmConfiguration( HanConfigAssessor* dqpar, const std::string& algID,
auto algRefFileostr = new TObjString(algRefFile.c_str());
m_refsourcedata->Add(new TObjString(newRefId.c_str()),
algRefFileostr);
- if (algRefInfo != "") {
- if (! m_refsourcedata->FindObject(algRefFile.c_str())) {
- m_refsourcedata->Add(algRefFileostr,
- new TObjString(algRefInfo.c_str()));
- }
+ if (! m_refsourcedata->FindObject(algRefFile.c_str())) {
+ m_refsourcedata->Add(algRefFileostr,
+ new TObjString(algRefInfo != "" ? algRefInfo.c_str() : "Reference"));
}
}
//std::cout<<"Writing algref with algrefname= "<<algRefUniqueName<<", newRefId="<<newRefId<<std::endl;
@@ -855,18 +861,18 @@ Visit( const MiniConfigTreeNode* node ) const
std::string regexflag(histNode->GetAttribute("regex"));
if (histNode->GetAttribute("regex") != "") {
- std::cerr << "all_in_dir and regex are incompatible; ignoring regex flag for " << histNode->GetPathName()
+ std::cerr << "WARNING: all_in_dir and regex are incompatible; ignoring regex flag for " << histNode->GetPathName()
<< "/all_in_dir" << std::endl;
}
std::string refID( histNode->GetAttribute("reference") );
if( refID == "" ) {
- std::cerr << "No \"reference\" defined for " << histNode->GetPathName() << "\n";
+ std::cerr << "WARNING: No \"reference\" defined for " << histNode->GetPathName() << "\n";
continue;
}
std::string refFile( m_refConfig.GetStringAttribute(refID,"file") );
if( refFile == "" ) {
- std::cerr << "No \"file\" defined for " << histNode->GetPathName() << "\n";
+ std::cerr << "WARNING: No \"file\" defined for " << histNode->GetPathName() << "\n";
continue;
}
@@ -889,7 +895,7 @@ Visit( const MiniConfigTreeNode* node ) const
refPathForSearch += "/dummyName";
basedir = ChangeInputDir( infile.get(), refPathForSearch );
if( basedir == 0 ) {
- std::cerr << "Cannot find \"" << refPath << "\" in file\n";
+ std::cerr << "INFO: Cannot find path \"" << refPath << "\" in reference file\n";
continue;
}
}
@@ -908,7 +914,7 @@ Visit( const MiniConfigTreeNode* node ) const
dir = ChangeInputDir( basedir, histNode->GetPathName() );
if( dir == 0 ) {
- std::cerr << "Cannot find \"" << absObjPath << "\" in file\n";
+ std::cerr << "INFO: Cannot find path \"" << absObjPath << "\" in reference file\n";
continue;
}
diff --git a/Tools/AthDataQuality/test/test_dqconfig.sh b/Tools/AthDataQuality/test/test_dqconfig.sh
index c0b57d28f60..f2fbee9d8c1 100755
--- a/Tools/AthDataQuality/test/test_dqconfig.sh
+++ b/Tools/AthDataQuality/test/test_dqconfig.sh
@@ -5,25 +5,6 @@
# art-ci: 21.0
# art-include: 21.0/AthDataQuality
-#Check the hcfg file for git hash
-check_hcfg_hash()
-{
- hcfg_file=$1
-
- grep -q "hash = $" /tmp/hcfg_out.txt
- if [ $? -eq 0 ]; then
- return 1
- fi
-}
-#check that the config file contains no histograms in top_level
-check_hcfg_top_level()
-{
- hcfg_file=$1
- grep -q "BEGIN ASSESSMENTS of \"top_level\"" /tmp/hcfg_out.txt
- if [ $? -eq 0 ]; then
- return 1
- fi
-}
#Run a test webdisplay of the new config
run_test_display()
{
@@ -41,7 +22,7 @@ run_test()
if [[ $hcfg_dir == "" ]]; then
echo hcfg path not found
echo Tests failed
- return 0
+ return 1
fi
cd $hcfg_dir
@@ -80,7 +61,7 @@ run_test()
fi
echo Tests passed
- return 1
+ return 0
}
run_test
--
GitLab