Skip to content
Snippets Groups Projects

Sweeping !36140 from 21.0 to master. Reverting the temporary special reference for HLTtau and restoring default trigger references

Merged Sweeping !36140 from 21.0 to master. Reverting the temporary special reference for HLTtau and restoring default trigger references
Merged Atlas Nightlybuild requested to merge cherry-pick-98bc47d477f-master into master
1 file
+ 23
23
Compare changes
  • Side-by-side
  • Inline
######################################################################
# file collisions.config Tue Apr 10 16:50:08 2018 elasimak
# file collisions.config
######################################################################
#######################
@@ -1369,7 +1369,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
@@ -1377,7 +1377,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
@@ -1385,7 +1385,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
@@ -14273,7 +14273,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/1p_nonCorrected
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir mp_nonCorrected {
@@ -14281,7 +14281,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/mp_nonCorrected
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
}
@@ -14313,7 +14313,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/1p_nonCorrected
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir mp_nonCorrected {
@@ -14321,7 +14321,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/mp_nonCorrected
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
}
@@ -14363,7 +14363,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1VsOffline
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir PreselectionTau {
@@ -14401,7 +14401,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist_loose
output = HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/TurnOnCurves/RecoEfficiency
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
}
@@ -16497,7 +16497,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist
output = HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
@@ -16505,7 +16505,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist
output = HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
@@ -16513,7 +16513,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist
output = HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
@@ -16745,7 +16745,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist
output = HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/TurnOnCurves
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
}
@@ -16963,7 +16963,7 @@ dir HLT {
algorithm = TAU_HistKolmogorovTest_MaxDist
output = HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/TurnOnCurves
display = StatBox
reference = HLT_TauTrigger_MainReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
}
}
}
@@ -16994,15 +16994,15 @@ dir HLT {
algorithm HLT_TAU_Histogram_Not_Empty&GatherData {
libname = libdqm_algorithms.so
name = HLT_TAU_Histogram_Not_Empty&GatherData
# reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
# reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
}
compositeAlgorithm HLT_TAU_Histogram_Not_Empty&GatherData {
subalgs = GatherData,Histogram_Not_Empty
libnames = libdqm_algorithms.so
# reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
# reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
}
algorithm TAU_HistKolmogorovTest_MaxDist {
@@ -17010,8 +17010,8 @@ algorithm TAU_HistKolmogorovTest_MaxDist {
name = KolmogorovTest_MaxDist
thresholds = TAU_HistKolmogorovTest_MaxDist_Threshold
MinStat = -1
# reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
# reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
}
algorithm TAU_HistKolmogorovTest_MaxDist_loose {
@@ -17019,8 +17019,8 @@ algorithm TAU_HistKolmogorovTest_MaxDist_loose {
name = KolmogorovTest_MaxDist
thresholds = TAU_HistKolmogorovTest_MaxDist_Threshold_loose
MinStat = -1
# reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
# reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
}
###############
Loading