From 64c7dff1457fa94e9a7169439af29a7adddeb9c5 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Thu, 30 Mar 2017 19:19:09 +0000
Subject: [PATCH] Revert "Merge branch '21-updates' into '21.0'"
This reverts merge request !589
---
.../RegionSelector/doc/packagedoc.h | 124 -
.../python/NewRegSelSvcDefault.py | 4 -
.../RegionSelector/python/RegSelSvcDefault.py | 28 +-
.../RegionSelector/src/RegSelSvc.cxx | 11 +-
.../RegionSelector/src/RegSelectorHashMap.cxx | 4 +-
.../RegionSelector/src/RegSelectorMap.cxx | 4 +-
.../RegionSelector/src/obsolete.icc | 224 +-
.../FTK_RegionSelectorTable.h | 23 +-
.../InDetRegionSelectorLUT.h | 9 +-
.../SiRegionSelectorTable.h | 16 +-
.../TRT_RegionSelectorTable.h | 14 +-
.../InDetRegionSelector/doc/packagedoc.h | 68 -
.../InDetRegionSelectorTable_jobOptions.py | 19 +-
.../src/FTK_RegionSelectorTable.cxx | 93 +-
.../src/InDetRegionSelectorLUT.cxx | 35 +-
.../src/SiRegionSelectorTable.cxx | 63 +-
.../src/TRT_RegionSelectorTable.cxx | 47 +-
.../AnalysisConfig_Ntuple.h | 83 +-
.../T_AnalysisConfig_Tier0.h | 180 +-
.../TrigTestMonToolAC.h | 2 +-
.../TrigTestPhysValMon.h | 4 +-
.../src/AnalysisConfig_Ntuple.cxx | 390 +-
.../src/TrigTestBase.cxx | 107 +-
.../src/TrigTestMonToolAC.cxx | 54 +-
.../Analysis/src/ConfAnalysis.cxx | 82 +-
.../Analysis/src/ConfAnalysis.h | 9 +-
.../Analysis/src/Makefile | 21 +-
.../Analysis/src/chainparser.cxx | 398 --
.../Analysis/src/chains.cxx | 6 -
.../Analysis/src/comparitor.cxx | 326 +-
.../Analysis/src/computils.cxx | 71 -
.../Analysis/src/computils.h | 73 +-
.../Analysis/src/cpucost.cxx | 84 +-
.../Analysis/src/globals.cxx | 33 -
.../Analysis/src/globals.h | 43 -
.../Analysis/src/lumiParser.h | 8 -
.../Analysis/src/rmain.cxx | 113 +-
.../TrigInDetAnalysisUser/CMakeLists.txt | 17 +-
.../Readcards/src/ReadCards.cxx | 2 +-
.../Resplot/src/Resplot.cxx | 44 +-
.../Resplot/src/Resplot.h | 6 -
.../TrigInDetAnalysisUser/cmt/requirements | 13 +-
.../TrigInDetAnalysisUser/scripts/TIDApost.sh | 14 -
.../TrigInDetAnalysisUser/scripts/TIDArun.sh | 72 +-
.../share/TIDAdata11-rtt-offline.dat | 4 +-
.../share/TIDAhistos-vtx.dat | 46 -
.../Associator_TruthMatch.h | 2 +-
.../OfflineObjectSelection.h | 4 +-
.../TrigInDetAnalysisUtils/T_AnalysisConfig.h | 51 +-
.../src/OfflineObjectSelection.cxx | 36 +-
.../TrigIDtrkMonitoring/HLTIDZeeTagProbe.h | 4 +-
.../python/TrigIDPhysValMonitoringConfig.py | 26 +-
.../python/TrigIDtrkMonitoringConfig.py | 14 +-
.../src/HLTIDZeeTagProbe.cxx | 4 +-
...TrigInDetValidation_FTK_beamspot_ttbar.xml | 20 +-
.../TrigInDetValidation_FTK_bjet_ttbar.xml | 36 +-
.../TrigInDetValidation_FTK_mu_tautau.xml | 37 +-
.../TrigInDetValidation_FTK_mu_ttbar.xml | 69 +-
.../TrigInDetValidation_FTK_tau_tautau.xml | 37 +-
...InDetValidation_TestConfiguration_main.xml | 54 +-
.../TrigInDetValidation_all_ttbar_pu40.xml | 189 -
.../TrigInDetValidation_all_ttbar_pu46.xml | 152 +-
.../TrigInDetValidation_all_ttbar_pu80.xml | 189 -
.../TIDAbuild/TrigInDetValidation_aux.xml | 6 +-
...rigInDetValidation_beamspot_ttbar_pu46.xml | 2 +
.../TIDAbuild/TrigInDetValidation_bjet.xml | 37 +-
.../TrigInDetValidation_bjet_IBL_pu40.xml | 37 +-
...gInDetValidation_bjet_IBL_pu40_offline.xml | 53 +-
...InDetValidation_bjet_IBL_pu40_splitZ10.xml | 80 -
...InDetValidation_bjet_IBL_pu40_splitZ15.xml | 80 -
...gInDetValidation_bjet_IBL_pu40_splitZ5.xml | 80 -
...nDetValidation_bjet_IBL_pu40_splitZ7_5.xml | 80 -
...igInDetValidation_bjet_IBL_pu40_super1.xml | 82 -
...igInDetValidation_bjet_IBL_pu40_super2.xml | 82 -
...igInDetValidation_bjet_IBL_pu40_super3.xml | 82 -
...igInDetValidation_bjet_IBL_pu40_super4.xml | 82 -
...TrigInDetValidation_bjet_IBL_pu40_test.xml | 56 +-
...igInDetValidation_bjet_IBL_pu40_trkpt2.xml | 82 -
.../TrigInDetValidation_bjet_IBL_pu46.xml | 82 -
.../TrigInDetValidation_bjet_IBL_pu80.xml | 82 -
.../TrigInDetValidation_bjet_pu46.xml | 39 +-
.../TIDAbuild/TrigInDetValidation_cosmic.xml | 20 +-
.../TrigInDetValidation_el_Jpsiee_pu40.xml | 39 +-
.../TrigInDetValidation_el_Zee_IBL_pu40.xml | 72 +-
...nDetValidation_el_Zee_IBL_pu40_offline.xml | 71 +-
...tion_el_Zee_IBL_pu40_offline_rzMatcher.xml | 71 +-
...etValidation_el_Zee_IBL_pu40_rzMatcher.xml | 71 +-
.../TrigInDetValidation_el_Zee_pu46.xml | 72 +-
.../TrigInDetValidation_el_Zee_pu46_run1.xml | 54 +-
.../TrigInDetValidation_el_single_e_5.xml | 55 +-
...igInDetValidation_el_single_e_7-80_IBL.xml | 71 +-
...etValidation_el_single_e_7-80_IBL_pu40.xml | 71 +-
...n_el_single_e_7-80_IBL_pu40_robustness.xml | 72 +-
...DetValidation_el_single_e_7-80_larged0.xml | 71 +-
...Validation_el_single_e_7-80_larged0_PU.xml | 71 +-
...gInDetValidation_el_single_e_7-80_pu40.xml | 72 +-
...ation_el_single_e_7-80_pu40_robustness.xml | 71 +-
...tValidation_el_single_e_7-80_pu40_run1.xml | 74 +-
.../TrigInDetValidation_el_ttbar_pu100.xml | 71 +-
.../TrigInDetValidation_el_ttbar_pu138.xml | 71 +-
.../TrigInDetValidation_el_ttbar_pu40.xml | 71 +-
.../TrigInDetValidation_el_ttbar_pu46.xml | 71 +-
.../TrigInDetValidation_el_ttbar_pu69.xml | 72 +-
.../TrigInDetValidation_el_ttbar_pu80.xml | 71 +-
.../TrigInDetValidation_expertMonitoring.xml | 15 +-
...igInDetValidation_expertMonitoring_run.xml | 15 -
.../TIDAbuild/TrigInDetValidation_minBias.xml | 20 +-
...gInDetValidation_minBias_mergeDataPrep.xml | 36 +-
.../TrigInDetValidation_minBias_offline.xml | 20 +-
.../TrigInDetValidation_minBias_pileUp.xml | 4 +-
.../TrigInDetValidation_mu_Zmumu_IBL_pu40.xml | 51 +-
...etValidation_mu_Zmumu_IBL_pu40_offline.xml | 36 +-
...on_mu_Zmumu_IBL_pu40_offline_rzMatcher.xml | 37 +-
...Validation_mu_Zmumu_IBL_pu40_rzMatcher.xml | 37 +-
.../TrigInDetValidation_mu_Zmumu_pu40.xml | 37 +-
...TrigInDetValidation_mu_Zmumu_pu40_run1.xml | 37 +-
.../TrigInDetValidation_mu_bphys.xml | 37 +-
.../TrigInDetValidation_mu_bphys_IBL.xml | 37 +-
.../TrigInDetValidation_mu_single_mu_100.xml | 37 +-
...igInDetValidation_mu_single_mu_larged0.xml | 38 +-
...nDetValidation_mu_single_mu_larged0_PU.xml | 38 +-
.../TrigInDetValidation_tau_IBL_pu46.xml | 54 +-
...igInDetValidation_tau_IBL_pu46_offline.xml | 54 +-
.../TrigInDetValidation_tau_pu46.xml | 54 +-
.../TrigInDetValidation_tau_pu46_run1.xml | 37 +-
.../TrigInDetValidation/TIDAbuild/makefile | 4 -
.../TrigInDetValidation/doc/README | 50 +-
.../python/InDetModules.py | 2 +
.../TrigInDetValidation/python/__init__.py | 2 +
.../TrigInDetValidation_all_ttbar_pu40.sh | 42 -
.../TrigInDetValidation_all_ttbar_pu46.sh | 29 +-
.../TrigInDetValidation_all_ttbar_pu80.sh | 60 -
.../TrigInDetValidation_bjet_IBL_pu40.sh | 4 +-
.../TrigInDetValidation_bjet_IBL_pu46.sh | 32 -
.../TrigInDetValidation_bjet_IBL_pu80.sh | 32 -
...nDetValidation_RTT_topOptions_BjetSlice.py | 62 -
.../TrigInDetValidation_TestConfiguration.xml | 5474 +++++++----------
.../TrigInDetValidation/utils/mkargs | 78 +-
.../utils/selectblock/makefile | 5 -
.../utils/selectblock/selectblock.cxx | 154 -
...ValidationLight_TestConfiguration_main.xml | 17 +-
.../TIDAbuild/makefile | 15 +-
...InDetValidationLight_TestConfiguration.xml | 370 +-
143 files changed, 5690 insertions(+), 8137 deletions(-)
delete mode 100644 DetectorDescription/RegionSelector/doc/packagedoc.h
delete mode 100644 InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
delete mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
delete mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
delete mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
delete mode 100755 Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDApost.sh
delete mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhistos-vtx.dat
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu40.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu80.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ10.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ15.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ5.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ7_5.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super1.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super2.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super3.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super4.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu46.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu80.xml
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring_run.xml
delete mode 100755 Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu40.sh
delete mode 100755 Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu80.sh
delete mode 100755 Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu46.sh
delete mode 100755 Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu80.sh
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/makefile
delete mode 100644 Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
diff --git a/DetectorDescription/RegionSelector/doc/packagedoc.h b/DetectorDescription/RegionSelector/doc/packagedoc.h
deleted file mode 100644
index 4d106d44cce0..000000000000
--- a/DetectorDescription/RegionSelector/doc/packagedoc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@page RegionSelector_page RegionSelector Package
-@author Simon George <S.George@rhul.ac.uk>, Aline Gesualdi Mello, Steve Armstrong
-
-@section RegionSelector_RegionSelectorIntro Introduction
-
-The RegSelSvc translates physical regions within any subdetector system into detector identifiers or Read-Out Buffer (ROB) identifiers.
-
-It has been designed and developed for use in the High Level Trigger, where it is used to implement the Region of Interest (RoI) mechanism. It is also intended to be of general use in the ATLAS reconstruction.
-
-It is currently maintained by Simon George (general), Mark Sutton (indet), Denis Damazio (calo), Alessandro DiMattia (muon).
-
-@section RegionSelector_RegionSelectorOverview Overview
-
- The RegionSelector package contains of following methods to retrieve identifiers:
-
- - RegionSelector::DetHashIDList translates a geometrical region into @c std::vector<IdentifierHash>
- without repeated @c IdentifierHash elements.
- - RegionSelector::DetROBIDListUint: translates a geometrical region into @c std::vector<uint32_t>
- without repeated @c ROBID elements.
-
-@section RegionSelector_RegionSelectorUsage Usage
-
-Region Selector execution is like any Service, so in order to be used in a
-standard Athena Algorithm, some additional lines must be added to the .h and
-.cxx files. It is (best) configured using the IRegSelSvc interface from the
-IRegionSelector to free your package from dependence on the actual RegionSelector
-implementation.
-
-In your requirements file, add:
-@code
- use IRegionSelector IRegionSelector-* DetectorDescription
-@endcode
-
-In the .h file, include the IRegSelSvc.h file (foward declaration
-is not sufficient as the header file includes some enumerations) and a
-declare a ServiceHandle for the RegSelSvc as private data member of your
-algorithm.
-@code
- include "IRegionSelector/IRegSelSvc.h"
- //...
- ServiceHandle<IRegSelSvc> m_regSelSvc;
-@endcode
-In the .cxx file, in the Algorithm's constructor, initialise the ServiceHandle.
-@code
- m_regSelSvc("RegSelSvc")
-@endcode
-In the initialize method check it can retrieve the RegionSelector service.
-@code
- if (m_regSelSvc.retrieve()).isFailure() ) {
- log << MSG::FATAL << "Failed to retrieve RegionSelector Service";
- return HLT::BAD_JOB_SETUP;
- }
-@endcode
-
-In your Algorithm's execute method, call the @c DetIDList method with the required detector, \f$ \eta \f$ and \f$ \phi \f$ range, and a pointer to a vector of identifiers. The vector will be filled with identifiers found in the region:
-@code
- std::vector<IdentifierHash> detIdentifiers;
- m_regSelSvc->DetHashIDList(PIXEL, etaMin, etaMax, phiMin, phiMax, &detIdentifiers);
- std::vector<uint32_t> robIdentifiers;
- m_regSelSvc->DetROBIDListUint(PIXEL, etaMin, etaMax, phiMin, phiMax, robIdentifiers);
-@endcode
-The above examples specify the @c PIXEL detector. Note that the detector is specified using @c DETID enumeration, whose values are: @c PIXEL, @c SCT, @c TRT, @c LAR, @c TTEM, @c TTHEC, @c TILE, @c MDT, @c RPC and @c TGC.
-
-There are some other methods that are only valid for some specific
-detectors. For calorimeters (@c LAR, @c TTEM, @c TTHEC and @c TILE),
-there are methods to retrieve identifiers and ROB IDs for a given
-sampling. For muon detectors (@c MDT, @c RPC and @c TGC), there is an additional argument @c TYPEID, which is an enumeration whose values are: @c BIL, @c BIS, @c BML, @c BMS, @c BOL, @c BOS, @c BMF, @c BIR, @c BOF and @c BOG.
-Note that Muon detectors do not have methods to retrieve ROBID values.
-
-Note that for the Inner Detector there are additional methods which also take zMin and zMax
-values for the roi, eg
-@code
- std::vector<IdentifierHash> detIdentifiers;
- m_regSelSvc->DetHashIDList(PIXEL, zMin, zMax, etaMin, etaMax, phiMin, phiMax, &detIdentifiers);
-@endcode
-which allow the z extent along the beamline to be specified. There are also additional
- methods that allow the roi to be specified with respect to a shifted beamline in x and y
-@code
- std::vector<IdentifierHash> detIdentifiers;
- m_regSelSvc->DetHashIDList(PIXEL, zMin, zMax, etaMin, etaMax, phiMin, phiMax, xBeam, yBeam, &detIdentifiers);
-@endcode
-but care must be taken in this case when specifying an roi from -pi to pi, since any
-shift in y will mean that both -pi and pi will intersect with any given layer at some
-other angle!=pi in the lab frame and the phi wrapping will render phiMin = phiMax so
-you will get an roi with deltaphi=0 which is almost certainly not what you want in this
-case.
-
-@section RegionSelector_RegionSelectorConfig Configuration
-
-RegionSelector is configured by the RegSelSvcDefault
-configurable. Declaring the ServiceHandle as shown above should
-generate the configuration you need automatically.
-
-For backward compatability it can be imported, instantiated and added to the ServiceMgr by including the file "RegionSelector/RegionSelector_jobOptions.py".
-
-RegionSelector has the following properties:
-
- - @c @b RegionType (@c @b string): not used;
- - @c @b GeometricalLayout (@c @b string): specify which atlas detector description layout to use for static maps, e.g., @c Rome-Initial, @c DC2. Currently only the muon detector uses static maps. The other detectors are not influenced by this as they calculate their lookup tables on the fly from whichever detector description version has been loaded by GeoModel. You only need to set this if you wish to override the default value, which is taken from the GeoModelSvc at run time.
- - @c @b enableID, @c @b enableCalo or @c @b enableMuon (@c @b bool): these flags specify which detectors maps should be initialized for. They may be used in combination. By default they are all false (disabled).
- - @c @b WriteTables (@c @b bool): flag to turn on writing of maps back out to files at initialization time. This is just for expert debugging.
- - @c @b OutputFile (@c @b string): common prefix name for map files. Each map will be written to a separate file name by this prefix plus detector name. The default name is @c RSOutputTable.txt so for example the TRT table would be written to @c RSOutputTableTRT.txt.
-
-Note that RegionSelector has a run-time dependency on InnerDetector and Calo tools which produce the lookup tables it needs. These tools will automatically be configured and invoked by the RegSelSvc if the relevant @c enable flags are on.
-
-@ref used_MyPackage
-
-@ref requirements_MyPackage
-
-*/
-
-/**
-@page used_MyPackage Used Packages
-*/
-
-/**
-@page requirements_MyPackage Requirements
-*/
-
diff --git a/DetectorDescription/RegionSelector/python/NewRegSelSvcDefault.py b/DetectorDescription/RegionSelector/python/NewRegSelSvcDefault.py
index f890b2baa459..3b03a6fb6ef1 100755
--- a/DetectorDescription/RegionSelector/python/NewRegSelSvcDefault.py
+++ b/DetectorDescription/RegionSelector/python/NewRegSelSvcDefault.py
@@ -155,10 +155,6 @@ class NewRegSelSvcDefault ( NewRegSelSvc ) :
self.enableTRT = True
else:
self.enableTRT = False
- if DetFlags.detdescr.FTK_on():
- self.enableFTK = True
- else:
- self.enableFTK = False
else:
self.enableID = False
diff --git a/DetectorDescription/RegionSelector/python/RegSelSvcDefault.py b/DetectorDescription/RegionSelector/python/RegSelSvcDefault.py
index 2946c179153a..fde5c0c751d4 100755
--- a/DetectorDescription/RegionSelector/python/RegSelSvcDefault.py
+++ b/DetectorDescription/RegionSelector/python/RegSelSvcDefault.py
@@ -36,29 +36,27 @@ class RegSelSvcDefault ( RegSelSvc ) :
tgcTable = None
cscTable = None
ftkTable = None
-
-
+
from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.DetFlags import DetFlags
-
if DetFlags.detdescr.ID_on():
# if DetFlags.detdescr.ftk_on(): ### is the ftk properly integrated yet ???
from InDetRegionSelector.InDetRegionSelectorConf import FTK_RegionSelectorTable
- if DetFlags.detdescr.FTK_on():
-
- ftkTable = FTK_RegionSelectorTable(name = "FTK_RegionSelectorTable",
- ManagerName = "",
- OutputFile = "RoITableFTK.txt",
- PrintHashId = True,
- PrintTable = False)
- ToolSvc += ftkTable
- mlog.debug(ftkTable)
+ ftkTable = FTK_RegionSelectorTable(name = "FTK_RegionSelectorTable",
+ ManagerName = "",
+ DeltaZ = self.DeltaZ, # Z vertex extent = +- this value.
+ OutputFile = "RoITableFTK.txt",
+ PrintHashId = True,
+ PrintTable = False)
+ ToolSvc += ftkTable
+ mlog.debug(ftkTable)
if DetFlags.detdescr.pixel_on():
from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
pixTable = SiRegionSelectorTable(name = "PixelRegionSelectorTable",
ManagerName = "Pixel",
+ DeltaZ = self.DeltaZ, # Z vertex extent = +- this value.
OutputFile = "RoITablePixel.txt",
PrintHashId = True,
PrintTable = False)
@@ -69,6 +67,7 @@ class RegSelSvcDefault ( RegSelSvc ) :
from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
sctTable = SiRegionSelectorTable(name = "SCT_RegionSelectorTable",
ManagerName = "SCT",
+ DeltaZ = self.DeltaZ, # Z vertex extent = +- this value.
OutputFile = "RoITableSCT.txt",
PrintHashId = True,
PrintTable = False)
@@ -79,6 +78,7 @@ class RegSelSvcDefault ( RegSelSvc ) :
from InDetRegionSelector.InDetRegionSelectorConf import TRT_RegionSelectorTable
trtTable = TRT_RegionSelectorTable(name = "TRT_RegionSelectorTable",
ManagerName = "TRT",
+ DeltaZ = self.DeltaZ, # Z vertex extent = +- this value.
OutputFile = "RoITableTRT.txt",
PrintHashId = True,
PrintTable = False)
@@ -170,10 +170,6 @@ class RegSelSvcDefault ( RegSelSvc ) :
self.enableTRT = True
else:
self.enableTRT = False
- if DetFlags.detdescr.FTK_on():
- self.enableFTK = True
- else:
- self.enableFTK = False
else:
self.enableID = False
diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
index 30ef68ad454e..af3883600d43 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
@@ -78,8 +78,7 @@ RegSelSvc::RegSelSvc(const std::string& name, ISvcLocator* sl)
m_lutCreatorToolTGC ("TGC_RegionSelectorTable"),
m_lutCreatorToolCSC ("CSC_RegionSelectorTable"),
m_initFTK(false),
- m_lutCreatorToolFTK ("FTK_RegionSelectorTable/FTK_RegionSelectorTable"),
- m_ftklut(nullptr),
+ m_lutCreatorToolFTK ("FTK_RegionSelectorTable"),
m_duplicateRemoval( true )
{
//! Declare properties
@@ -157,9 +156,9 @@ StatusCode RegSelSvc::initialize() {
msg(MSG::INFO)
<< "DetectorDescription version " << m_geometryVersion;
if (m_geometryVersionProp.value() == "use_geomodel"){
- msg() << " (obtained from GeoModelSvc)" << endmsg;
+ msg() << " (obtained from GeoModelSvc)" << endreq;
} else {
- msg() << " (supplied as property)" << endmsg;
+ msg() << " (supplied as property)" << endreq;
}
ATH_MSG_DEBUG( "property value was "
<< m_geometryVersionProp.value() << ")" );
@@ -205,7 +204,7 @@ StatusCode RegSelSvc::initialize() {
if( m_initOnlyMuon.value() )
msg() << " ( rpc=" << rpcflag << " mdt=" << mdtflag << " tgc=" << tgcflag << " csc=" << cscflag << " )";
- msg() << endmsg;
+ msg() << endreq;
bool errorFlag=false; // true indicates an error occured somewhere
@@ -299,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" << endmsg; // " with Region Type " << m_regionType << endmsg;
+ msg() << " detectors have been initialized" << endreq; // " with Region Type " << m_regionType << endreq;
}
if ( m_dumpTable ) {
diff --git a/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx b/DetectorDescription/RegionSelector/src/RegSelectorHashMap.cxx
index 0a8eed202765..807bc18b90cd 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 << endmsg;
+ //log << MSG::DEBUG << "PathResolver found " << fullFileName << endreq;
if (fullFileName == "") {
- //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endmsg;
+ //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endreq;
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 6d2878946a8d..4b61cd8dfbcb 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 << endmsg;
+ //log << MSG::DEBUG << "PathResolver found " << fullFileName << endreq;
if (fullFileName == "") {
- //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endmsg;
+ //log << MSG::FATAL << "Could not find input file in DATAPATH" << unresolvedFileName<< endreq;
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 d8124943ae2f..6646c3713ee6 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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg; larData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "LAR verifyOutput" << endreq; 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" << endmsg; ttemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "TTEM verifyOutput" << endreq; 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" << endmsg; tthecData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "TTHEC verifyOutput" << endreq; 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" << endmsg; ttfcalemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "FCALEM verifyOutput" << endreq; 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" << endmsg; ttfcalhadData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endreq; 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" << endmsg;
+ << " got " << outputROBIDList.size() << " ROB IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl;
// if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " This method is obsolete - please replace" << endmsg;
+ // (*m_log) << MSG::WARNING << " This method is obsolete - please replace" << endreq;
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input layers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input barrellayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input endAlayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input endClayers vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
+ // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq;
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg; larDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "LAR hashID verifyOutput" << endreq; 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" << endmsg; ttemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTEM hashID verifyOutput" << endreq; 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" << endmsg; tthecDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; 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" << endmsg; ttfcalemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; 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" << endmsg; ttfcalhadDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endreq; 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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
+ // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq;
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
+ // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq;
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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" << endmsg;
+ // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endreq;
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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 << endmsg; larDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "LAR hashID verifyOutput sampling " << sampling << endreq; 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 << endmsg; ttemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTEM hashID verifyOutput sampling " << sampling << endreq; 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 << endmsg; tthecDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "TTEC hashID verifyOutput sampling " << sampling << endreq; 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 << endmsg; ttfcalemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "FCALEM hashID verifyOutput sampling " << sampling << endreq; 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 << endmsg; ttfcalhadDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
+ //log<< MSG::DEBUG << "FCALHAD hashID verifyOutput sampling " << sampling << endreq; 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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << IDList->size() << " hash IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg; larData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "LAR verifyOutput" << endreq; 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" << endmsg; ttemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "TTEM verifyOutput" << endreq; 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" << endmsg; tthecData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "TTHEC verifyOutput" << endreq; 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" << endmsg; ttfcalemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "FCALEM verifyOutput" << endreq; 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" << endmsg; ttfcalhadData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
+ //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endreq; 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" << endmsg;
+ << " got " << outputROBIDList.size() << " ROB IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << outputROBIDList.size() << " ROB IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << outputROBIDList.size() << " ROB IDs" << endreq;
}
}
@@ -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" << endmsg;
+ (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endreq;
}
// 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 << endmsg;
+ (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endreq;
}
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 << endmsg;
+ << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endreq;
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" << endmsg;
+ << " got " << outputROBIDList.size() << " ROB IDs" << endreq;
}
}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/FTK_RegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/FTK_RegionSelectorTable.h
index c1ae6d54c3a0..8d1ff109f4ad 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/FTK_RegionSelectorTable.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/FTK_RegionSelectorTable.h
@@ -1,14 +1,20 @@
// emacs: this is -*- c++ -*-
//
-// @file FTK_RegionSelectorTable.h
-//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+// FTK_RegionSelectorTable.h
+//
+// Create the new RegSelSiLUT for the FTK
+//
+// Copyright (C) 2011 M.Sutton (sutt@hep.ucl.ac.uk)
+//
+// $Id: FTK_RegionSelectorTable.h, v0.0 Fri 24 Jun 2011 13:10:59 BST $
+
#ifndef InDetRegionSelector_FTK_RegionSelectorTable_h
#define InDetRegionSelector_FTK_RegionSelectorTable_h
-#include "RegSelLUT/IRegionIDLUT_Creator.h"
+#include "RegSelLUT/IRegionFTKLUT_Creator.h"
+// #include "GaudiKernel/AlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -21,7 +27,7 @@ using std::string;
/////////////////////////////////////////////////////////////////////////////
-class FTK_RegionSelectorTable : public AthAlgTool, virtual public IRegionIDLUT_Creator
+class FTK_RegionSelectorTable : public AthAlgTool, virtual public IRegionFTKLUT_Creator
{
public:
@@ -32,17 +38,18 @@ public:
StatusCode initialize();
StatusCode finalize();
- virtual RegSelSiLUT* getLUT() const;
+ virtual RegSelEtaPhiLUT* getLUT() const;
private:
StatusCode createTable();
- RegSelSiLUT* m_regionLUT;
+ // StoreGateSvc* m_detStore;
+ RegSelEtaPhiLUT* m_regionLUT;
// Algorithm properties
std::string m_managerName;
-
+ double m_deltaZ;
std::string m_roiFileName;
bool m_printHashId;
bool m_printTable;
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/InDetRegionSelectorLUT.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/InDetRegionSelectorLUT.h
index 27e157b98947..0cd3c4f5e60f 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/InDetRegionSelectorLUT.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/InDetRegionSelectorLUT.h
@@ -1,12 +1,11 @@
-// emacs: this is -*- c++ -*-
-//
-// @file InDetRegionSelectorLUT.h
-//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef InDetRegionSelector_InDetRegionSelectorLUT_h
#define InDetRegionSelector_InDetRegionSelectorLUT_h
+// #include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "RegSelLUT/IRegionIDLUT_Creator.h"
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
index 1b2dacbf127b..d8ebdcf4e1b8 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
@@ -1,8 +1,12 @@
// emacs: this is -*- c++ -*-
//
-// @file SiRegionSelectorTable.h
-//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+// SiRegionSelectorTable.h
+//
+// Create the new RegSelSiLUT for the Pixel detector and SCT
+//
+// Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)
+//
+// $Id: SiRegionSelectorTable.h, v0.0 Mon Apr 14 17:00:14 BST 2008 sutt
#ifndef InDetRegionSelector_SiRegionSelectorTable_h
@@ -10,12 +14,15 @@
#include "RegSelLUT/IRegionIDLUT_Creator.h"
+// #include "GaudiKernel/AlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+// #include "PixelCabling/PixelIdMapping.h"
#include "PixelCabling/IPixelCablingSvc.h"
#include "SCT_Cabling/ISCT_CablingSvc.h"
+// class StoreGateSvc;
class RegSelSiLUT;
#include <string>
@@ -40,16 +47,19 @@ private:
StatusCode createTable();
+ // StoreGateSvc* m_detStore;
RegSelSiLUT* m_regionLUT;
// Algorithm properties
std::string m_managerName;
+ double m_deltaZ;
std::string m_roiFileName;
bool m_printHashId;
bool m_printTable;
bool m_noDBM;
// cablings
+ // ToolHandle<PixelIdMapping> m_pixIdMapping;
ServiceHandle<IPixelCablingSvc> m_pixIdMapping;
ServiceHandle<ISCT_CablingSvc> m_sctCablingSvc;
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
index f7601297d5b0..6db5a5479e5e 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
@@ -1,9 +1,6 @@
-// emacs: this is -*- c++ -*-
-//
-// @file TRT_RegionSelectorTable.h
-//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
#ifndef InDetRegionSelector_TRT_RegionSelectorTable_h
#define InDetRegionSelector_TRT_RegionSelectorTable_h
@@ -18,6 +15,7 @@
#include <string>
using std::string;
+// class StoreGateSvc;
class RegSelSiLUT;
class TRT_IdentifierConversionTool;
class ITRT_CablingSvc;
@@ -42,7 +40,10 @@ private:
StatusCode createTable();
+ // StoreGateSvc* m_detStore;
+ // ToolHandle<ITRT_IdMapping> m_TRT_IdMapping; // Identifier mapping Tool
ServiceHandle<ITRT_CablingSvc> m_TRT_IdMapping; // Identifier mapping Tool
+ // TRT_IdMapping* m_TRT_IdMapping;
TRT_IdentifierConversionTool* m_TRT_IdMappingOld; // Identifier conversion Tool.
// Here temporarily until ATLAS mapping
// is put into InDetCabling
@@ -50,6 +51,7 @@ private:
RegSelSiLUT* m_regionLUT;
// Algorithm properties
+ double m_deltaZ;
std::string m_managerName;
std::string m_roiFileName;
bool m_printHashId;
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
deleted file mode 100644
index 24f44e8234af..000000000000
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/doc/packagedoc.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page InDetRegionSelector_page InDetRegionSelector Package
-
-@authors Mark Sutton, Grant Gorfine, Aline Gesualdi Mello, Seregy Sivoklokov,
-
-@section InDetRegionSelector_InDetRegionSelectorIntro Introduction
-
-This package contains code to generate the tables of element extents
-used by the region selector.
-
-The code loops over each detector element
-and fills the class RegSelSiLUT which includes for each element:
-
- z min,
- z max,
- z2 min
- z2 max
-
- r min,
- r max,
-
- phi min,
- phi max,
-
- layer/disk number,
- barrel or endcap,
- hash Id,
- rob Id.
-
-The element extent in eta is no longer used, since the lookup tables are more
-sophisticated and can allow elements within an roi which has a position and
-and extent in z along the beamline to be used.
-
-Therefore, when a user wants elements inside an roi, they must *also* specify
-the zmin and zmax positions of the roi along the beamline. The default z range
-(DeltaZ in the old version) are no longer used - this now comes from each
-RoiDescriptor
-
-The elements can be trapezoidal in r-z space, with max and min radii, and
-max and min z positions at the inner radius and z2 max and min positions
-at the outer radius. If no z2 values are given, then the same z limits are
-used at both the inner and outer radius.
-
-@section InDetRegionSelector_InDetRegionSelectorClassOverview Class Overview
-
-The package contains the two tools:
-
- - SiRegionSelectorTable: Pixel and SCT
- - TRT_RegionSelectorTable: For TRT.
-
- - FTK_RegionSelectorTable: For FTK.
-
-
-@section InDetRegionSelector_InDetRegionSelectorJobOptions Job Options
-
-
- - InDetRegionSelectorTable_jobOptions.py: Job option fragment for initializing all tools using genConf.
- Makes use of DetFlags to control which tables will be created.
-
-@section InDetRegionSelector_InDetRegionSelectorReq Requirements
-
-
-*/
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/share/InDetRegionSelectorTable_jobOptions.py b/InnerDetector/InDetDetDescr/InDetRegionSelector/share/InDetRegionSelectorTable_jobOptions.py
index 2fa3061db7c6..400ee00f5cae 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/share/InDetRegionSelectorTable_jobOptions.py
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/share/InDetRegionSelectorTable_jobOptions.py
@@ -21,6 +21,7 @@ ToolSvc = Service( "ToolSvc" )
# SiRegionSelectorTable and TRT_RegionSelectorTable properties
#
# ManagerName: Manager name.
+# DeltaZ: Z vertex extent
#
# For debugging the following is also available
# OuputFile: File name of output file.
@@ -31,6 +32,7 @@ if DetFlags.detdescr.pixel_on():
from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
PixelRegionSelectorTable = SiRegionSelectorTable(name = "PixelRegionSelectorTable",
ManagerName = "Pixel",
+ DeltaZ = 168 * mm, # Z vertex extent = +- this value.
OutputFile = "RoITablePixel.txt",
PrintHashId = True,
PrintTable = False)
@@ -43,6 +45,7 @@ if DetFlags.detdescr.SCT_on():
from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
SCT_RegionSelectorTable = SiRegionSelectorTable(name = "SCT_RegionSelectorTable",
ManagerName = "SCT",
+ DeltaZ = 168 * mm, # Z vertex extent = +- this value.
OutputFile = "RoITableSCT.txt",
PrintHashId = True,
PrintTable = False)
@@ -55,6 +58,7 @@ if DetFlags.detdescr.TRT_on():
from InDetRegionSelector.InDetRegionSelectorConf import TRT_RegionSelectorTable
TRT_RegionSelectorTable = TRT_RegionSelectorTable(name = "TRT_RegionSelectorTable",
ManagerName = "TRT",
+ DeltaZ = 168 * mm, # Z vertex extent = +- this value.
OutputFile = "RoITableTRT.txt",
PrintHashId = True,
PrintTable = False)
@@ -62,21 +66,6 @@ if DetFlags.detdescr.TRT_on():
print TRT_RegionSelectorTable
else :
TRT_RegionSelectorTable = None
-
-if DetFlags.detdescr.FTK_on():
- from InDetRegionSelector.InDetRegionSelectorConf import FTK_RegionSelectorTable
- FTK_RegionSelectorTable = FTK_RegionSelectorTable(name = "FTK_RegionSelectorTable",
- ManagerName = "FTK",
- OutputFile = "RoITableFTK.txt",
- PrintHashId = True,
- PrintTable = False)
- ToolSvc += FTK_RegionSelectorTable
- print FTK_RegionSelectorTable
-else :
- print "FTK_RegionSelectorTable not being set up"
- FTK_RegionSelectorTable = None
-
-
#
# --- now load algorithm
#
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/FTK_RegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/FTK_RegionSelectorTable.cxx
index 26f4d7d41727..e2e923209ec8 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/FTK_RegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/FTK_RegionSelectorTable.cxx
@@ -19,7 +19,7 @@ using namespace std;
#include "RegSelLUT/StoreGateIDRS_ClassDEF.h"
-#include "RegSelLUT/RegSelSiLUT.h"
+#include "RegSelLUT/RegSelEtaPhiLUT.h"
#define USE_STOREGATE
@@ -31,14 +31,16 @@ FTK_RegionSelectorTable::FTK_RegionSelectorTable(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type,name,parent),
- m_regionLUT(nullptr),
+ m_regionLUT(0),
m_managerName(""),
+ m_deltaZ(168 * CLHEP::mm),
m_roiFileName("RoITable.txt"),
m_printHashId(true),
m_printTable(false)
{
- declareInterface<IRegionIDLUT_Creator>(this);
+ declareInterface<IRegionFTKLUT_Creator>(this);
declareProperty("ManagerName", m_managerName);
+ declareProperty("DeltaZ", m_deltaZ);
// The remaining properties are for debugging purposes.
declareProperty("OutputFile", m_roiFileName);
@@ -50,17 +52,18 @@ FTK_RegionSelectorTable::FTK_RegionSelectorTable(const std::string& type,
StatusCode
FTK_RegionSelectorTable::initialize(){
- msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endmsg;
- msg(MSG::INFO) << "Tool Properties" << endmsg;
- msg(MSG::INFO) << " Detector Manager: " << m_managerName << endmsg;
+ msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endreq;
+ msg(MSG::INFO) << "Tool Properties" << endreq;
+ msg(MSG::INFO) << " Detector Manager: " << m_managerName << endreq;
+ msg(MSG::INFO) << " DeltaZ: " << m_deltaZ/CLHEP::mm << " mm <<< NB: this parameter is now OBSOLETE" << endreq;
if( msgLvl(MSG::DEBUG) ) {
- msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endmsg;
- msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endmsg;
- msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endmsg;
+ msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endreq;
+ msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endreq;
+ msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endreq;
}
if (m_managerName.empty()) {
- msg(MSG::WARNING) << "no manager found - so far none for the FTK tables" << endmsg;
+ msg(MSG::WARNING) << "no manager found - so far none for the FTK tables" << endreq;
}
StatusCode sc;
@@ -79,31 +82,31 @@ FTK_RegionSelectorTable::~FTK_RegionSelectorTable()
// Get the lookup table.
-RegSelSiLUT* FTK_RegionSelectorTable::getLUT() const
+RegSelEtaPhiLUT* FTK_RegionSelectorTable::getLUT() const
{
return m_regionLUT;
}
+
StatusCode
FTK_RegionSelectorTable::createTable()
{
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endmsg;
- RegSelSiLUT* rd = new RegSelSiLUT(RegSelSiLUT::FTK); /// NB: use default internal size parameters here
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endreq;
+ RegSelEtaPhiLUT* rd = new RegSelEtaPhiLUT(); /// NB: use default internal size parameters here
/// Whay hey!!! so here we actually need to somehow create the lookup objects and
/// add them to the table
- msg(MSG::INFO) << " initialising new map " << endmsg;
+ msg(MSG::INFO) << " initialising new map " << endreq;
std::string detName;
std::string newkey;
- newkey = "FTKRegSelSiLUT";
+ newkey = "FTKRegSelEtaPhiLUT";
detName = "FTK";
#ifndef USE_STOREGATE
if ( m_regionLUT ) delete m_regionLUT;
#endif
-
m_regionLUT = rd;
/// create here, some dummy modules and add them to the lookup table
@@ -111,66 +114,40 @@ FTK_RegionSelectorTable::createTable()
/// created from parameters extracted from an fk helper of some
/// sort
-
- /// FIXME: these are just *fake* vlaues - really the values should
- /// come automatically from the FTK detector manager
- /// when they are abailable from there, this *must* be changed
- /// to use it
-
int hashid=0;
-
- const int Nz = 4;
- const int Nphi = 32;
-
- /// fake limits in z
- double zmin[Nz+1] = { -200, -100, 0, 100, 200 };
- double zmax[Nz+1] = { -5000, -2000, 0, 2000, 5000 };
-
- /// fake limits in r
- double rmin = 30;
- double rmax = 600;
-
- /// just replace this by the loop over regions omn the FTK and
- /// calculating the actual parameters
-
+ int Neta = 32;
+ int Nphi = 32;
+ double deta = 6./Neta;
double dphi = 2*M_PI/Nphi;
- msg(MSG::INFO) << "generating dummy FTK modules" << endmsg;
- for ( int i=0; i<Nphi ; i++ ) {
- for ( int j=0; j<Nz ; j++ ) {
- double phimin=j*dphi-M_PI;
- double phimax=(j+1)*dphi-M_PI;
-
+ msg(MSG::INFO) << "generating dummy FTK modules" << endreq;
+ for ( int i=0; i<Neta ; i++ ) {
+ for ( int j=0; j<Nphi ; j++ ) {
+ double eta=-3+i*deta;
+ double phi=j*dphi;
/// use int rather than IdentifierHash here, since an IdentiferHash
/// is just a wrapper to an int, but has no ++ operator etc
- RegSelModule m( zmin[j], zmin[j+1],
- zmax[j], zmax[j+1],
- rmin, rmax, phimin, phimax, 0, 0, hashid, hashid );
-
+ RegSelEtaPhiLUT::EtaPhiModule m( eta, eta+deta, phi, phi+dphi, hashid++ );
rd->addModule( m );
-
- msg(MSG::DEBUG) << "\t" << m << endmsg;
-
- hashid++;
-
+ msg(MSG::DEBUG) << "\t" << m << endreq;
}
}
#ifdef USE_STOREGATE
- // save new map in StoreGate
- StatusCode sc = detStore()->contains< RegSelSiLUT >(newkey);
+ // save new map in StoreGate RegSelEtaPhiLUT
+ StatusCode sc = detStore()->contains< RegSelEtaPhiLUT >(newkey);
if (sc == StatusCode::SUCCESS ) {
- msg(MSG::FATAL) << " RegSelSiLUT " << newkey << " already exists " << endmsg;
+ msg(MSG::FATAL) << " RegSelEtaPhiLUT " << newkey << " already exists " << endreq;
} else {
// create and store LUT
// needs to be modifiable so we can enable/disable modules
// from the RegSelSvc (probably not for FTK however)
sc = detStore()->record(rd, newkey, true);
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << " could not register " << detName << " RegSelSiLUT" << endmsg;
+ msg(MSG::ERROR) << " could not register " << detName << " RegSelEtaPhiLUT" << endreq;
return( StatusCode::FAILURE );
} else {
- msg(MSG::INFO) << detName << " RegSelSiLUT successfully saved in detector Store" << endmsg;
+ msg(MSG::INFO) << detName << " RegSelEtaPhiLUT successfully saved in detector Store" << endreq;
}
}
#endif
@@ -181,7 +158,7 @@ FTK_RegionSelectorTable::createTable()
StatusCode FTK_RegionSelectorTable::finalize() {
- msg(MSG::INFO) << "finalize()" << endmsg;
+ msg(MSG::INFO) << "finalize()" << endreq;
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
index 1fdd7bb66e96..377168a62af9 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
@@ -2,6 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
+
#include "InDetRegionSelector/InDetRegionSelectorLUT.h"
#include "CLHEP/Units/SystemOfUnits.h"
@@ -36,67 +37,67 @@ InDetRegionSelectorLUT::InDetRegionSelectorLUT(const std::string& name, ISvcLoca
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
StatusCode InDetRegionSelectorLUT::initialize(){
- msg(MSG::INFO) << "initialize()" << endmsg;
+ msg(MSG::INFO) << "initialize()" << endreq;
//
// get tools
//
- msg(MSG::INFO) << "InDetRegionSelectorLUT::initialize() " << name() << "\t" << m_lutCreatorToolPixel << endmsg;
+ msg(MSG::INFO) << "InDetRegionSelectorLUT::initialize() " << name() << "\t" << m_lutCreatorToolPixel << endreq;
// Pixel
if (!m_lutCreatorToolPixel) {
- msg(MSG::INFO) << "Pixel LUT Creator not configured " << m_lutCreatorToolPixel << endmsg;
+ msg(MSG::INFO) << "Pixel LUT Creator not configured " << m_lutCreatorToolPixel << endreq;
} else {
if ( m_lutCreatorToolPixel.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolPixel << endmsg;
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolPixel << endreq;
return StatusCode::FAILURE;
} else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolPixel << endmsg;
+ msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolPixel << endreq;
// compute LUT
const RegSelSiLUT* pixellut = m_lutCreatorToolPixel->getLUT();
if (!pixellut) {
- msg(MSG::ERROR) << "Pixel table missing" << endmsg;
+ msg(MSG::ERROR) << "Pixel table missing" << endreq;
} else if (m_doTests) {
- msg(MSG::DEBUG) << "Test Pixel" << endmsg;
+ msg(MSG::DEBUG) << "Test Pixel" << endreq;
printTable(pixellut);
}
}
}
// SCT
if (!m_lutCreatorToolSCT) {
- msg(MSG::INFO) << "SCT LUT Creator not configured " << m_lutCreatorToolSCT << endmsg;
+ msg(MSG::INFO) << "SCT LUT Creator not configured " << m_lutCreatorToolSCT << endreq;
} else {
if ( m_lutCreatorToolSCT.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endmsg;
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endreq;
return StatusCode::FAILURE;
} else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endmsg;
+ msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endreq;
// compute LUT
const RegSelSiLUT* sctlut = m_lutCreatorToolSCT->getLUT();
if (!sctlut) {
- msg(MSG::ERROR) << "SCT table missing" << endmsg;
+ msg(MSG::ERROR) << "SCT table missing" << endreq;
} else if (m_doTests) {
- msg(MSG::DEBUG) << "Test SCT" << endmsg;
+ msg(MSG::DEBUG) << "Test SCT" << endreq;
printTable(sctlut);
}
}
}
// Pixel
if (!m_lutCreatorToolTRT) {
- msg(MSG::INFO) << "TRT LUT Creator not configured " << m_lutCreatorToolTRT << endmsg;
+ msg(MSG::INFO) << "TRT LUT Creator not configured " << m_lutCreatorToolTRT << endreq;
} else {
if ( m_lutCreatorToolTRT.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endmsg;
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endreq;
return StatusCode::FAILURE;
} else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endmsg;
+ msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endreq;
// compute LUT
const RegSelSiLUT* trtlut = m_lutCreatorToolTRT->getLUT();
if (!trtlut) {
- msg(MSG::ERROR) << "TRT table missing" << endmsg;
+ msg(MSG::ERROR) << "TRT table missing" << endreq;
} else if (m_doTests) {
- msg(MSG::DEBUG) << "Test TRT" << endmsg;
+ msg(MSG::DEBUG) << "Test TRT" << endreq;
printTable(trtlut);
}
}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
index c2747c5a43d3..7d3dd8ddc1a0 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
@@ -1,9 +1,12 @@
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-
+
#include "InDetRegionSelector/SiRegionSelectorTable.h"
+// #include "GaudiKernel/MsgStream.h"
+// #include "StoreGate/StoreGateSvc.h"
+
#include "CLHEP/Units/SystemOfUnits.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
@@ -35,8 +38,10 @@ SiRegionSelectorTable::SiRegionSelectorTable(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type,name,parent),
- m_regionLUT(nullptr),
+ // m_detStore(NULL),
+ m_regionLUT(NULL),
m_managerName(""),
+ m_deltaZ(168 * CLHEP::mm),
m_roiFileName("RoITable.txt"),
m_printHashId(true),
m_printTable(false),
@@ -46,6 +51,7 @@ SiRegionSelectorTable::SiRegionSelectorTable(const std::string& type,
{
declareInterface<IRegionIDLUT_Creator>(this);
declareProperty("ManagerName", m_managerName);
+ declareProperty("DeltaZ", m_deltaZ);
// The remaining properties are for debugging purposes.
declareProperty("OutputFile", m_roiFileName);
@@ -61,19 +67,20 @@ StatusCode
SiRegionSelectorTable::initialize(){
// MsgStream log(msgSvc(), name());
- // log << MSG::INFO << "initialize()" << endmsg;
- msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endmsg;
+ // log << MSG::INFO << "initialize()" << endreq;
+ msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endreq;
- msg(MSG::INFO) << "Tool Properties" << endmsg;
- msg(MSG::INFO) << " Detector Manager: " << m_managerName << endmsg;
+ msg(MSG::INFO) << "Tool Properties" << endreq;
+ msg(MSG::INFO) << " Detector Manager: " << m_managerName << endreq;
+ msg(MSG::INFO) << " DeltaZ: " << m_deltaZ/CLHEP::mm << " mm <<< NB: this parameter is now OBSOLETE" << endreq;
if( msgLvl(MSG::DEBUG) ) {
- msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endmsg;
- msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endmsg;
- msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endmsg;
+ msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endreq;
+ msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endreq;
+ msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endreq;
}
if (m_managerName.empty()) {
- msg(MSG::WARNING) << "Tool disabled." << endmsg;
+ msg(MSG::WARNING) << "Tool disabled." << endreq;
return StatusCode::FAILURE;
}
@@ -106,7 +113,7 @@ StatusCode
SiRegionSelectorTable::createTable()
{
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endmsg;
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endreq;
StatusCode sc;
@@ -116,20 +123,20 @@ SiRegionSelectorTable::createTable()
if (sc.isFailure()) {
msg(MSG::FATAL) << "Could not find the Manager: "
- << m_managerName << " !" << endmsg;
+ << m_managerName << " !" << endreq;
return StatusCode::FAILURE;
} else {
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Manager found" << endmsg;
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Manager found" << endreq;
}
if (manager->isPixel()) {
if (m_pixIdMapping.retrieve().isFailure()) {
- msg(MSG::ERROR) << "Can't get the Pixel Mapping tool." << endmsg;
+ msg(MSG::ERROR) << "Can't get the Pixel Mapping tool." << endreq;
return StatusCode::FAILURE;
}
} else { // SCT
if (m_sctCablingSvc.retrieve().isFailure()) {
- msg(MSG::ERROR) << "Can't get the SCT cabling service." << endmsg;
+ msg(MSG::ERROR) << "Can't get the SCT cabling service." << endreq;
return StatusCode::FAILURE;
}
}
@@ -152,8 +159,11 @@ SiRegionSelectorTable::createTable()
IdentifierHash hashId = element->identifyHash();
- if ( msgLvl(MSG::VERBOSE) ) msg(MSG::VERBOSE) << "Found element with HashId = " << hashId << endmsg;
+ if ( msgLvl(MSG::VERBOSE) ) msg(MSG::VERBOSE) << "Found element with HashId = " << hashId << endreq;
+ //// double etaMin,etaMax,phiMin,phiMax,rz;
+ //// element->getEtaPhiRegion(m_deltaZ,etaMin,etaMax,phiMin,phiMax,rz);
+
// new region selector detector element extent.
double rMin, rMax, zMin, zMax, phiMin, phiMax;
@@ -181,7 +191,7 @@ SiRegionSelectorTable::createTable()
robId=m_pixIdMapping->getRobID(element->identify());
}
else {
- msg(MSG::ERROR) << " could not get PixelID for " << element->getIdHelper() << endmsg;
+ msg(MSG::ERROR) << " could not get PixelID for " << element->getIdHelper() << endreq;
}
} else { // Its an SCT.
@@ -192,7 +202,7 @@ SiRegionSelectorTable::createTable()
robId=m_sctCablingSvc->getRobIdFromOfflineId(element->identify());
}
else {
- msg(MSG::ERROR) << " could not get SCT_ID for " << element->getIdHelper() << endmsg;
+ msg(MSG::ERROR) << " could not get SCT_ID for " << element->getIdHelper() << endreq;
}
}
@@ -205,18 +215,19 @@ SiRegionSelectorTable::createTable()
rd->addModule(smod);
}
else {
- msg(MSG::WARNING) << "module with RobID=0x0 - not added to look up table " << smod << endmsg;
+ msg(MSG::WARNING) << "module with RobID=0x0 - not added to look up table " << smod << endreq;
}
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << smod << endmsg;
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << smod << endreq;
if ( msgLvl(MSG::VERBOSE) ) msg(MSG::VERBOSE) << " "
+ << " deltaZ = " << m_deltaZ/CLHEP::mm << " mm, "
<< " robId = " << robId
<< " barrelEC = " << barrelEC
<< ", layerDisk = " << layerDisk
<< ", phiMin, phiMax = " << phiMin/CLHEP::degree << " " << phiMax/CLHEP::degree
<< ", rMin = " << rMin/CLHEP::mm << " mm, rMax = " << rMax/CLHEP::mm << " mm"
- << endmsg;
+ << endreq;
// if ( manager->isPixel() ) std::cout << "SUTT-DBM " << smod << std::endl;
@@ -224,7 +235,7 @@ SiRegionSelectorTable::createTable()
}
}
- msg(MSG::INFO) << " initialising new map " << endmsg;
+ msg(MSG::INFO) << " initialising new map " << endreq;
rd->initialise();
@@ -256,17 +267,17 @@ SiRegionSelectorTable::createTable()
// save new map in StoreGate RegSelSiLUT
sc = detStore()->contains< RegSelSiLUT >(newkey);
if (sc == StatusCode::SUCCESS ) {
- msg(MSG::FATAL) << " RegSelSiLUT " << newkey << " already exists " << endmsg;
+ msg(MSG::FATAL) << " RegSelSiLUT " << newkey << " already exists " << endreq;
} else {
// create and store LUT
// needs to be modifiable so we can enable/disable modules
// from the RegSelSvc
sc = detStore()->record(rd, newkey, true);
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << " could not register " << detName << " RegSelSiLUT" << endmsg;
+ msg(MSG::ERROR) << " could not register " << detName << " RegSelSiLUT" << endreq;
return( StatusCode::FAILURE );
} else {
- msg(MSG::INFO) << detName << " RegSelSiLUT successfully saved in detector Store" << endmsg;
+ msg(MSG::INFO) << detName << " RegSelSiLUT successfully saved in detector Store" << endreq;
}
}
#endif
@@ -277,7 +288,7 @@ SiRegionSelectorTable::createTable()
StatusCode SiRegionSelectorTable::finalize() {
- msg(MSG::INFO) << "finalize()" << endmsg;
+ msg(MSG::INFO) << "finalize()" << endreq;
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx
index bffa64fc0ab5..d3ddeb1b1082 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx
@@ -44,7 +44,8 @@ TRT_RegionSelectorTable::TRT_RegionSelectorTable(const std::string& type,
const IInterface* parent)
: AthAlgTool(type,name,parent),
m_TRT_IdMapping("TRT_CablingSvc", name),
- m_regionLUT(nullptr),
+ m_regionLUT(NULL),
+ m_deltaZ(168 * CLHEP::mm),
m_managerName("TRT"),
m_roiFileName("TRTRoITable.txt"),
m_printHashId(true),
@@ -52,6 +53,7 @@ TRT_RegionSelectorTable::TRT_RegionSelectorTable(const std::string& type,
{
declareInterface<IRegionIDLUT_Creator>(this);
declareProperty("ManagerName", m_managerName);
+ declareProperty("DeltaZ", m_deltaZ);
// The remaining properties are for debugging purposes.
declareProperty("OutputFile", m_roiFileName);
@@ -64,18 +66,19 @@ TRT_RegionSelectorTable::TRT_RegionSelectorTable(const std::string& type,
StatusCode TRT_RegionSelectorTable::initialize(){
// MsgStream msglog(msgSvc(), name());
- msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endmsg;
+ msg(MSG::INFO) << "initialize() " << name() << " " << PACKAGE_VERSION << endreq;
- msg(MSG::INFO) << "Tool Properties" << endmsg;
- msg(MSG::INFO) << " Detector Manager: " << m_managerName << endmsg;
+ msg(MSG::INFO) << "Tool Properties" << endreq;
+ msg(MSG::INFO) << " Detector Manager: " << m_managerName << endreq;
+ msg(MSG::INFO) << " DeltaZ: " << m_deltaZ/CLHEP::mm << " mm <<< NB: this parameter is now OBSOLETE" << endreq;
if ( msgLvl(MSG::DEBUG) ) {
- msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endmsg;
- msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endmsg;
- msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endmsg;
+ msg(MSG::DEBUG) << " Output File: " << m_roiFileName <<endreq;
+ msg(MSG::DEBUG) << " Print hashId: " << ((m_printHashId) ? "true" : "false") <<endreq;
+ msg(MSG::DEBUG) << " Print Table: " << ((m_printTable) ? "true" : "false") <<endreq;
}
if (m_managerName.empty()) {
- msg(MSG::WARNING) << "Tool disabled." << endmsg;
+ msg(MSG::WARNING) << "Tool disabled." << endreq;
return StatusCode::FAILURE;
}
@@ -102,22 +105,22 @@ RegSelSiLUT* TRT_RegionSelectorTable::getLUT() const
StatusCode
TRT_RegionSelectorTable::createTable()
{
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endmsg;
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endreq;
StatusCode sc;
// Retrieve manager
const TRT_DetectorManager* manager;
sc=detStore()->retrieve(manager, m_managerName);
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not find the Manager: "<< m_managerName << " !" << endmsg;
+ msg(MSG::FATAL) << "Could not find the Manager: "<< m_managerName << " !" << endreq;
return StatusCode::FAILURE;
} else {
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Manager found" << endmsg;
+ if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Manager found" << endreq;
}
// Get Tool Service
IToolSvc* toolSvc;
if (StatusCode::SUCCESS != service("ToolSvc", toolSvc)) {
- msg(MSG::ERROR) << " Can't get ToolSvc " << endmsg;
+ msg(MSG::ERROR) << " Can't get ToolSvc " << endreq;
return StatusCode::FAILURE;
}
@@ -125,13 +128,13 @@ TRT_RegionSelectorTable::createTable()
sc = m_TRT_IdMapping.retrieve();
if (sc != StatusCode::SUCCESS){
- msg(MSG::ERROR) << " Can't get TRTCablingSvc " << endmsg;
+ msg(MSG::ERROR) << " Can't get TRTCablingSvc " << endreq;
return StatusCode::FAILURE;
}
// Get the id helper
- const TRT_ID* idHelper = 0;
+ const TRT_ID* idHelper = NULL;
if ( detStore()->retrieve( idHelper, "TRT_ID" ).isFailure() ) {
- msg(MSG::FATAL) << "Could not get TRT ID helper" << endmsg;
+ msg(MSG::FATAL) << "Could not get TRT ID helper" << endreq;
return StatusCode::FAILURE;
}
@@ -152,8 +155,8 @@ TRT_RegionSelectorTable::createTable()
int idLayerWheel = idHelper->layer_or_wheel(id);
int idPhiModule = idHelper->phi_module(id);
int idStrawLayer = idHelper->straw_layer(id);
- const TRT_BarrelElement* Belement = nullptr;
- const TRT_EndcapElement* Eelement = nullptr;
+ const TRT_BarrelElement * Belement = NULL;
+ const TRT_EndcapElement * Eelement = NULL;
Identifier idelement;
double InnerRadiusOfStraw = 2.; //hardcoded. No method? (it will NEVER change anyway)
double phiMin,phiMax,rz;
@@ -224,7 +227,7 @@ TRT_RegionSelectorTable::createTable()
// MS: new region selector lookup table
// initialise and save the new look up table
- msg(MSG::INFO) << " initialising new trt map " << endmsg;
+ msg(MSG::INFO) << " initialising new trt map " << endreq;
rtrt->initialise();
// save pointer for access from the ToolSvc
@@ -237,15 +240,15 @@ TRT_RegionSelectorTable::createTable()
std::string newtrtKey = "TRTRegSelSiLUT";
sc = detStore()->contains< RegSelSiLUT >(newtrtKey);
if (sc == StatusCode::SUCCESS ) {
- msg(MSG::FATAL) << " TRTRegSelSiLUT " << newtrtKey << " already exists " << endmsg;
+ msg(MSG::FATAL) << " TRTRegSelSiLUT " << newtrtKey << " already exists " << endreq;
} else {
// create and store LUT
sc = detStore()->record(rtrt, newtrtKey, true);
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << " could not register trt RegSelSiLUT" << endmsg;
+ msg(MSG::ERROR) << " could not register trt RegSelSiLUT" << endreq;
return( StatusCode::FAILURE );
} else {
- msg(MSG::INFO) << "trt RegSelSiLUT successfully saved in detector Store" << endmsg;
+ msg(MSG::INFO) << "trt RegSelSiLUT successfully saved in detector Store" << endreq;
}
}
#endif
@@ -271,7 +274,7 @@ StatusCode TRT_RegionSelectorTable::execute() {
StatusCode TRT_RegionSelectorTable::finalize() {
// MsgStream msglog(msgSvc(), name());
- msg(MSG::INFO) << "finalize()" << endmsg;
+ msg(MSG::INFO) << "finalize()" << endreq;
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
index da7c3f1797ca..c131680a323b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
@@ -19,7 +19,7 @@
#include "TTree.h"
#include "TFile.h"
-#define endmsg endmsg
+#define endreq endmsg
class AnalysisConfig_Ntuple : public T_AnalysisConfig<IHLTMonTool> {
@@ -52,10 +52,23 @@ public:
m_doVertices(false),
m_doMuons(false),
m_doMuonsSP(false),
+ m_doElectrons(false),
+ m_doElectrons_tightCB(false),
+ m_doElectrons_mediumCB(false),
+ m_doElectrons_looseCB(false),
+ m_doElectrons_tightLH(false),
+ m_doElectrons_mediumLH(false),
+ m_doElectrons_looseLH(false),
m_electronType(),
m_rawElectrons(),
- m_tauType(),
- m_tauProngs(),
+ m_doTaus_1Prong(false),
+ m_doTaus_tight_1Prong(false),
+ m_doTaus_medium_1Prong(false),
+ m_doTaus_loose_1Prong(false),
+ m_doTaus_3Prong(false),
+ m_doTaus_tight_3Prong(false),
+ m_doTaus_medium_3Prong(false),
+ m_doTaus_loose_3Prong(false),
m_doBjets(false),
m_hasTruthMap(false),
m_tauEtCutOffline(tauEtCutOffline),
@@ -69,10 +82,11 @@ public:
for ( unsigned i=0 ; i<chainNames.size() ; i++ ) {
if ( chainNames[i] != "Offline" &&
- chainNames[i] != "Muons" &&
- chainNames[i] != "Bjets" &&
chainNames[i].find("Electrons")!=0 &&
- chainNames[i].find("Taus")!=0 ) {
+ chainNames[i] != "Muons" &&
+ chainNames[i] != "Taus_1Prong" &&
+ chainNames[i] != "Taus_3Prong" &&
+ chainNames[i] != "Bjets" ) {
// std::cout << "AnalysisConfig_Ntuple: chain[" << i << "] " << chainNames[i] << std::endl;
@@ -87,19 +101,39 @@ public:
if ( chainNames[i]=="Offline" ) m_doOffline = true;
if ( chainNames[i]=="Vertex" ) m_doVertices = true;
- if ( chainNames[i]=="Muons" ) m_doMuons = true;
- if ( chainNames[i]=="MuonsSP" ) m_doMuonsSP = true;
+
if ( chain.head()=="Electrons" ) {
- m_electronType.push_back(chain.tail());
- m_rawElectrons.push_back(chain.extra());
+
+ // m_doElectrons = true;
+
+ if ( chain.tail()!="" || chain.extra()!="" ) {
+ // std::cout << "\telectrons.head " << chain.head() << std::endl;
+ // std::cout << "\telectrons.tail " << chain.tail() << std::endl;
+ // std::cout << "\telectrons.extra " << chain.extra() << std::endl;
+
+ m_electronType.push_back(chain.tail());
+ m_rawElectrons.push_back(chain.extra());
+ }
}
- if ( chain.head()=="Taus" ) {
- m_tauType.push_back(chain.tail());
- m_tauProngs.push_back(chain.extra());
- }
-
+ if ( chainNames[i]=="Electrons" ) m_doElectrons = true;
+ if ( chainNames[i]=="Electrons_TightCB" ) m_doElectrons_tightCB = true;
+ if ( chainNames[i]=="Electrons_MediumCB" ) m_doElectrons_mediumCB = true;
+ if ( chainNames[i]=="Electrons_LooseCB" ) m_doElectrons_looseCB = true;
+ if ( chainNames[i]=="Electrons_TightLH" ) m_doElectrons_tightLH = true;
+ if ( chainNames[i]=="Electrons_MediumLH" ) m_doElectrons_mediumLH = true;
+ if ( chainNames[i]=="Electrons_LooseLH" ) m_doElectrons_looseLH = true;
+ if ( chainNames[i]=="Muons" ) m_doMuons = true;
+ if ( chainNames[i]=="MuonsSP" ) m_doMuonsSP = true;
+ if ( chainNames[i]=="Taus_1Prong" ) m_doTaus_1Prong = true;
+ if ( chainNames[i]=="Taus_Tight_1Prong" ) m_doTaus_tight_1Prong = true;
+ if ( chainNames[i]=="Taus_Medium_1Prong" ) m_doTaus_medium_1Prong = true;
+ if ( chainNames[i]=="Taus_Loose_1Prong" ) m_doTaus_loose_1Prong = true;
+ if ( chainNames[i]=="Taus_3Prong" ) m_doTaus_3Prong = true;
+ if ( chainNames[i]=="Taus_Tight_3Prong" ) m_doTaus_tight_3Prong = true;
+ if ( chainNames[i]=="Taus_Medium_3Prong" ) m_doTaus_medium_3Prong = true;
+ if ( chainNames[i]=="Taus_Loose_3Prong" ) m_doTaus_loose_3Prong = true;
if ( chainNames[i]=="Bjets" ) m_doBjets = true;
}
m_event = new TIDA::Event();
@@ -139,12 +173,25 @@ protected:
bool m_doMuons;
bool m_doMuonsSP;
+ bool m_doElectrons;
+ bool m_doElectrons_tightCB;
+ bool m_doElectrons_mediumCB;
+ bool m_doElectrons_looseCB;
+ bool m_doElectrons_tightLH;
+ bool m_doElectrons_mediumLH;
+ bool m_doElectrons_looseLH;
+
std::vector<std::string> m_electronType;
std::vector<std::string> m_rawElectrons;
- std::vector<std::string> m_tauType;
- std::vector<std::string> m_tauProngs;
-
+ bool m_doTaus_1Prong;
+ bool m_doTaus_tight_1Prong;
+ bool m_doTaus_medium_1Prong;
+ bool m_doTaus_loose_1Prong;
+ bool m_doTaus_3Prong;
+ bool m_doTaus_tight_3Prong;
+ bool m_doTaus_medium_3Prong;
+ bool m_doTaus_loose_3Prong;
bool m_doBjets;
bool m_hasTruthMap;
bool m_tauEtCutOffline;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
index 0f402a9cd411..a520fa022a14 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
@@ -86,7 +86,7 @@
// the xAOD::TrackParticle header if it exists
#include "TrkParticleCreator/TrackParticleCreatorTool.h"
-#define endmsg endmsg
+#define endreq endmsg
template<typename T>
@@ -177,7 +177,7 @@ public:
/// doesn't work yet
// void verbose( std::ostream& s ) {
- // if( m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << s << endmsg;
+ // if( m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << s << endreq;
// }
protected:
@@ -201,7 +201,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 << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::loop() for " << T_AnalysisConfig<T>::m_analysisInstanceName << endreq;
}
// get (offline) beam position
@@ -220,7 +220,7 @@ protected:
# endif
if(m_provider->msg().level() <= MSG::VERBOSE) {
- m_provider->msg(MSG::VERBOSE) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endreq;
}
}
@@ -229,14 +229,14 @@ protected:
if ( first ) {
- m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endmsg;
+ m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << endreq;
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] << endmsg;
+ m_provider->msg(MSG::INFO) << "Chain " << configuredChains[i] << endreq;
}
}
@@ -258,7 +258,7 @@ protected:
/// get chain
ChainString& chainName = (*chainitr);
- m_provider->msg(MSG::INFO) << "process chain " << chainName << "\traw: " << chainitr->raw() << endmsg;
+ m_provider->msg(MSG::INFO) << "process chain " << chainName << "\traw: " << chainitr->raw() << endreq;
/// check for wildcard ...
// if ( chainName.head().find("*")!=std::string::npos ) {
@@ -273,7 +273,7 @@ protected:
// std::cout << "selected chains " << selectChains.size() << std::endl;
- // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endmsg;
+ // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endreq;
for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) {
@@ -298,7 +298,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() << ")" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << ")" << endreq;
}
}
// else {
@@ -311,7 +311,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] << endmsg;
+ for ( unsigned ic=0 ; ic<m_chainNames.size() ; ic++ ) m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endreq;
} /// end of first event setup
@@ -366,7 +366,7 @@ protected:
double mu_val = 0;
if ( m_provider->evtStore()->retrieve(pEventInfo).isFailure() ) {
- m_provider->msg(MSG::WARNING) << "Failed to get EventInfo " << endmsg;
+ m_provider->msg(MSG::WARNING) << "Failed to get EventInfo " << endreq;
} else {
#ifndef XAODTRACKING_TRACKPARTICLE_H
@@ -389,12 +389,12 @@ protected:
if(m_provider->msg().level() <= MSG::VERBOSE){
m_provider->msg(MSG::VERBOSE) << "run " << run_number
<< "\tevent " << event_number
- << "\tlb " << lumi_block << endmsg;
+ << "\tlb " << lumi_block << endreq;
}
// m_provider->msg(MSG::INFO) << "run " << run_number
// << "\tevent " << event_number
- // << "\tlb " << lumi_block << endmsg;
+ // << "\tlb " << lumi_block << endreq;
// std::cout << "run " << run_number << "\tevent " << event_number << "\tlb " << lumi_block << std::endl;
@@ -428,7 +428,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) << endmsg;
+ << "\tpres " << (*m_tdt)->getPrescale(chainname) << endreq;
}
// std::cout << "Chain " << chainname << "\tpass " << (*m_tdt)->isPassed(chainname)
@@ -445,14 +445,14 @@ protected:
first = false;
if ( (*m_tdt)->ExperimentalAndExpertMethods()->isHLTTruncated() ) {
- m_provider->msg(MSG::WARNING) << "HLTResult truncated, skipping event" << endmsg;
+ m_provider->msg(MSG::WARNING) << "HLTResult truncated, skipping event" << endreq;
return;
}
if ( !this->m_keepAllEvents && !analyse ) {
- // m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endmsg;
+ m_provider->msg(MSG::INFO) << "No chains passed unprescaled - not processing this event" << endreq;
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "No chains passed unprescaled - not processing this event" << endreq;
return;
}
@@ -461,21 +461,21 @@ protected:
selectorTruth.clear();
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endreq;
const TrigInDetTrackTruthMap* truthMap = 0;
if ( m_mcTruth ) {
- if(m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg;
+ if(m_provider->msg().level() <= MSG::VERBOSE ) m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq;
if ( m_provider->evtStore()->retrieve(truthMap, "TrigInDetTrackTruthMap").isFailure()) {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap not found" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap not found" << endreq;
m_hasTruthMap = false;
}
else {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap found" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "TrigInDetTrackTruthMap found" << endreq;
m_hasTruthMap = true;
}
}
@@ -499,7 +499,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" << endmsg;
+ m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endreq;
}
else {
VxContainer::const_iterator vtxitr = primaryVtxCollection->begin();
@@ -522,17 +522,17 @@ protected:
//std::vector<TIDA::Vertex> vertices;
- m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endmsg;
+ m_provider->msg(MSG::INFO) << "fetching AOD Primary vertex container" << endreq;
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" << endmsg;
+ m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endreq;
}
if ( xaodVtxCollection!=0 ) {
- m_provider->msg(MSG::VERBOSE) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg;
+ m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endreq;
xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin();
for ( ; vtxitr != xaodVtxCollection->end(); vtxitr++ ) {
@@ -571,7 +571,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] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "vertex " << i << " " << vertices[i] << endreq;
m_event->addVertex(vertices[i]);
}
}
@@ -632,13 +632,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) << endmsg;
+ << "\tprescale " << (*m_tdt)->getPrescale(chainname) << endreq;
- m_provider->msg(MSG::VERBOSE) << "fetching features for chain " << chainname << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "fetching features for chain " << chainname << endreq;
}
if(m_provider->msg().level() <= MSG::VERBOSE){
- m_provider->msg(MSG::VERBOSE) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << endmsg;
+ m_provider->msg(MSG::VERBOSE) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << endreq;
}
// std::cout << "\tstatus for chain " << chainname
@@ -647,7 +647,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 << endmsg;
+ // m_provider->msg(MSG::INFO) << chainname << "\tpassed: " << (*m_tdt)->isPassed( chainname ) << "\t" << m_chainNames[ichain] << "\trun " << run_number << "\tevent " << event_number << endreq;
if ( !this->m_keepAllEvents && !(*m_tdt)->isPassed( chainname, decisiontype ) ) continue;
@@ -667,13 +667,13 @@ protected:
if ( c==cEnd ) {
if(m_provider->msg().level() <= MSG::VERBOSE){
- m_provider->msg(MSG::VERBOSE) << "No combinations: skipping this chain " << chainname << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "No combinations: skipping this chain " << chainname << endreq;
}
continue;
}
if(m_provider->msg().level() <= MSG::VERBOSE) {
- m_provider->msg(MSG::VERBOSE) << "combinations for chain " << chainname << " " << (cEnd-c) << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "combinations for chain " << chainname << " " << (cEnd-c) << endreq;
}
ChainString& chainConfig = m_chainNames[ichain];
@@ -724,7 +724,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" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " More than one initial RoI found for seeded chain " << chainname << ": not yet supported" << endreq;
continue;
}
@@ -734,7 +734,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 << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " RoI descriptor for seeded chain " << chainname << " " << *roid << endreq;
roiInfo = new TIDARoiDescriptor(TIDARoiDescriptorBuilder(*roid));
// roiInfo->etaHalfWidth(m_roiInfo->etaHalfWidth());
@@ -744,7 +744,7 @@ protected:
// roiInfo->zedHalfWidth(roid->zedHalfWidth());
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "using chain roi " << *roid << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "using chain roi " << *roid << endreq;
}
else {
@@ -754,16 +754,16 @@ protected:
// roiInfo->zedHalfWidth(m_roiInfo->zedHalfWidth());
if(m_provider->msg().level() <= MSG::WARNING)
- m_provider->msg(MSG::WARNING) << "roi not found" << endmsg;
+ m_provider->msg(MSG::WARNING) << "roi not found" << endreq;
}
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << *roiInfo << endmsg;
+ m_provider->msg(MSG::VERBOSE) << *roiInfo << endreq;
m_selectorTest->clear();
- m_provider->msg(MSG::VERBOSE) << "Searching for collection " << key << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Searching for collection " << key << endreq;
// std::cout << "Searching for collection " << key << std::endl;
/// HLT and EF-like EDM
@@ -781,7 +781,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" << endmsg;
+ //m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endreq;
}
}
else {
@@ -793,22 +793,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" << endmsg;
+ else m_provider->msg(MSG::WARNING) << "No track collection " << key << " found" << endreq;
}
}
const std::vector<TIDA::Track*>& testtracks = m_selectorTest->tracks();
- m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endreq;
// 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() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "test tracks.size() " << testtracks.size() << endreq;
for ( int ii=testtracks.size() ; ii-- ; ) {
- m_provider->msg(MSG::VERBOSE) << " test track " << ii << " " << *testtracks[ii] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " test track " << ii << " " << *testtracks[ii] << endreq;
//test_tracks.push_back(testtracks.at(ii));
}
}
@@ -827,22 +827,22 @@ protected:
if ( vtx_name!="" ) {
- m_provider->msg(MSG::VERBOSE) << "\tFetch xAOD::VertexContainer for chain " << chainConfig << " with key " << vtx_name << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "\tFetch xAOD::VertexContainer for chain " << chainConfig << " with key " << vtx_name << endreq;
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 << endmsg;
+ m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainConfig << " for key " << vtx_name << endreq;
}
else {
- m_provider->msg(MSG::VERBOSE) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endreq;
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 << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "\t" << iv << " xAOD VxContainer for " << chainConfig << " " << vert << " key " << vtx_name << endreq;
xAOD::VertexContainer::const_iterator vtxitr = vert->begin();
@@ -873,7 +873,7 @@ protected:
}
if(m_provider->msg().level() <= MSG::VERBOSE) {
- m_provider->msg(MSG::VERBOSE) << "event: " << *m_event << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "event: " << *m_event << endreq;
}
@@ -906,7 +906,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 << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "MC Truth flag " << m_mcTruth << endreq;
bool foundTruth = false;
@@ -918,7 +918,7 @@ protected:
selectorTruth.clear();
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq;
if (m_provider->evtStore()->template contains<TruthParticleContainer>("INav4MomTruthEvent")) {
//ESD
@@ -937,13 +937,13 @@ protected:
}
else
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "Truth not found - none whatsoever!" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Truth not found - none whatsoever!" << endreq;
}
if ( !m_doOffline && m_mcTruth && !foundTruth ) {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "getting Truth" << endreq;
/// selectTracks<TruthParticleContainer>( &selectorTruth, "INav4MomTruthEvent" );
@@ -959,27 +959,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] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Try McEventCollection: " << keys[ik] << endreq;
}
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] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "No McEventCollection: " << keys[ik] << endreq;
continue;
}
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "evtStore()->retrieve( mcevent, " << keys[ik] << " )" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "evtStore()->retrieve( mcevent, " << keys[ik] << " )" << endreq;
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] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Failed to get McEventCollection: " << keys[ik] << endreq;
}
else {
/// found this key
key = keys[ik];
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << endreq;
foundcollection = true;
break;
}
@@ -988,7 +988,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!!!" << endmsg;
+ m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endreq;
// m_tree->Fill();
// return StatusCode::FAILURE;
@@ -997,7 +997,7 @@ protected:
}
if ( m_provider->msg().level() <= MSG::VERBOSE ) {
- m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << "\tNevents " << mcevent->size() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Found McEventCollection: " << key << "\tNevents " << mcevent->size() << endreq;
}
McEventCollection::const_iterator evitr = mcevent->begin();
@@ -1035,15 +1035,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)" << endmsg;
+ // m_provider->msg(MSG::VERBOSE) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endreq;
++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 << endmsg;
- m_provider->msg(MSG::VERBOSE) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg;
+ 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;
}
if(selectorTruth.size() > 0) foundTruth = true;
@@ -1053,7 +1053,7 @@ protected:
if ( !(ip>0) ) {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endmsg;
+ m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endreq;
return; /// need to be careful here, if not requiring truth *only* should not return
}
@@ -1063,7 +1063,7 @@ protected:
/// get offline tracks
- // m_provider->msg(MSG::VERBOSE) << " Offline tracks " << endmsg;
+ // m_provider->msg(MSG::VERBOSE) << " Offline tracks " << endreq;
if ( m_doOffline ) {
# ifdef XAODTRACKING_TRACKPARTICLE_H
@@ -1080,7 +1080,7 @@ protected:
}
# endif
else if ( m_provider->msg().level() <= MSG::WARNING ) {
- m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endmsg;
+ m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endreq;
}
// std::cout << "seeking (more?) offline tracks..." << std::endl;
@@ -1092,9 +1092,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() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "ref tracks.size() " << m_selectorRef->tracks().size() << endreq;
for ( int ii=m_selectorRef->tracks().size() ; ii-- ; )
- m_provider->msg(MSG::VERBOSE) << " ref track " << ii << " " << *m_selectorRef->tracks()[ii] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " ref track " << ii << " " << *m_selectorRef->tracks()[ii] << endreq;
}
}
else {
@@ -1119,7 +1119,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() << endmsg;
+ m_provider->msg(MSG::INFO) << m_provider->name() << " using highest pt reference track only " << this->getUseHighestPT() << endreq;
}
/// if we want a purity, we need to swap round which tracks are the
@@ -1181,14 +1181,14 @@ protected:
m_provider->msg(MSG::INFO) << "Missing track for " << m_chainNames[ichain]
<< "\trun " << run_number
<< "\tevent " << event_number
- << "\tlb " << lumi_block << endmsg;
+ << "\tlb " << lumi_block << endreq;
}
}
}
if ( m_provider->msg().level() <= MSG::VERBOSE ) {
- m_provider->msg(MSG::VERBOSE) << "\n\nEvent " << *m_event << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "\n\nEvent " << *m_event << endreq;
}
}
@@ -1197,27 +1197,27 @@ protected:
virtual void book() {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() " << name() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() " << name() << endreq;
// 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 " << endmsg;
+ m_provider->msg(MSG::ERROR) << " failed to retrieve BeamCondSvc " << endreq;
}
// 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" << endmsg;
+ m_provider->msg(MSG::ERROR) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endreq;
// return StatusCode::FAILURE;
return;
}
if(m_provider->msg().level() <= MSG::VERBOSE) {
- m_provider->msg(MSG::VERBOSE) << " Successfully retrived the TrigDecisionTool" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " Successfully retrived the TrigDecisionTool" << endreq;
}
@@ -1225,10 +1225,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" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Configured chains" << endreq;
for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) {
if( m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << " Chain " << configuredChains[i] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << " Chain " << configuredChains[i] << endreq;
}
}
@@ -1248,7 +1248,7 @@ protected:
/// get chain
ChainString& chainName = (*chainitr);
- // m_provider->msg(MSG::VERBOSE) << "process chain " << chainName << endmsg;
+ // m_provider->msg(MSG::VERBOSE) << "process chain " << chainName << endreq;
/// check for wildcard ...
// if ( chainName.head().find("*")!=std::string::npos ) {
@@ -1264,7 +1264,7 @@ protected:
// std::cout << "selected chains " << selectChains.size() << std::endl;
- // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endmsg;
+ // if ( selectChains.size()==0 ) m_provider->msg(MSG::WARNING) << "No chains matched for " << chainName << endreq;
for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) {
@@ -1279,7 +1279,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() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Matching chain " << selectChains[iselected] << " (" << chainName.head() << endreq;
}
}
// else {
@@ -1298,14 +1298,14 @@ protected:
if ( ic>0 ) {
- m_provider->msg(MSG::WARNING) << "more than one chain configured for this analysis - skipping " << m_chainNames[ic] << endmsg;
+ m_provider->msg(MSG::WARNING) << "more than one chain configured for this analysis - skipping " << m_chainNames[ic] << endreq;
continue;
}
- m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "Analyse chain " << m_chainNames[ic] << endreq;
- // m_provider->msg(MSG::VERBOSE) << "--------------------------------------------------" << endmsg;
+ // m_provider->msg(MSG::VERBOSE) << "--------------------------------------------------" << endreq;
std::string folder_name = "";
@@ -1324,8 +1324,6 @@ protected:
if( m_testType != "" ) folder_name = folder_name + "/" + m_testType;
std::string mongroup;
-
-
if ( name().find("Shifter")!=std::string::npos ) {
/// shifter histograms - do not encode chain names
@@ -1340,11 +1338,9 @@ protected:
if ( m_chainNames.at(ic).vtx()!="" ) mongroup += "/" + m_chainNames.at(ic).vtx();
- // std::cout << "\n SUTT " << name() << std::endl;
-
// std::cout << "\n SUTT chain " << m_chainNames.at(ic) << "\tvtx " << m_chainNames.at(ic).vtx() << "\tmongroup " << mongroup << std::endl;
- }
+ }
else {
/// these are the Expert / non-Shifter histograms - encode the full chain names
@@ -1385,7 +1381,7 @@ protected:
// std::cout << "SUTT chain " << "\tvtx " << m_chainNames.at(ic).vtx() << "\tmongroup " << mongroup << std::endl;
- m_provider->msg(MSG::VERBOSE) << " book mongroup " << mongroup << endmsg;
+ m_provider->msg(MSG::INFO) << " book mongroup " << mongroup << endreq;
# ifdef ManagedMonitorToolBase_Uses_API_201401
m_provider->addMonGroup( new ManagedMonitorToolBase::MonGroup( m_provider, mongroup, ManagedMonitorToolBase::run ) );
@@ -1425,7 +1421,7 @@ protected:
}
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() done" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::book() done" << endreq;
}
@@ -1436,14 +1432,14 @@ protected:
virtual void finalize() {
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::finalise() " << m_provider->name() << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "AnalysisConfig_Tier0::finalise() " << m_provider->name() << endreq;
m_analysis->finalise();
- m_provider->msg(MSG::INFO) << m_provider->name() << " NRois processed: " << m_NRois << "\tRef tracks: " << m_NRefTracks << "\tTestTracks: " << m_NTestTracks << endmsg;
+ m_provider->msg(MSG::INFO) << m_provider->name() << " NRois processed: " << m_NRois << "\tRef tracks: " << m_NRefTracks << "\tTestTracks: " << m_NTestTracks << endreq;
if(m_provider->msg().level() <= MSG::VERBOSE)
- m_provider->msg(MSG::VERBOSE) << m_provider->name() << " finalised" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << m_provider->name() << " finalised" << endreq;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
index 8588a1583828..d5c795f30623 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() " << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::addHistogram() " << endreq;
IHLTMonTool::addHistogram( h );
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h
index 047122719103..70c30d016da0 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() " << endmsg;
+ msg(MSG::INFO) << "TrigTestPhysValMon::addHistogram() " << endreq;
if (regHist(h, m_sliceTag+system, run).isFailure()) {
- msg(MSG::ERROR) << "TrigTestPhysValMon::addHistorgram() failed to add histogram" << endmsg;
+ msg(MSG::ERROR) << "TrigTestPhysValMon::addHistorgram() failed to add histogram" << endreq;
}
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
index 6c4ae59124f3..a8bc92e503c6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
@@ -6,7 +6,7 @@
//
// Copyright (C) 2010 M.Sutton (sutt@cern.ch)
-
+// McParticleEvent includes
#include <cstdio>
#include <sys/time.h>
@@ -63,7 +63,7 @@
#include "TrkParticleCreator/TrackParticleCreatorTool.h"
-#define endmsg endmsg
+#define endreq endmsg
bool tida_first = true;
@@ -121,16 +121,13 @@ 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" << endmsg;
+ << " compiled " << __DATE__ << " " << __TIME__ << "\t: " << date() << "[m" << endreq;
// get (offline) beam position
double xbeam = 0;
double ybeam = 0;
double zbeam = 0;
std::vector<double> beamline;
-
- bool foundOffline = false;
-
if ( m_iBeamCondSvc ) {
#ifdef EIGEN_GEOMETRY_MODULE_H
@@ -144,14 +141,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 <<endmsg;
+ m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam <<endreq;
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] << endmsg;
+ m_provider->msg(MSG::INFO) << " beamline values : " << beamline[0] << "\t" << beamline[1] << "\t" << beamline[2] << endreq;
}
else {
- m_provider->msg(MSG::INFO) << " could not find BeamCondSvc " << endmsg;
+ m_provider->msg(MSG::INFO) << " could not find BeamCondSvc " << endreq;
}
// get (online) beam position
@@ -182,14 +179,14 @@ void AnalysisConfig_Ntuple::loop() {
m_provider->msg(MSG::INFO) << " using online beam position"
<< "\tx=" << xbeam_online
<< "\ty=" << ybeam_online
- << "\tz=" << zbeam_online << endmsg;
+ << "\tz=" << zbeam_online << endreq;
}
else {
- m_provider->msg(MSG::INFO) << " could not find OnlineBeamCondSvc " << endmsg;
+ m_provider->msg(MSG::INFO) << " could not find OnlineBeamCondSvc " << 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;
+ 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;
/// list the configured chains
@@ -201,9 +198,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endreq;
for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) {
- m_provider->msg(MSG::INFO) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endmsg;
+ m_provider->msg(MSG::INFO) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endreq;
configuredHLTChains.insert( configuredChains[i] );
}
@@ -252,7 +249,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endreq;
}
@@ -314,7 +311,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 " << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Failed to get EventInfo " << endreq;
}
else {
#if 0
@@ -336,7 +333,7 @@ void AnalysisConfig_Ntuple::loop() {
m_provider->msg(MSG::INFO) << "run " << run_number
<< "\tevent " << event_number
- << "\tlb " << lumi_block << endmsg;
+ << "\tlb " << lumi_block << endreq;
m_event->run_number(run_number);
m_event->event_number(event_number);
@@ -367,26 +364,26 @@ void AnalysisConfig_Ntuple::loop() {
<< "L2 pass " << L2chain->isPassed() << "\t"
<< "EF pass " << EFchain->isPassed() << "\t"
<< "HLT pass " << HLTchain->isPassed() << "[m"
- << endmsg;
+ << endreq;
std::vector<std::string> _conf = (*m_tdt)->getListOfTriggers("HLT_.*");
- m_provider->msg(MSG::INFO) << endmsg;
- m_provider->msg(MSG::INFO) << "configured chains " << _conf.size() << endmsg;
+ m_provider->msg(MSG::INFO) << endreq;
+ m_provider->msg(MSG::INFO) << "configured chains " << _conf.size() << endreq;
#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" << endmsg;
- else m_provider->msg(MSG::INFO) << " Configured Chain " << _conf[ic] << " " << p << "\t not passed" << endmsg;
+ 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;
}
- m_provider->msg(MSG::INFO) << endmsg;
+ m_provider->msg(MSG::INFO) << endreq;
#endif
///////////////////////////////////////////////////////////////////////////////
@@ -399,6 +396,7 @@ void AnalysisConfig_Ntuple::loop() {
bool analyse = false;
// bool analyse = true;
+
unsigned _decisiontype = TrigDefs::Physics;
if ( requireDecision() ) _decisiontype = TrigDefs::requireDecision;
@@ -410,7 +408,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endreq;
int npassed = 0;
@@ -448,7 +446,7 @@ void AnalysisConfig_Ntuple::loop() {
for ( unsigned iv=0 ; iv<2 ; iv++ ) {
std::vector< Trig::Feature<xAOD::VertexContainer> > fvtx = comb->get<xAOD::VertexContainer>( vnames[iv] );
- // std::cout << "SUTT " << chainName << "\t" << iv << "\txAOD::VertexContainer " << vnames[iv] << "\tsize: " << fvtx.size() << std::endl;
+ std::cout << "SUTT " << chainName << "\t" << iv << "\txAOD::VertexContainer " << vnames[iv] << "\tsize: " << fvtx.size() << std::endl;
for ( unsigned ivt=0 ; ivt<fvtx.size() ; ivt++ ) {
@@ -471,11 +469,12 @@ void AnalysisConfig_Ntuple::loop() {
}
- // std::cout << "[91;1m" << "SUTT npassed triggers = " << npassed << std::endl;
- // for ( unsigned i=0 ; i<passed.size() ; i++ ) {
- // std::cout << "\tSUTT passed chain " << passed[i] << "\t(event " << event_number << ")" << std::endl;
- // }
- // std::cout << "[m" << std::endl;
+ std::cout << "[91;1m" << "SUTT npassed triggers = " << npassed << std::endl;
+ for ( unsigned i=0 ; i<passed.size() ; i++ ) {
+ std::cout << "\tSUTT passed chain " << passed[i] << "\t(event " << event_number << ")" << std::endl;
+ }
+
+ std::cout << "[m" << std::endl;
}
#endif
@@ -487,10 +486,10 @@ void AnalysisConfig_Ntuple::loop() {
int passed_chains = 0;
- m_provider->msg(MSG::INFO) << "Checking " << m_chainNames.size() << " chains" << endmsg;
+ m_provider->msg(MSG::INFO) << "Checking " << m_chainNames.size() << " chains" << endreq;
if ( m_chainNames.empty() ) {
- m_provider->msg(MSG::WARNING) << "No chains to check" << endmsg;
+ m_provider->msg(MSG::WARNING) << "No chains to check" << endreq;
// return;
}
@@ -499,7 +498,7 @@ void AnalysisConfig_Ntuple::loop() {
// Only for trigger chains
- // m_provider->msg(MSG::INFO) << "\tchain " << chainName << endmsg;
+ // m_provider->msg(MSG::INFO) << "\tchain " << chainName << endreq;
if (chainName.find("L2") == std::string::npos &&
@@ -509,7 +508,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"
- << endmsg;
+ << endreq;
continue;
}
@@ -520,14 +519,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" << endmsg;
+ // << "\tpass " << _chain->isPassed() << "\tCH FIXED" << endreq;
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 << " ) " << endmsg;
+ << "\t: ( pass " << (*m_tdt)->isPassed(chainName, _decisiontype ) << "\tdec type " << _decisiontype << " ) " << endreq;
// if ( (*m_tdt)->isPassed(chainName) ) {
@@ -540,15 +539,14 @@ void AnalysisConfig_Ntuple::loop() {
- /// bomb out if no chains passed and not told to keep all events and found no
- /// offline objects
- if ( !analyse && !m_keepAllEvents && !foundOffline ) {
- m_provider->msg(MSG::INFO) << "No chains passed unprescaled - not processing this event: " << run_number << " " << event_number << " " << lumi_block << endmsg;
+ /// 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;
return;
}
- m_provider->msg(MSG::INFO) << "Chains passed " << passed_chains << endmsg;
+ m_provider->msg(MSG::INFO) << "Chains passed " << passed_chains << endreq;
/// for Monte Carlo get the truth particles if requested to do so
@@ -557,17 +555,17 @@ void AnalysisConfig_Ntuple::loop() {
selectorTruth.clear();
- m_provider->msg(MSG::INFO) << "MC Truth flag " << m_mcTruth << endmsg;
+ m_provider->msg(MSG::INFO) << "MC Truth flag " << m_mcTruth << endreq;
const TrigInDetTrackTruthMap* truthMap = 0;
bool foundTruth = false;
if ( m_mcTruth && m_TruthPdgId!=15) {
- m_provider->msg(MSG::INFO) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::INFO) << "getting Truth" << endreq;
if ( m_provider->evtStore()->retrieve(truthMap, "TrigInDetTrackTruthMap").isFailure()) {
- // m_provider->msg(MSG::WARNING) << "TrigInDetTrackTruthMap not found" << endmsg;
+ // m_provider->msg(MSG::WARNING) << "TrigInDetTrackTruthMap not found" << endreq;
m_hasTruthMap = false;
}
else {
- m_provider->msg(MSG::INFO) << "TrigInDetTrackTruthMap found" << endmsg;
+ m_provider->msg(MSG::INFO) << "TrigInDetTrackTruthMap found" << endreq;
m_hasTruthMap = true;
}
if (m_provider->evtStore()->contains<TruthParticleContainer>("INav4MomTruthEvent")) {
@@ -586,7 +584,7 @@ void AnalysisConfig_Ntuple::loop() {
foundTruth = true;
}
else {
- m_provider->msg(MSG::WARNING) << "Truth not found - none whatsoever!" << endmsg;
+ m_provider->msg(MSG::WARNING) << "Truth not found - none whatsoever!" << endreq;
}
}
@@ -598,7 +596,7 @@ void AnalysisConfig_Ntuple::loop() {
if ( m_mcTruth && !foundTruth ) {
- m_provider->msg(MSG::INFO) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::INFO) << "getting Truth" << endreq;
/// selectTracks<TruthParticleContainer>( &selectorTruth, "INav4MomTruthEvent" );
@@ -614,22 +612,22 @@ void AnalysisConfig_Ntuple::loop() {
for ( int ik=0 ; ik<4 ; ik++ ) {
- m_provider->msg(MSG::INFO) << "Try McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::INFO) << "Try McEventCollection: " << collectionNames[ik] << endreq;
if (!m_provider->evtStore()->contains<McEventCollection>(collectionNames[ik]) ) {
- m_provider->msg(MSG::INFO) << "No McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::INFO) << "No McEventCollection: " << collectionNames[ik] << endreq;
continue;
}
- m_provider->msg(MSG::INFO) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endmsg;
+ m_provider->msg(MSG::INFO) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endreq;
if ( m_provider->evtStore()->retrieve( mcevent, collectionNames[ik] ).isFailure() ) {
- m_provider->msg(MSG::INFO) << "Failed to get McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::INFO) << "Failed to get McEventCollection: " << collectionNames[ik] << endreq;
}
else {
// found this collectionName
collectionName = collectionNames[ik];
- m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << endmsg;
+ m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << endreq;
foundcollection = true;
break;
}
@@ -638,7 +636,7 @@ void AnalysisConfig_Ntuple::loop() {
// not found any collection
if ( !foundcollection ) {
- m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endmsg;
+ m_provider->msg(MSG::WARNING) << "No MC Truth Collections of any sort, whatsoever!!!" << endreq;
// m_tree->Fill();
@@ -657,7 +655,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() << endmsg;
+ m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << "\tNevents " << mcevent->size() << endreq;
/// count the number of interactions of each sort
/// this is actually *very stupid*, there are a *lot*
@@ -716,20 +714,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)" << endmsg;
+ // m_provider->msg(MSG::INFO) << "Found " << ie << "\tpid " << pid << "\t with " << ip << " TruthParticles (GenParticles)" << endreq;
++ie_ip;
ip += _ip;
}
}
- m_provider->msg(MSG::INFO) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endmsg;
+ m_provider->msg(MSG::INFO) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endreq;
- m_provider->msg(MSG::INFO) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg;
+ m_provider->msg(MSG::INFO) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endreq;
////////////////////////////////////////////////////////////////////////////////////////
if ( !(ip>0) ) {
- m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endmsg;
+ m_provider->msg(MSG::WARNING) << "NO TRUTH PARTICLES - returning" << endreq;
return; /// need to be careful here, if not requiring truth *only* should not return
}
@@ -745,7 +743,7 @@ void AnalysisConfig_Ntuple::loop() {
/// get offline tracks
- m_provider->msg(MSG::INFO) << " Offline tracks " << endmsg;
+ m_provider->msg(MSG::INFO) << " Offline tracks " << endreq;
selectorRef.clear();
@@ -759,7 +757,7 @@ void AnalysisConfig_Ntuple::loop() {
selectTracks<Rec::TrackParticleContainer>( &selectorRef, "TrackParticleCandidate" );
}
else {
- m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endmsg;
+ m_provider->msg(MSG::WARNING) << " Offline tracks not found " << endreq;
}
@@ -771,7 +769,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" << endmsg;
+ m_provider->msg(MSG::WARNING) << "Primary vertex container not found" << endreq;
}
else {
VxContainer::const_iterator vtxitr = primaryVtxCollection->begin();
@@ -806,17 +804,17 @@ void AnalysisConfig_Ntuple::loop() {
// std::vector<TIDA::Vertex> vertices;
- m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endreq;
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" << endmsg;
+ m_provider->msg(MSG::WARNING) << "xAOD Primary vertex container not found with key " << "PrimaryVertices" << endreq;
}
if ( xaodVtxCollection!=0 ) {
- m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg;
+ m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endreq;
xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin();
for ( ; vtxitr != xaodVtxCollection->end(); vtxitr++ ) {
@@ -860,7 +858,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] << endmsg;
+ m_provider->msg(MSG::INFO) << "vertex " << i << " " << vertices[i] << endreq;
m_event->addVertex(vertices[i]);
}
@@ -870,7 +868,8 @@ void AnalysisConfig_Ntuple::loop() {
int Noff = 0;
int Nmu = 0;
int Nel = 0;
- int Ntau = 0;
+ int Ntau1 = 0;
+ int Ntau3 = 0;
/// now add the offline vertices
@@ -905,8 +904,8 @@ void AnalysisConfig_Ntuple::loop() {
Noff = selectorRef.tracks().size();
- 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;
+ 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;
}
@@ -914,7 +913,7 @@ void AnalysisConfig_Ntuple::loop() {
for ( unsigned ichain=0 ; ichain<m_chainNames.size() ; ichain++ ) {
- m_provider->msg(MSG::INFO)<< "chain:\t" << m_chainNames[ichain] << endmsg;
+ m_provider->msg(MSG::INFO)<< "chain:\t" << m_chainNames[ichain] << endreq;
//std::cout << "chain:\t" << m_chainNames[ichain];
/// get the chain, collection and TE names and track index
@@ -950,7 +949,7 @@ void AnalysisConfig_Ntuple::loop() {
}
#endif
else {
- m_provider->msg(MSG::WARNING) << "\tcollection " << collectionname << " not found" << endmsg;
+ m_provider->msg(MSG::WARNING) << "\tcollection " << collectionname << " not found" << endreq;
}
if ( found ) {
@@ -971,8 +970,8 @@ void AnalysisConfig_Ntuple::loop() {
int Ntest = selectorTest.tracks().size();
- 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;
+ 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;
}
}
@@ -982,6 +981,11 @@ void AnalysisConfig_Ntuple::loop() {
"TightCB", "MediumCB", "LooseCB",
"TightLH", "MediumLH", "LooseLH" };
+ bool ElectronTypes[7] = {
+ m_doElectrons,
+ m_doElectrons_tightCB, m_doElectrons_mediumCB, m_doElectrons_looseCB,
+ m_doElectrons_tightLH, m_doElectrons_mediumLH, m_doElectrons_looseLH };
+
/// new electron selection
@@ -996,14 +1000,9 @@ void AnalysisConfig_Ntuple::loop() {
// std::cout << "\tElectrons selection " << ielec << " " << m_electronType[ielec]
// << "\t" << itype << " " << ElectronRef[itype] << "\t" << m_rawElectrons[ielec] << std::endl;
- int Nel_ = processElectrons( selectorRef, itype, ( m_rawElectrons[ielec]=="raw" ? true : false ) );
-
- if ( Nel_ < 1 ) continue;
-
- Nel += Nel_;
-
- std::string echain = std::string("Electrons");
- if ( m_electronType[ielec]!="" ) echain += "_" + m_electronType[ielec];
+ Nel += processElectrons( selectorRef, itype, ( m_rawElectrons[ielec]=="raw" ? true : false ) );
+
+ std::string echain = std::string("Electrons_") + m_electronType[ielec];
if ( m_rawElectrons[ielec]=="raw" ) echain += "_raw";
m_event->addChain( echain );
@@ -1022,16 +1021,39 @@ void AnalysisConfig_Ntuple::loop() {
}
+
+ /// old electron selection
+
+ for ( int ielec=0 ; ielec<7 ; ielec++ ) {
+ if ( ElectronTypes[ielec] ) {
+ Nel += processElectrons( selectorRef, ielec, false ); ///
+ if ( ElectronRef[ielec]=="" ) m_event->addChain( "Electrons" );
+ else m_event->addChain( std::string("oldElectrons0_")+ ElectronRef[ielec] );
+ m_event->back().addRoi(TIDARoiDescriptor(true));
+ m_event->back().back().addTracks(selectorRef.tracks());
+ if ( selectorRef.getBeamX()!=0 || selectorRef.getBeamY()!=0 || selectorRef.getBeamZ()!=0 ) {
+ std::vector<double> _beamline;
+ _beamline.push_back( selectorRef.getBeamX() );
+ _beamline.push_back( selectorRef.getBeamY() );
+ _beamline.push_back( selectorRef.getBeamZ() );
+ m_event->back().back().addUserData(_beamline);
+ }
+ else {
+ m_event->back().back().addUserData(beamline);
+ }
+ }
+ }
+
// std::cout << "doMuons " << m_doMuons << std::endl;
/// get muons
if ( m_doMuons ) {
- m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg;
+ m_provider->msg(MSG::INFO) << "fetching offline muons " << endreq;
Nmu += processMuons( selectorRef );
- m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg;
+ m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endreq;
m_event->addChain("Muons");
m_event->back().addRoi(TIDARoiDescriptor(true));
@@ -1047,8 +1069,8 @@ void AnalysisConfig_Ntuple::loop() {
m_event->back().back().addUserData(beamline);
}
- 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;
+ 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;
}
@@ -1057,53 +1079,71 @@ void AnalysisConfig_Ntuple::loop() {
/// get muons
if ( m_doMuonsSP ) {
- m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg;
+ m_provider->msg(MSG::INFO) << "fetching offline muons " << endreq;
Nmu += processMuons( selectorRef );
- m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg;
+ m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endreq;
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() << endmsg;
- for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg;
+ 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;
}
- /// new tau selection
- std::string TauRef[4] = { "", "Tight", "Medium", "Loose" };
-
- for ( size_t itau=0 ; itau<m_tauType.size() ; itau++ ) {
- /// hmm, if we stored the types as a map it would be more
- /// straightforward than having to stick all this in a loop
-
- int itype = -1;
- for ( int it=0 ; it<4 ; it++ ) if ( m_tauType[itau]==TauRef[it] ) itype = it;
- if ( itype<0 ) continue;
-
- /// use same threshold for 1 and 3 prong ??
- int requireNtracks = 0;
- if ( m_tauProngs[itau]=="3Prong" ) requireNtracks = 3;
- if ( m_tauProngs[itau]=="1Prong" ) requireNtracks = 1;
-
- int Ntau_ = processTaus( selectorRef, itype, requireNtracks, 20000 );
+ /// get one prong taus
+ std::string TauRef_1Prong[4] = {
+ "Taus_1Prong",
+ "Taus_Tight_1Prong", "Taus_Medium_1Prong", "Taus_Loose_1Prong" };
+
+ bool TauTypes_1Prong[4] = {
+ m_doTaus_1Prong,
+ m_doTaus_tight_1Prong, m_doTaus_medium_1Prong, m_doTaus_loose_1Prong };
+
+ for ( int itau=0 ; itau<4 ; itau++ ) {
+ if ( TauTypes_1Prong[itau] ) {
+ Ntau1 = processTaus( selectorRef, false, itau, 25000 );
+ m_event->addChain( TauRef_1Prong[itau] );
+ m_event->back().addRoi(TIDARoiDescriptor(true));
+ m_event->back().back().addTracks(selectorRef.tracks());
+ if ( selectorRef.getBeamX()!=0 || selectorRef.getBeamY()!=0 || selectorRef.getBeamZ()!=0 ) {
+ std::vector<double> _beamline;
+ _beamline.push_back( selectorRef.getBeamX() );
+ _beamline.push_back( selectorRef.getBeamY() );
+ _beamline.push_back( selectorRef.getBeamZ() );
+ m_event->back().back().addUserData(_beamline);
+ }
+ else {
+ m_event->back().back().addUserData(beamline);
+ }
+ }
+ }
+
- Ntau += Ntau_;
+ // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " one prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endreq;
+ //}
- if ( Ntau_ > 0 ) {
- /// only add a tau collection if there are actually the
- /// relevant taus
- std::string tchain = std::string("Taus");
- if ( m_tauType[itau] != "" ) tchain += "_" + m_tauType[itau];
- if ( m_tauProngs[itau] != "" ) tchain += "_" + m_tauProngs[itau];
-
- m_event->addChain( tchain );
+ /// get three prong taus
+ std::string TauRef_3Prong[4] = {
+ "Taus_3Prong",
+ "Taus_Tight_3Prong", "Taus_Medium_3Prong", "Taus_Loose_3Prong" };
+
+ bool TauTypes_3Prong[4] = {
+ m_doTaus_3Prong,
+ m_doTaus_tight_3Prong, m_doTaus_medium_3Prong, m_doTaus_loose_3Prong };
+
+ for ( int itau=0 ; itau<4 ; itau++ ) {
+ // See comments for doElectrons section above for possible issues with the looping
+ // funcitonality here
+ if ( TauTypes_3Prong[itau] ) {
+ Ntau3 = processTaus( selectorRef, true, 20000, itau);
+ m_event->addChain( TauRef_3Prong[itau] );
m_event->back().addRoi(TIDARoiDescriptor(true));
m_event->back().back().addTracks(selectorRef.tracks());
-
if ( selectorRef.getBeamX()!=0 || selectorRef.getBeamY()!=0 || selectorRef.getBeamZ()!=0 ) {
std::vector<double> _beamline;
_beamline.push_back( selectorRef.getBeamX() );
@@ -1116,11 +1156,15 @@ void AnalysisConfig_Ntuple::loop() {
}
}
}
-
- // std::cout << "SUTT Ntaus: " << Ntau << std::endl;
-
- if ( Nmu==0 && Noff==0 && Nel==0 && Ntau==0 ) m_provider->msg(MSG::INFO) << "No offline objects found " << endmsg;
- else foundOffline = true;
+
+ // for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " 3 prong ref tau track " << ii << " " << *selectorRef.tracks()[ii] << endreq;
+ // }
+
+
+
+ if ( Nmu==0 && Noff==0 && Nel==0 && Ntau1==0 && Ntau3==0 ) {
+ m_provider->msg(MSG::INFO) << "No offline objects found " << endreq;
+ }
// now loop over all relevant chains to get the trigger tracks...
@@ -1148,7 +1192,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 << ")"
- << endmsg;
+ << endreq;
/**
@@ -1200,11 +1244,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "\tfetching features for chain " << decisiontype << " " << chainName << "\t" << combEnd-comb << " combinations" << endreq;
}
if ( (*m_tdt)->isPassed(chainName, _decisiontype ) ) {
- m_provider->msg(MSG::INFO) << "\tfetching features for chain " << _decisiontype << "(RQ) " << chainName << "\t" << combEnd-comb << " combinations" << endmsg;
+ m_provider->msg(MSG::INFO) << "\tfetching features for chain " << _decisiontype << "(RQ) " << chainName << "\t" << combEnd-comb << " combinations" << endreq;
}
@@ -1216,12 +1260,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"
- << endmsg;
+ << endreq;
}
if ( comb==combEnd ) {
- m_provider->msg(MSG::INFO) << "\tno features for chain " << chainName << endmsg;
+ m_provider->msg(MSG::INFO) << "\tno features for chain " << chainName << endreq;
continue;
}
@@ -1236,7 +1280,7 @@ void AnalysisConfig_Ntuple::loop() {
for( ; comb!=combEnd ; ++comb) {
- m_provider->msg(MSG::INFO) << "Chain " << chainName << "\tcombination " << icomb << endmsg;
+ m_provider->msg(MSG::INFO) << "Chain " << chainName << "\tcombination " << icomb << endreq;
// std::cout << "Chain " << chainName << "\tcombination " << icomb << std::endl;;
icomb++;
@@ -1255,9 +1299,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() << 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;
+ 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;
}
}
#endif
@@ -1278,10 +1322,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() << endmsg;
+ for ( unsigned ir=0 ; ir<_rois.size() ; ir++ ) m_provider->msg(MSG::INFO) << "\t\tRetrieved roi " << roi_name << "\t" << *_rois[ir].cptr() << endreq;
}
else {
- m_provider->msg(MSG::WARNING) << "\t\tRequested roi " << roi_name << " not found" << endmsg;
+ m_provider->msg(MSG::WARNING) << "\t\tRequested roi " << roi_name << " not found" << endreq;
}
}
else {
@@ -1305,7 +1349,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "\tMore than one RoI found for seeded chain " << chainName << ": not yet supported" << endreq;
//continue;
}
@@ -1316,14 +1360,14 @@ void AnalysisConfig_Ntuple::loop() {
const TrigRoiDescriptor* roid = _rois[itmp].cptr();
- m_provider->msg(MSG::INFO) << "\tchain " << chainName << " RoI descriptor " << itmp << " " << *roid << endmsg;
+ m_provider->msg(MSG::INFO) << "\tchain " << chainName << " RoI descriptor " << itmp << " " << *roid << endreq;
if ( itmp==0 ){
TIDARoiDescriptor* roi_tmp = new TIDARoiDescriptor(TIDARoiDescriptorBuilder(*roid));
- // m_provider->msg(MSG::INFO) << "using chain roi " << *roid << endmsg;
- m_provider->msg(MSG::INFO) << "TIDARoi " << *roi_tmp << endmsg;
+ // m_provider->msg(MSG::INFO) << "using chain roi " << *roid << endreq;
+ m_provider->msg(MSG::INFO) << "TIDARoi " << *roi_tmp << endreq;
/// this should *never* be the case, and we should only run this
/// bit of code once the first time round the loop anyhow
@@ -1339,7 +1383,7 @@ void AnalysisConfig_Ntuple::loop() {
}
else {
- m_provider->msg(MSG::INFO) << "\troi not found" << endmsg;
+ m_provider->msg(MSG::INFO) << "\troi not found" << endreq;
}
// get the tracks from this roi
@@ -1347,7 +1391,7 @@ void AnalysisConfig_Ntuple::loop() {
selectorTest.clear();
- m_provider->msg(MSG::INFO) << "AC Ntple [91;1m" << endmsg;
+ m_provider->msg(MSG::INFO) << "AC Ntple [91;1m" << endreq;
//EF and HLT track EDM
@@ -1359,12 +1403,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 << 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;
+ // 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;
}
#else
- else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg;
+ else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endreq;
#endif
}
else {
@@ -1376,11 +1420,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" << endmsg;
+ else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endreq;
}
}
- m_provider->msg(MSG::INFO) << "[m" << endmsg;
+ m_provider->msg(MSG::INFO) << "[m" << endreq;
/// fetch vertices if available ...
@@ -1391,12 +1435,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 << endmsg;
+ m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endreq;
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 << endmsg;
+ m_provider->msg(MSG::INFO) << "\tNo VxContainer for chain " << chainName << " for key " << vtx_name << endreq;
}
else {
@@ -1404,7 +1448,7 @@ void AnalysisConfig_Ntuple::loop() {
const VxContainer* vert = trigvertices[iv].cptr();
- m_provider->msg(MSG::INFO) << "\t" << iv << " VxContainer for " << chainName << " " << vert << " " << vtx_name << endmsg;
+ m_provider->msg(MSG::INFO) << "\t" << iv << " VxContainer for " << chainName << " " << vert << " " << vtx_name << endreq;
VxContainer::const_iterator vtxitr = vert->begin();
@@ -1429,7 +1473,7 @@ void AnalysisConfig_Ntuple::loop() {
(*vtxitr)->recVertex().fitQuality().chiSquared(),
(*vtxitr)->recVertex().fitQuality().numberDoF() ) );
- m_provider->msg(MSG::INFO)<< "\tvertex " << tidavertices.back() << endmsg;
+ m_provider->msg(MSG::INFO)<< "\tvertex " << tidavertices.back() << endreq;
}
}
@@ -1439,22 +1483,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 << endmsg;
+ m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer for chain " << chainName << " with key " << vtx_name << endreq;
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 << endmsg;
+ m_provider->msg(MSG::WARNING) << "\tNo xAOD::VertexContainer for chain " << chainName << " for key " << vtx_name << endreq;
}
else {
- m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endmsg;
+ m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << xaodtrigvertices.size() << "\t" << vtx_name << endreq;
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 << endmsg;
+ m_provider->msg(MSG::INFO) << "\t" << iv << " xAOD VxContainer for " << chainName << " " << vert << " key " << vtx_name << endreq;
xAOD::VertexContainer::const_iterator vtxitr = vert->begin();
@@ -1480,9 +1524,9 @@ void AnalysisConfig_Ntuple::loop() {
const std::vector<TIDA::Track*>& testTracks = selectorTest.tracks();
- m_provider->msg(MSG::DEBUG) << "\ttest tracks.size() " << testTracks.size() << endmsg;
+ m_provider->msg(MSG::DEBUG) << "\ttest tracks.size() " << testTracks.size() << endreq;
for (unsigned int ii=0; ii < testTracks.size(); ii++) {
- m_provider->msg(MSG::DEBUG) << " test track " << ii << "for chain " << chainName + ":" + collectionName << " " << *testTracks[ii] << endmsg;
+ m_provider->msg(MSG::DEBUG) << " test track " << ii << "for chain " << chainName + ":" + collectionName << " " << *testTracks[ii] << endreq;
}
@@ -1496,7 +1540,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!!!" << endmsg;
+ if ( testTracks.size()>0 ) m_provider->msg(MSG::WARNING) << "\ttest tracks.size() " << testTracks.size() << "found but no roi!!!" << endreq;
roiInfo = new TIDARoiDescriptor(true);
// roiInfo->phiHalfWidth(M_PI);
// roiInfo->etaHalfWidth(3);
@@ -1518,7 +1562,7 @@ void AnalysisConfig_Ntuple::loop() {
}
- // m_provider->msg(MSG::INFO) << " done" << endmsg;
+ // m_provider->msg(MSG::INFO) << " done" << endreq;
if ( roiInfo ) delete roiInfo;
roiInfo = 0;
@@ -1526,7 +1570,7 @@ void AnalysisConfig_Ntuple::loop() {
}
- if ( m_printInfo ) m_provider->msg(MSG::INFO) << "FILL TREE\n" << (*m_event) << endmsg;
+ if ( m_printInfo ) m_provider->msg(MSG::INFO) << "FILL TREE\n" << (*m_event) << endreq;
if ( mTree ) mTree->Fill();
}
@@ -1538,13 +1582,13 @@ void AnalysisConfig_Ntuple::loop() {
void AnalysisConfig_Ntuple::book() {
- m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() name " << name() << endmsg;
+ m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() name " << name() << endreq;
/// 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() << endmsg;
+ m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() not booking " << name() << endreq;
return;
}
@@ -1553,31 +1597,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" << endmsg;
+ m_provider->msg(MSG::WARNING) << " failed to retrieve BeamCondSvc: " << "BeamCondSvc" << endreq;
}
else {
- m_provider->msg(MSG::INFO) << " successfully retrieves BeamCondSvc: " << "BeamCondSvc" << endmsg;
+ m_provider->msg(MSG::INFO) << " successfully retrieves BeamCondSvc: " << "BeamCondSvc" << endreq;
}
m_iOnlineBeamCondSvc = 0;
if ( m_provider->service( "InDetBeamSpotOnline", m_iOnlineBeamCondSvc ).isFailure() ) {
- m_provider->msg(MSG::WARNING) << " failed to retrieve Online BeamCondSvc " << "InDetBeamSpotOnline" << endmsg;
+ m_provider->msg(MSG::WARNING) << " failed to retrieve Online BeamCondSvc " << "InDetBeamSpotOnline" << endreq;
}
else {
- m_provider->msg(MSG::INFO) << " successfuly retrieved Online BeamCondSvc " << "InDetBeamSpotOnline" << endmsg;
+ m_provider->msg(MSG::INFO) << " successfuly retrieved Online BeamCondSvc " << "InDetBeamSpotOnline" << endreq;
}
// get the TriggerDecisionTool
if( m_tdt->retrieve().isFailure() ) {
- m_provider->msg(MSG::FATAL) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endmsg;
+ m_provider->msg(MSG::FATAL) << " Unable to retrieve the TrigDecisionTool: Please check job options file" << endreq;
// return StatusCode::FAILURE;
return;
}
- 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;
+ 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;
gDirectory->pwd();
@@ -1597,7 +1641,7 @@ void AnalysisConfig_Ntuple::book() {
outputFileName += file_label;
}
- m_provider->msg(MSG::INFO) << "book() Writing to file " << outputFileName << endmsg;
+ m_provider->msg(MSG::INFO) << "book() Writing to file " << outputFileName << endreq;
gDirectory->pwd();
@@ -1630,7 +1674,7 @@ void AnalysisConfig_Ntuple::book() {
first_open = false;
- m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << dir->GetName() << endmsg;
+ m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << dir->GetName() << endreq;
// std::cout << "change directory " << name() << " " << dir->GetName() << std::endl;
/// go back to original directory
@@ -1642,7 +1686,7 @@ void AnalysisConfig_Ntuple::book() {
tida_first = true;
- m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() exiting" << endmsg;
+ m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::book() exiting" << endreq;
}
@@ -1658,17 +1702,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" << endmsg;
+ m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() flagged, not finalising " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endreq;
return;
}
- m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() writing " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endmsg;
+ m_provider->msg(MSG::INFO) << "AnalysisConfig_Ntuple::finalise() writing " << m_provider->name() << "\t" << mTree->GetEntries() << " entries" << endreq;
TDirectory* directory = gDirectory;
// std::cout << "change directory " << name() << " " << mDir->GetName() << std::endl;
- m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << mDir->GetName() << endmsg;
+ m_provider->msg(MSG::DEBUG) << "change directory " << name() << " " << mDir->GetName() << endreq;
mDir->cd();
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx
index cd5d6d8076e5..1fc010d464c4 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__ << endmsg;
+ msg(MSG::INFO) << "TrigTestBase::TrigTestBase() compiled: " << __DATE__ << " " << __TIME__ << endreq;
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() << endmsg;
+ msg(MSG::INFO) << "TrigTestBase::TrigTestBase() exiting " << gDirectory->GetName() << endreq;
- // msg(MSG::INFO) << "TrigTestBase::TrigTestBase() returning: " << endmsg;
+ // msg(MSG::INFO) << "TrigTestBase::TrigTestBase() returning: " << endreq;
}
@@ -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()" << endmsg;
+ // msg(MSG::INFO) << "TrigTestBase::~TrigTestBase()" << endreq;
// 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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter init() ----- " << endreq;
- msg(MSG::INFO) << "TrigTestBase::init() " << gDirectory->GetName() << endmsg;
+ msg(MSG::INFO) << "TrigTestBase::init() " << gDirectory->GetName() << endreq;
/// 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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit init() ----- " << endreq;
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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter book() ----- " << endreq;
- msg(MSG::INFO) << "TrigTestBase::book() " << gDirectory->GetName() << endmsg;
+ msg(MSG::INFO) << "TrigTestBase::book() " << gDirectory->GetName() << endreq;
// MMTB_DEPRECATED(duff)
@@ -171,10 +171,10 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
#endif
- msg(MSG::DEBUG) << "TrigTestBase::book() buildNtuple " << m_buildNtuple
+ msg(MSG::DEBUG) << "TrigTestBase::book() SUTT buildNtuple " << m_buildNtuple
<< "\tNewEventBlock " << newEventsBlock
<< "\tNewLumiBlock " << newLumiBlock
- << "\tNewRun " << newRun << endmsg;
+ << "\tNewRun " << newRun << endreq;
/// 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" << endmsg;
+ msg(MSG::INFO) << "^[[91;1m" << "AnalysisConfig " << m_analysis_config << "^[[m" << endreq;
- msg(MSG::DEBUG) << "configuring chains: " << m_ntupleChainNames.size() << endmsg;
+ msg(MSG::DEBUG) << "configuring chains: " << m_ntupleChainNames.size() << endreq;
/// keep counters of how many efid or ftf chains have been created
@@ -228,8 +228,6 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
int shifter_l2star = 0;
int shifter_efid_run1 = 0;
- std::string lastvtx = "";
-
// if (m_analysis_config == "Tier0") {
{
std::vector<std::string> chains;
@@ -247,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() << endmsg;
+ msg(MSG::DEBUG) << "configuring chain: " << chainName.head() << "\t: " << chainName.tail() << endreq;
if ( chainName.roi()!="" ) {
- msg(MSG::DEBUG) << "trying chain: " << chainName.head()
- << "\ttracks: " << chainName.tail()
- << "\troi: " << chainName.roi()
- << endmsg;
+ msg(MSG::INFO) << "configuring chain: " << chainName.head()
+ << "\ttracks: " << chainName.tail()
+ << "\troi: " << chainName.roi()
+ << endreq;
}
else {
- msg(MSG::DEBUG) << "trying chain: " << chainName.head()
- << "\ttracks: " << chainName.tail()
- << endmsg;
+ msg(MSG::INFO) << "configuring chain: " << chainName.head()
+ << "\ttracks: " << chainName.tail()
+ << endreq;
}
/// check for configured chains only ...
@@ -273,10 +271,13 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
/// get matching chains
std::vector<std::string> selectChains = m_tdt->getListOfTriggers( chainName.head() );
+ // std::cout << "selected chains " << selectChains.size() << std::endl;
+
if ( selectChains.size()==0 ) {
- msg(MSG::DEBUG) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << " : " << chainName.tail() << "^[[m"<< endmsg;
+ msg(MSG::INFO) << "^[[91;1m" << "No chains matched\tchain input " << chainName.head() << " : " << chainName.tail() << "^[[m"<< endreq;
}
+
for ( unsigned iselected=0 ; iselected<selectChains.size() ; iselected++ ) {
if ( chainName.tail()!="" ) selectChains[iselected] += ":key="+chainName.tail();
@@ -294,42 +295,38 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
std::cout << "\tvtx: " << chainName.vtx() << std::endl;
std::cout << "\tte: " << chainName.element() << std::endl;
#endif
- int shifterChains = m_shifterChains;
- if ( chainName.vtx()=="" ) shifterChains = ( m_shifterChains>1 ? 1 : m_shifterChains );
-
+
if ( m_sliceTag.find("Shifter")!=std::string::npos ) {
/// shifter histograms
if ( chainName.tail().find("_FTF")!=std::string::npos ) {
/// FTF chain
- if ( shifter_ftf>=shifterChains ||
- ( shifter_ftf<shifterChains && chainName.vtx()!="" && chainName.vtx()==lastvtx ) ) {
- msg(MSG::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg;
+ shifter_ftf++;
+ if ( shifter_ftf>m_shifterChains ) {
+ msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq;
continue;
}
- shifter_ftf++;
- lastvtx = chainName.vtx();
}
else if ( chainName.tail().find("_IDTrig")!=std::string::npos || chainName.tail().find("CosmicsN_EFID")!=std::string::npos ) {
/// EFID chain
shifter_efid++;
- if ( shifter_efid>shifterChains ) {
- msg(MSG::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg;
+ if ( shifter_efid>m_shifterChains ) {
+ msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq;
continue;
}
}
else if ( chainName.tail().find("_EFID")!=std::string::npos ) {
/// EFID chain
shifter_efid_run1++;
- if ( shifter_efid_run1>shifterChains ) {
- msg(MSG::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg;
+ if ( shifter_efid_run1>m_shifterChains ) {
+ msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq;
continue;
}
}
else if ( chainName.tail().find("L2SiTrackFinder")!=std::string::npos ) {
/// EFID chain
shifter_l2star++;
- if ( shifter_l2star>shifterChains ) {
- msg(MSG::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endmsg;
+ if ( shifter_l2star>m_shifterChains ) {
+ msg(MSG::INFO) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << " excluded - Shifter chain already definied^[[m" << endreq;
continue;
}
}
@@ -339,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::DEBUG) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << "^[[m" << endmsg;
+ msg(MSG::VERBOSE) << "^[[91;1m" << "Matching chain " << selectChains[iselected] << "^[[m" << endreq;
}
@@ -365,22 +362,18 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
m_sequences.push_back( analysis );
- std::string highestPT_str = "";
- std::string vtxindex_str = "";
-
- if ( m_useHighestPT ) {
- highestPT_str = ": using highest PT only";
+ msg(MSG::INFO) << " ----- creating analysis " << m_sequences.back()->name() << " : " << m_chainNames[i] << " -----" << endreq;
+
+ m_sequences.back()->releaseData(m_releaseMetaData);
+ if ( m_useHighestPT ) {
+ msg(MSG::INFO) << " using highest PT only for chain " << m_chainNames[i] << endreq;
m_sequences.back()->setUseHighestPT(true);
}
if ( !(m_vtxIndex<0) ) {
- vtxindex_str = ": searching for vertex index ";
+ msg(MSG::INFO) << " searching for vertex index " << m_vtxIndex << endreq;
m_sequences.back()->setVtxIndex(m_vtxIndex);
}
-
- msg(MSG::INFO) << " ----- creating analysis " << m_sequences.back()->name() << " : " << m_chainNames[i] << highestPT_str << vtxindex_str << " -----" << endmsg;
-
- m_sequences.back()->releaseData(m_releaseMetaData);
/// don't filter cosmic chains on Roi
/// - could be done with a global job option, but then if configuring some cosmic chains,
@@ -397,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() << " -----" << endmsg;
+ msg(MSG::VERBOSE) << " ----- booking for analysis " << m_sequences[i]->name() << " -----" << endreq;
m_sequences[i]->initialize(this, &m_tdt);
m_sequences[i]->setGenericFlag(m_genericFlag);
m_sequences[i]->book();
@@ -405,9 +398,9 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu
m_firstRun = false;
}
- msg(MSG::DEBUG) << " configured " << m_sequences.size() << " sequences" << endmsg;
+ msg(MSG::DEBUG) << " configured " << m_sequences.size() << " sequences" << endreq;
- msg(MSG::DEBUG) << " ----- exit book() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit book() ----- " << endreq;
return StatusCode::SUCCESS;
}
@@ -419,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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter fill() ----- " << endreq;
}
std::vector<std::string> selectChains = m_tdt->getListOfTriggers( "HLT_.*" );
- msg(MSG::DEBUG) << " TDT selected chains " << selectChains.size() << endmsg;
+ msg(MSG::DEBUG) << " TDT selected chains " << selectChains.size() << endreq;
int passed_count = 0;
@@ -448,7 +441,7 @@ StatusCode TrigTestBase::fill() {
if(msg().level() <= MSG::DEBUG) {
- msg(MSG::DEBUG) << " ----- exit fill() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit fill() ----- " << endreq;
}
return StatusCode::SUCCESS;
@@ -474,12 +467,12 @@ StatusCode TrigTestBase::proc(bool /*endOfEventsBlock*/, bool /*endOfLumiBlock*/
#endif
#endif
- msg(MSG::INFO) << " ----- enter proc() ----- " << endmsg;
+ msg(MSG::INFO) << " ----- enter proc() ----- " << endreq;
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() ====== " << endmsg;
+ msg(MSG::DEBUG) << " ====== exit proc() ====== " << endreq;
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
index 983a996dd76f..35541cae053d 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__ << endmsg;
+ msg(MSG::WARNING) << "TrigTestMonToolAC::TrigTestMonToolAC() compiled: " << __DATE__ << " " << __TIME__ << endreq;
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() << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() " << gDirectory->GetName() << endreq;
- msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() returning: " << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::TrigTestMonToolAC() returning: " << endreq;
}
@@ -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()" << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::~TrigTestMonToolAC()" << endreq;
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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter init() ----- " << endreq;
- msg(MSG::INFO) << "TrigTestMonToolAC::init() " << gDirectory->GetName() << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::init() " << gDirectory->GetName() << endreq;
// 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() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit init() ----- " << endreq;
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) ----- " << endmsg;
+ msg(MSG::INFO) << " ----- enter book() (athena) ----- " << endreq;
- msg(MSG::INFO) << "TrigTestMonToolAC::book() " << gDirectory->GetName() << endmsg;
+ msg(MSG::INFO) << "TrigTestMonToolAC::book() " << gDirectory->GetName() << endreq;
#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" << endmsg;
+ msg(MSG::WARNING) << "[91;1m" << "m_analysis_config " << m_analysis_config << "[m" << endreq;
if ( m_analysis_config=="Tier0" || !m_buildNtuple ) {
- msg(MSG::INFO) << "[91;1m" << "setting up tier 0 analyses " << endmsg;
+ msg(MSG::INFO) << "[91;1m" << "setting up tier 0 analyses " << endreq;
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" << endmsg;
+ if ( selectChains.size()==0 ) msg(MSG::WARNING) << "[91;1m"<< "No chains matched for requested input " << chainName << "[m" << endreq;
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" << endmsg;
+ msg(MSG::INFO) << "[91;1m" << "Matching chain " << selectChains[iselected] << "[m" << endreq;
}
@@ -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" << endmsg;
+ msg(MSG::INFO) << "[91;1m" << "Matching chains " << m_chainNames.size() << " init() [m" << endreq;
for ( unsigned i=0 ; i<m_chainNames.size() ; i++ ){
- msg(MSG::INFO) << "[91;1m" << "booking a Tier0 chain " << m_chainNames[i] << " [m" << endmsg;
+ msg(MSG::INFO) << "[91;1m" << "booking a Tier0 chain " << m_chainNames[i] << " [m" << endreq;
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" << endmsg;
+ msg(MSG::DEBUG) << "[91;1m ----- File open? ----- [m" << endreq;
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" << endmsg;
+ msg(MSG::INFO) << "[91;1m ----- booking for analysis " << m_sequences[i]->name() << " ----- [m" << endreq;
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" << endmsg;
+ msg(MSG::INFO) << "[91;1m ----- booked for analysis " << m_sequences[i]->name() << " ----- [m" << endreq;
}
m_firstRun = false;
}
- msg(MSG::DEBUG) << " ----- exit book() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit book() ----- " << endreq;
return StatusCode::SUCCESS;
}
@@ -304,20 +304,20 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool
StatusCode TrigTestMonToolAC::fill() {
- msg(MSG::INFO) << " ----- enter fill() (athena) ----- " << endmsg;
+ msg(MSG::INFO) << " ----- enter fill() (athena) ----- " << endreq;
- msg(MSG::INFO) << "chains: " << m_chainNames.size() << endmsg;
+ msg(MSG::INFO) << "chains: " << m_chainNames.size() << endreq;
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() ) << endmsg;
+ msg(MSG::INFO) << "Trigger output " << s.head() << " " << s.tail() << "\tdecision " << m_tdt->isPassed( s.head() ) << endreq;
}
for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->execute();
- msg(MSG::INFO) << " ----- exit fill() ----- " << endmsg;
+ msg(MSG::INFO) << " ----- exit fill() ----- " << endreq;
return StatusCode::SUCCESS;
}
@@ -337,18 +337,18 @@ StatusCode TrigTestMonToolAC::proc(bool /* endOfEventsBlock*/, bool /* endOfLumi
#endif
#endif
- msg(MSG::DEBUG) << " ----- enter proc() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter proc() ----- " << endreq;
- msg(MSG::DEBUG) << " ----- initialisePerRun: " << m_initialisePerRun << "\tendOfRun: " << endOfRun << " -----" << endmsg;
+ msg(MSG::DEBUG) << " ----- initialisePerRun: " << m_initialisePerRun << "\tendOfRun: " << endOfRun << " -----" << endreq;
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" << endmsg;
+ msg(MSG::INFO) << "[91;1m ----- finalize for analysis " << m_sequences[i]->name() << " ----- [m" << endreq;
m_sequences[i]->finalize();
}
m_fileopen = false;
}
- msg(MSG::DEBUG) << " ====== exit proc() ====== " << endmsg;
+ msg(MSG::DEBUG) << " ====== exit proc() ====== " << endreq;
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
index c94c99428d19..035cab4c6527 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
@@ -6,7 +6,7 @@
//
// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
-// $Id: ConfAnalysis.cxx 800361 2017-03-12 14:33:19Z sutt $
+// $Id: ConfAnalysis.cxx 772657 2016-09-12 07:11:42Z sutt $
#include "ConfAnalysis.h"
@@ -24,10 +24,29 @@
#include "TF1.h"
#include "TMath.h"
-#include "globals.h"
+
+extern int r;
+extern int ev;
+extern int lb;
+extern int ts;
+
+extern double a0;
+
+extern bool hipt;
+
+extern TIDA::Event* gevent;
+
+extern TIDARoiDescriptor* groi;
+
+extern TIDA::Event* gevent;
+
+/// these are all definied on rmain.cxx
+extern bool dumpflag;
+
bool PRINT_BRESIDUALS = false;
+extern int NMod;
void Normalise(TH1* h) {
@@ -239,9 +258,6 @@ void ConfAnalysis::initialiseInternal() {
mres.push_back( rnsct_pt_rec = new Resplot( "nsct_pt_rec", ptnbins, ptbinlims, 22, -0.5, 21.5 ) );
mres.push_back( rntrt_pt_rec = new Resplot( "ntrt_pt_rec", ptnbins, ptbinlims, 100, -0.5, 99.5 ) );
- mres.push_back( rnpixh_pt_rec = new Resplot( "npixh_pt_rec", ptnbins, ptbinlims, 22, -0.5, 21.5 ) );
- mres.push_back( rnscth_pt_rec = new Resplot( "nscth_pt_rec", ptnbins, ptbinlims, 22, -0.5, 21.5 ) );
-
mres.push_back( rChi2prob = new Resplot( "Chi2prob", ptnbins, ptbinlims, 20, 0, 1 ) );
mres.push_back( rChi2 = new Resplot( "Chi2", ptnbins, ptbinlims, 200, 0, 100 ) );
@@ -649,28 +665,26 @@ void ConfAnalysis::initialiseInternal() {
/// efficiency vs lumi block
- TH1F heffvlb("eff vs lb", "eff vs lb", 301, -0.5, 3009.5 );
+ TH1F heffvlb("eff vs lb", "eff vs lb",
+ 100,
+ // 1270515000, 1270560000
+ 1272040000, 1272200000
+ );
+ // 1270518944,
+ // 1270558762 );
- // 100,
- // 1270515000, 1270560000
- // 1272040000, 1272200000
- // );
- // 1270518944,
- // 1270558762 );
-
- // 1260470000,
- // 1260680000 );
- // 1260470000,
- // 1260690000 );
- // TH1F heffvlb("eff vs lb", "eff vs lb", 600, 0, 3000);
-
- // TH1F heffvlb("eff vs lb", "eff vs lb", 600, 1260400000, 1260700000);
+ // 1260470000,
+ // 1260680000 );
+ // 1260470000,
+ // 1260690000 );
+ // TH1F heffvlb("eff vs lb", "eff vs lb", 600, 0, 3000);
+
+ // TH1F heffvlb("eff vs lb", "eff vs lb", 600, 1260400000, 1260700000);
eff_vs_lb = new Efficiency( &heffvlb );
- // z_vs_lb = new Resplot("z vs lb", 100, 1270515000, 1270560000, 100, -250, 250);
- z_vs_lb = new Resplot("z vs lb", 301, -0.5, 3009.5, 100, -250, 250);
+ z_vs_lb = new Resplot("z vs lb", 100, 1270515000, 1270560000, 100, -250, 250);
//rmap[142165] = 0;
//rmap[142166] = 500;
@@ -712,11 +726,11 @@ void ConfAnalysis::initialiseInternal() {
eff_vs_ntracks2 = new Efficiency( n_vtx_tracks2, "eff_vs_ntracks2");
delete n_vtx_tracks2;
- n_vtx = new TH1F("nvtx", "nvtx", 31, -0.5, 30.5);
+ n_vtx = new TH1F("nvtx", "nvtx", 21, -0.5, 20.5);
eff_vs_nvtx = new Efficiency( n_vtx, "eff_vs_nvtx");
//mu = new TH1F("mu", "mu", 3000, -0.5, 29.5);
- mu = new TH1F("mu", "mu", 70, 0, 70);
- eff_vs_mu = new Efficiency( mu, "eff_vs_mu");
+ mu = new TH1F("mu", "mu", 50, 0, 50);
+ eff_vs_mu = new Efficiency( mu, "eff_vs_mu");
// std::cout << "initialize() Directory " << gDirectory->GetName() << " on leaving" << std::endl;
@@ -1308,9 +1322,7 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
// eff_vs_lb->Fill( rmap[r]+lb );
// eff_vs_lb->Fill( ts_scale );
- // eff_vs_lb->Fill( ts );
-
- eff_vs_lb->Fill( gevent->lumi_block() );
+ eff_vs_lb->Fill( ts );
Nmatched++;
@@ -1368,11 +1380,7 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
double nsctr = matchedreco->sctHits();
double npixr = matchedreco->pixelHits();
- double nsir = matchedreco->pixelHits() * 0.5 + matchedreco->sctHits();
-
- double nscthr = matchedreco->sctHoles();
- double npixhr = matchedreco->pixelHoles();
-
+ double nsir = matchedreco->pixelHits() * 0.5 + matchedreco->sctHits();
//double ntrtr = matchedreco->trHits();
double nstrawr = matchedreco->strawHits();
@@ -1512,10 +1520,6 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
rnsct_pt_rec->Fill( std::fabs(pTt), nsctr*1.0 );
rntrt_pt_rec->Fill( std::fabs(pTt), nstrawr*1.0 );
- rnpixh_pt_rec->Fill( std::fabs(pTt), npixhr*0.5 );
- rnscth_pt_rec->Fill( std::fabs(pTt), nscthr*1.0 );
-
-
eff_vs_ntracks->Fill( Nvtxtracks );
eff_vs_ntracks2->Fill( Nvtxtracks );
n_vtx_tracks->Fill( Nvtxtracks );
@@ -1750,8 +1754,8 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
}
- // eff_vs_lb->FillDenom( ts );
- eff_vs_lb->FillDenom( gevent->lumi_block() );
+ eff_vs_lb->FillDenom( ts );
+
}
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
index 2029807d566a..65f6127ced35 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
@@ -6,7 +6,7 @@
//
// Copyright (C) 2007 M.Sutton (sutt@cern.ch)
//
-// $Id: ConfAnalysis.h 800361 2017-03-12 14:33:19Z sutt $
+// $Id: ConfAnalysis.h 770310 2016-08-26 12:34:42Z sutt $
#ifndef __CONFANALYSIS_H
@@ -52,7 +52,7 @@ public:
ConfAnalysis( const std::string& name ) :
TrackAnalysis( clean(name) ), Nreco(0), Nref(0), Nmatched(0), m_print(false), m_roi(0),
- m_initialised(false), m_initialiseFirstEvent(false) { // , m_lfirst(true) {
+ m_initialised(false), m_initialiseFirstEvent(false), m_lfirst(true) {
std::cout << "ConfAnalysis::ConfAnalysis() " << TrackAnalysis::name() << " ..." << std::endl;
}
@@ -213,9 +213,6 @@ private:
Resplot* rnsct_pt_rec;
Resplot* rntrt_pt_rec;
- Resplot* rnpixh_pt_rec;
- Resplot* rnscth_pt_rec;
-
std::vector<Resplot*> mres;
std::vector<Resplot*> retares;
@@ -286,7 +283,7 @@ private:
bool m_initialised;
bool m_initialiseFirstEvent;
- // bool m_lfirst;
+ bool m_lfirst;
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
index 846daff1b31b..3af5dffffba9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
@@ -32,7 +32,6 @@ ifeq ($(CMTCONFIG),)
# ATLASBASE = $(TestArea)/Trigger/TrigAnalysis/
# ATLASBASE = /tmp/sutt/new/Trigger/TrigAnalysis
# ATLASBASE = $(ATLAS_TEST_AREA)/Trigger/TrigAnalysis
- # ATLASBASE = $(TestArea)/Trigger/TrigAnalysis
ATLASBASE = $(HOME)/atlas/TIDA
# ATLASBASE = /tmp/sutt/duff/Trigger/TrigAnalysis
# ATLASBASE = /tmp/sutt/tida/Trigger/TrigAnalysis/
@@ -102,8 +101,8 @@ endif
# Root variables
ROOTCFLAGS = $(shell root-config --cflags)
-ROOTLIBS = $(shell root-config --libs)
-ROOTGLIBS = $(shell root-config --libs)
+ROOTLIBS = $(shell root-config --glibs)
+ROOTGLIBS = $(shell root-config --glibs)
CLHEPLIB = $(shell clhep-config --libs)
CLHEPCFLAGS = $(shell clhep-config --include)
@@ -161,9 +160,7 @@ ROBJECTS = \
$(OBJDIR)/rmain.o \
$(OBJDIR)/ConfAnalysis.o \
$(OBJDIR)/ConfVtxAnalysis.o \
- $(OBJDIR)/PurityAnalysis.o \
- $(OBJDIR)/globals.o \
- $(OBJDIR)/computils.o
+ $(OBJDIR)/PurityAnalysis.o
LOBJECTS = \
$(OBJDIR)/TIDAEvent.o \
@@ -205,7 +202,7 @@ RLIBS += -L$(TIDUB)/Resplot/lib/$(ARCH_TYPE) -lResplot -L$(TIDUB)/Readcards/lib/
# build executable: link
-all : dirs resplot readcards rdict wdict reader comparitor cpucost chains skim listroot sb
+all : dirs resplot readcards rdict wdict reader comparitor cpucost chains skim listroot
$(OBJDIR)/computils.o : $(SRCDIR)/computils.h
$(OBJDIR)/comparitor.o : $(SRCDIR)/computils.h
@@ -257,12 +254,9 @@ $(EXEDIR)/listroot : $(OBJDIR)/listroot.o $(OBJDIR)/AtlasStyle.o $(OBJDIR)/Atlas
$(CXX) $(LDFLAGS) -o $@ $(OBJDIR)/listroot.o $(OBJDIR)/AtlasStyle.o $(RLIBS) $(ROOTLIBS)
runtool : dirs $(EXEDIR)/runtool
-$(EXEDIR)/runtool : dirs $(OBJDIR)/runtool.o $(OBJDIR)/computils.o
- $(CXX) $(LDFLAGS) -o $@ $(OBJDIR)/runtool.o $(OBJDIR)/computils.o $(GLIBS)
+$(EXEDIR)/runtool : dirs $(OBJDIR)/runtool.o
+ $(CXX) $(LDFLAGS) -o $@ $(OBJDIR)/runtool.o $(GLIBS)
-sb : $(EXEDIR)/sb
-$(EXEDIR)/sb : $(OBJDIR)/chainparser.o
- $(CXX) $(LDFLAGS) -o $@ $(OBJDIR)/chainparser.o $(RLIBS) $(ROOTLIBS)
# compile
@@ -305,7 +299,7 @@ $(LIBDIR)/libTIDA.a : $(LOBJECTS)
libso: $(LIBDIR)/libTIDA.so
$(LIBDIR)/libTIDA.so : $(LOBJECTS)
$(CXX) $(LDFLAGS) -O3 -dynamiclib -shared -o $@ $(LOBJECTS) $(RSSOLIB)$(GLIBS)
-
+
else
# if libraries are already build inside athena, do nothing
lib:
@@ -343,7 +337,6 @@ install : all
cp $(EXEDIR)/skim $(HOME)/bin
cp $(EXEDIR)/listroot $(HOME)/bin
cp $(EXEDIR)/runtool $(HOME)/bin
- cp $(EXEDIR)/sb $(HOME)/bin
dirs : $(LIBDIR)/.d $(OBJDIR)/.d $(EXEDIR)/.d
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
deleted file mode 100644
index 54d9084df79d..000000000000
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
+++ /dev/null
@@ -1,398 +0,0 @@
-//
-// @file selectblock.cxx
-//
-//
-// @author M.Sutton
-//
-// Copyright (C) 2017 M.Sutton (sutt@cern.ch)
-//
-// $Id: selectblock.cxx, v0.0 Mon 23 Jan 2017 12:30:25 CET sutt $
-
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <vector>
-#include <cstdlib>
-#include <cstdio>
-#include <map>
-
-#include <cmath>
-
-#include <algorithm>
-
-#include "utils.h"
-
-template<typename T>
-std::ostream& operator<<( std::ostream& s, std::vector<T>& v ) {
- for ( size_t i=0 ; i<v.size() ; i++ ) s << v[i] << std::endl;
- return s;
-}
-
-
-bool contains( const std::string& s, const std::string& regex ) {
- return s.find( regex )!=std::string::npos;
-}
-
-
-std::vector<std::string> split( std::string& line ) {
- std::vector<std::string> strings;
-
- while ( contains( line, "/" ) ) line.replace( line.find("/"), 1, " " );
- while ( contains( line, "\t" ) ) line.replace( line.find("\t"), 1, " " );
-
- while ( contains( line, " " ) ) {
- std::string _s = chop( line, " " );
- std::string s = chop( _s, "\t" );
- if ( contains( s, "\t" ) ) {
- line.replace( s.find("\t"), 1, " " );
- continue;
- }
- while ( contains( s, " " ) ) line.replace( s.find(" "), 1, "" );
- if ( s != "" ) strings.push_back( s );
- }
-
- strings.push_back( line );
-
- // for ( size_t i=0 ; i<strings.size() ; i++ ) std::cout << " : " << strings[i];
- // std::cout << std::endl;
-
- return strings;
-}
-
-
-struct threshold {
-
- threshold( double t_, int i_, const std::string& c, const std::string& k, int co ) :
- i(i_), thresh(t_), chain(c), key(k), counts(co) { }
-
- int i;
- double thresh;
-
- std::string chain;
- std::string key;
-
- int counts;
-
-};
-
-bool operator< ( const threshold& t0, const threshold& t1 ) { return t0.thresh < t1.thresh; }
-bool operator> ( const threshold& t0, const threshold& t1 ) { return t0.thresh > t1.thresh; }
-bool operator==( const threshold& t0, const threshold& t1 ) { return t0.thresh == t1.thresh; }
-bool operator<=( const threshold& t0, const threshold& t1 ) { return t0.thresh <= t1.thresh; }
-
-std::ostream& operator<<( std::ostream& s, const threshold& t ) {
- return s << t.chain << "\t" << t.key << "\t(" << t.thresh << ")\t" << t.counts;
-}
-
-
-int usage() {
- std::cout << "Usage: " << std::endl;
- return -1;
-}
-
-int main( int argc, char** argv ) {
-
- if ( argc<3 ) return -1;
-
- std::ifstream file( argv[1] );
-
- std::vector<std::vector<std::string> > block(1,std::vector<std::string>() );
-
- std::string line;
-
- std::vector<int> position(1, 0);
-
- std::string slice = "/";
- slice += argv[2];
- slice += "/";
-
- bool allflag = false;
-
- std::vector<std::string> keys;
-
- keys.push_back( "IDTrig" );
-
- bool nokeys = true;
-
-
- std::vector<std::string> Keys;
-
- bool noKeys = true;
-
-
- std::vector<std::string> veto;
-
- std::string creturn = "";
-
- bool verbose = false;
-
- unsigned n = 4;
-
- bool usecounts = false;
-
- for ( int i=3 ; i<argc ; i++ ) {
- std::string arg = argv[i];
- if ( arg=="-all" ) allflag = true;
- else if ( arg=="--verbose" ) verbose = true;
- else if ( arg=="-cr" ) creturn = "\n";
- else if ( arg=="--counts" ) usecounts = true;
- else if ( arg=="-k" ) {
- if ( ++i<argc ) {
- if ( nokeys ) {
- keys.clear();
- nokeys = false;
- }
- keys.push_back(argv[i]);
- }
- else return usage();
- }
- else if ( arg=="-K" ) {
- if ( ++i<argc ) {
- if ( noKeys ) {
- Keys.clear();
- noKeys = false;
- }
- Keys.push_back(argv[i]);
- }
- else return usage();
- }
- else if ( arg=="--veto" ) {
- if ( ++i<argc ) veto.push_back(argv[i]);
- else return usage();
- }
- else if ( arg=="-n" ) {
- if ( ++i<argc ) n = std::atoi(argv[i]);
- else return usage();
- }
- }
-
- std::string rawslice = argv[2];
-
- std::map<std::string, std::string> chains;
-
- typedef std::map<std::string, std::string> chain_map;
- chains.insert( chain_map::value_type( "Electron", "_e" ) );
- chains.insert( chain_map::value_type( "Egamma", "_e" ) );
- chains.insert( chain_map::value_type( "Muon", "_mu" ) );
- chains.insert( chain_map::value_type( "Tau", "_tau" ) );
- chains.insert( chain_map::value_type( "Bjet", "_j" ) );
-
- chain_map::const_iterator itr = chains.find( argv[2] );
-
- if ( itr==chains.end() ) {
- std::cerr << "con not process type " << argv[2] << std::endl;
- return -1;
- }
-
- std::string tag = "HLT";
- tag += itr->second;
-
- std::vector<threshold> thresholds;
-
- std::string fullpath = "";
-
- /// read through and parse chain list file
-
- while( getline( file, line ) && !file.fail() ) {
-
- if ( !contains( line, slice ) ) continue;
-
- std::vector<std::string> expl = split( line );
-
- int it = 0;
-
- unsigned expected_size = 0;
-
- // bool shifter = false;
-
- if ( expl[2] == "IDMon" ) expected_size = 6;
- else if ( expl[2] == "TRIDT" ) {
- if ( expl[4] == "Expert" ) expected_size = 7;
- else if ( expl[4] == "Shifter" ) {
- // shifter = true;
- // std::cout << "shifter histogram setting not yet available: " << shifter << std::endl;
- expected_size = 6;
- }
- else {
- std::cerr << "unknown HIST type" << std::endl;
- return 1;
- }
- }
- else {
- std::cerr << "unknown HIST type" << std::endl;
- return 1;
- }
-
- if ( expl.size() > expected_size ) {
-
- int counts = std::atoi(expl[expected_size].c_str());
-
- // std::cout << expl[4] << "\t" << expl[5] << "\t:" << counts << std::endl;
-
- /// ignore chains with no entries ( could print out as problem chains if required)
- if ( counts > 100 ) {
- // if ( true ) {
-
- std::string tmp = expl[expected_size-2];
-
- if ( !contains( tmp, tag ) ) continue;
-
- tmp.replace( tmp.find(tag), tag.size(), "" );
-
- size_t pos = tmp.find("_");
- if ( pos!=std::string::npos ) tmp.replace( pos, tmp.size()-pos, "" );
-
- bool condition = false;
-
- if ( keys.size()>0 ) for ( size_t ik=keys.size() ; ik-- ; ) condition |= contains( expl[expected_size-2], keys[ik] ) || contains( expl[expected_size-1], keys[ik] );
- else condition = true;
-
- if ( Keys.size()>0 ) for ( size_t ik=Keys.size() ; ik-- ; ) condition &= contains( expl[expected_size-2], Keys[ik] ) || contains( expl[expected_size-1], Keys[ik] );
-
- if ( veto.size()>0 ) for ( size_t iv=veto.size() ; iv-- ; ) condition &= !( contains( expl[expected_size-2], veto[iv] ) || contains( expl[expected_size-1], veto[iv] ) );
-
- if ( !contains( expl[5], "EFID" ) && !contains( expl[4], "gsc" ) &&
- !contains( expl[4], "medium" ) && !contains( expl[4], "loose" ) &&
- !contains( expl[4], "2015" ) && !contains( expl[4], "_r1_" ) &&
- !( contains( expl[4], "_track" ) && !contains( expl[4], "tracktwo") ) &&
- !contains( expl[4], "L2Star" ) &&
- condition ) {
-
-
- double thresh_var = std::atof( tmp.c_str() );
- int counts_var = counts;
-
- if ( usecounts ) {
- counts_var = int(thresh_var);
- thresh_var = counts;
- }
-
- if ( expected_size >= 2 ) {
-
- threshold t( thresh_var, it++, expl[expected_size-2], expl[expected_size-1], counts_var );
-
- // std::cout << "expected size " << expected_size << std::endl;
-
- if ( verbose && fullpath=="" ) for ( unsigned ip=0 ; ip<expected_size-2 ; ip++ ) fullpath += expl[ip]+"/";
-
- // std::cout << "fullpath " << fullpath << std::endl;
- // std::cout << t << "\t" << contains( expl[4], "_track_" ) << std::endl;
- // std::cout << "adding: " << t << std::endl;
-
- thresholds.push_back( t );
- }
- }
- }
- }
- }
-
-
- // std::cout << "thresholds " << thresholds.size() << std::endl;
-
- /// sort all the selected thresholds into order
-
- if ( usecounts ) sort( thresholds.rbegin(), thresholds.rend() );
- else sort( thresholds.begin(), thresholds.end() );
-
- // std::cout << thresholds << std::endl;
-
-
- /// vector of indices into the threshold vector
-
- std::vector<int> id;
-
-
-
- if ( allflag ) {
-
- // write out all thresholds
-
- for ( size_t i=0 ; i<thresholds.size() ; i++ ) id.push_back(i);
-
- }
- else if ( usecounts ) {
-
- /// write out the top n in terms of numbers of events
-
- for ( size_t i=0 ; i<thresholds.size() && i<n ; i++ ) id.push_back(i);
-
- }
- else {
-
- // select (up to) 3 representative thresholds
-
- std::vector<unsigned> ind(n,0);
-
- if ( thresholds.size() == 0 ) {
- std::cerr << "no valid thresholds found" << std::endl;
- return -2;
- }
-
-
- if ( rawslice=="Bjet" ) {
- for ( size_t i=0 ; i<thresholds.size() ; i++ ) {
- ind[0] = i;
- if ( thresholds[i].thresh > 30 ) break;
- }
- }
-
- for ( size_t i=thresholds.size() ; i-- ; ) {
- if ( thresholds[i].counts > 0.05*thresholds[ind[0]].counts ) {
- ind[n-1] = i;
- break;
- }
- }
-
- /// calculate the intermediate chains with n options
-
- for ( unsigned it=1 ; n>0 && it<n-1 ; it++ ) {
-
- double tn = std::log(thresholds[ind[n-1]].thresh);
- double t0 = std::log(thresholds[ind[0]].thresh);
-
- double f = it*1.0/(n-1);
-
- double cthresh = std::exp( f*tn + (1-f)*t0 );
-
- // double cthresh = std::exp( (it/(n-1))*std::log(thresholds[ind[n-1]].thresh) - (it/(n-1) - 1)*std::log(thresholds[ind[0]].thresh ) ;
-
- ind[it] = int( f*ind[n-1]+(1-f)*ind[0] );
-
- // std::cout << "it " << it << "\tf " << f << "\tcthresh " << cthresh << "\tint " << ind[it] << "\tthresholds size " << thresholds.size() << std::endl;
-
- double delta = cthresh - thresholds[ind[it]].thresh;
-
- double R2 = delta*delta;
-
- for ( size_t i=ind[0]+1 ; i<ind[n-1]-1 ; i++ ) {
- double delta = cthresh - thresholds[i].thresh;
-
- double R2_ = delta*delta;
-
- if ( R2_ < R2 ) {
- ind[it] = i;
- R2 = R2_;
- }
-
- }
- }
-
- id.push_back( ind[0] );
-
-
- for ( unsigned i=1 ; i<n ; i++ ) {
- if ( ind[i]!=ind[i-1] ) id.push_back( ind[i] );
- }
-
- // std::cout << "indices " << id << std::endl;
-
- }
-
- for ( size_t i=0 ; i<id.size() ; i++ ) {
- if ( verbose ) std::cout << " " << fullpath << thresholds[id[i]].chain << "/" << thresholds[id[i]].key << creturn;
- else std::cout << " " << thresholds[id[i]].chain << "_" << thresholds[id[i]].key << creturn;
- }
-
- return 0;
-}
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
index 3bada2fb14b5..809a328918be 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
@@ -62,12 +62,6 @@ int main(int argc, char** argv ) {
for ( unsigned i=0 ; i<args.size() ; i++ ) {
TFile f( args[i].c_str() );
-
- if ( !f.IsOpen() || f.IsZombie() ) {
- std::cerr << "Error: could not open input file: " << args[i] << std::endl;
- std::exit(1);;
- }
-
// gDirectory->ls();
descend( gDirectory, 0, maxdepth, labels );
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
index c9c730442e6e..1c9ba859109b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
@@ -67,9 +67,7 @@ int usage(const std::string& name, int status) {
s << " -e, --efficiencies \t make test efficiencies with respect to reference \n";
s << " -es, --effscale value \t scale efficiencies to value\n";
s << " -er, --effscaleref value \t scale efficiencies to value\n";
- s << " -r, --refit \t refit all test resplots\n";
- s << " -rr, --refitref \t also refit all reference resplots\n";
- s << " --oldrms \t use fast rms95 when refitting resplots\n";
+ s << " -r, --refit \t refit all resplots\n";
s << " -l, --labels \t use specified labels for key\n";
s << " --taglabels \t use specified additional labels \n";
s << " -nb --nobayes \t do not calculate Basyesian efficiency uncertaintiesr\n";
@@ -201,7 +199,7 @@ int main(int argc, char** argv) {
bool make_ref_efficiencies = false;
bool refit_resplots = false;
- bool refitref_resplots = false;
+
bool _bayes = true;
bool nopng = false;
bool nostats = false;
@@ -216,9 +214,8 @@ int main(int argc, char** argv) {
bool dochi2 = false;
bool normref = false;
bool scalepix = true;
- bool oldrms = false;
- std::string atlaslabel = "Internal";
+ std::string atlaslabel = "for approval";
double scale_eff = -1;
double scale_eff_ref = -1;
@@ -300,12 +297,6 @@ int main(int argc, char** argv) {
else if ( arg=="-r" || arg=="--refit" ) {
refit_resplots = true;
}
- else if ( arg=="-rr" || arg=="--refitref" ) {
- refitref_resplots = true;
- }
- else if ( arg=="--oldrms" ) {
- oldrms = true;
- }
else if ( arg=="-nw" || arg=="--nowatermark" ) {
nowatermark = true;
Plots::setwatermark(!nowatermark);
@@ -381,8 +372,30 @@ int main(int argc, char** argv) {
return usage(argv[0], -4);
}
else {
- if ( ftestname=="" ) ftestname = arg;
- else if ( frefname=="" ) frefname = arg;
+ if ( _ftest==0 ) {
+ if ( exists(arg) ) {
+ ftestname = arg;
+ // _ftest = new TFile( ftestname.c_str() );
+ _ftest = TFile::Open( ftestname.c_str() );
+
+ }
+ else {
+ std::cerr << "main(): test file " << arg << " does not exist" << std::endl;
+ return -1;
+ }
+ }
+ else if ( _fref==0 ) {
+ if ( exists(arg) ) {
+ frefname = arg;
+ // _fref = new TFile( frefname.c_str() );
+ _fref = TFile::Open( frefname.c_str() );
+ }
+ else {
+ if ( _ftest ) delete _ftest;
+ std::cerr << "main(): ref file " << arg << " does not exist" << std::endl;
+ return -1;
+ }
+ }
else {
std::string chain = arg;
replace ( chain, ":", "_" );
@@ -392,44 +405,9 @@ int main(int argc, char** argv) {
}
}
-
- if ( ftestname=="" ) {
- std::cerr << "main(): test file not specified " << std::endl;
- return -1;
- }
-
- if ( !exists(ftestname) ) {
- std::cerr << "main(): test file " << ftestname << " does not exist" << std::endl;
- return -1;
- }
-
- _ftest = TFile::Open( ftestname.c_str() );
-
- if ( noref==false ) {
- if ( frefname=="" ) {
- std::cerr << "main(): ref file not specified " << std::endl;
- return -1;
- }
-
- if ( frefname==ftestname ) _fref = _ftest;
- else if ( exists(frefname) ) _fref = TFile::Open( frefname.c_str() );
- else {
- std::cerr << "main(): test file " << ftestname << " does not exist" << std::endl;
- return -1;
- }
- }
- else _fref = _ftest;
-
- if ( _ftest==0 || _fref==0 ) {
- std::cerr << "could not open files " << std::endl;
- return -1;
- }
-
if ( scale_eff == -1 ) scale_eff = 100;
if ( scale_eff_ref == -1 ) scale_eff_ref = scale_eff;
-
- bool noreftmp = noref;
if ( refchains.size()>0 && refchains.size()!=chains.size() ) return usage(argv[0], -1);
@@ -448,10 +426,6 @@ int main(int argc, char** argv) {
if ( taglabels.size()>0 ) std::cout << "\textra text: " << taglabels << std::endl;
- for ( size_t il=0 ; il<usrlabels.size() ; il++ ) {
- std::cout << "usr label[" << il << "] : " << usrlabels[il] << std::endl;
- }
-
if ( atlasstyle ) {
SetAtlasStyle();
@@ -521,46 +495,16 @@ int main(int argc, char** argv) {
}
TFile& ftest = *_ftest;
-
-
TFile& fref = *_fref;
-
- std::string testrun = findrun( &ftest );
-
- std::string refrun = "";
-
- if ( _fref ) refrun = findrun( &fref );
-
- std::cout << "testrun: " << testrun << "\nrefrun: " << refrun << std::endl;
-
- if ( testrun != "" && refrun != testrun ) {
- if ( pattern == "" ) {
- pattern = testrun;
- regex = refrun;
- }
- }
-
- if ( refrun != "" ) {
- std::string newtag = "Reference: ";
- size_t pos;
- while ( (pos=refrun.find("_"))!=std::string::npos ) refrun.replace( pos, 1, " " );
- newtag += refrun;
- taglabels.push_back( newtag );
- }
-
std::vector<std::string> chainnames;
chainnames.resize(chains.size());
chainnames.clear();
- /// we divide the resolutions by these
- /// values if we have an "entries" histogram
- /// to tell us how many events there are
- /// overall
- int NeventTest = 1;
- int NeventRef = 1;
+ int NeventTest=0;
+ int NeventRef=0;
std::vector<std::string> savedhistos;
@@ -572,7 +516,7 @@ int main(int argc, char** argv) {
std::cout << "htestev " << htestev << " " << hrefev << std::endl;
- if ( htestev ) NeventTest = htestev->GetEntries();
+ if ( htestev ) NeventTest = htestev->GetEntries();
if ( hrefev ) NeventRef = hrefev->GetEntries();
savedhistos.push_back("event");
@@ -819,6 +763,8 @@ int main(int argc, char** argv) {
if ( fulldbg ) std::cout << __LINE__ << std::endl;
+
+
// if ( chains[j]=="FTK_TrackParticle" ){
{
@@ -837,44 +783,32 @@ int main(int argc, char** argv) {
TH2F* href2D = (TH2F*)fref.Get((refchain+"/"+hist ).c_str()) ;
- if ( htest2D==0 ) continue;
-
- if ( href2D==0 && noref==false ) noreftmp=true;
- Plotter::setplotref(!noreftmp);
+ if ( htest2D==0 || href2D==0 ) continue;
zero( htest2D );
- if ( !noreftmp ) zero( href2D );
+ zero( href2D );
AxisInfo xinfo( _histos[i][2] );
AxisInfo yinfo( _histos[i][4] );
// std::cout << "yinfo " << _histos[i][0] << ": " << _histos[i][4] << " :: " << yinfo << " " << yinfo.rangeset() << std::endl;
- htest2D->GetYaxis()->SetTitle( _histos[i][5].c_str() );
+ htest2D->GetYaxis()->SetTitle( _histos[i][5].c_str() );
+ href2D->GetYaxis()->SetTitle( _histos[i][5].c_str() );
+
htest2D->GetXaxis()->SetTitle( _histos[i][3].c_str() );
-
+ href2D->GetXaxis()->SetTitle( _histos[i][3].c_str() );
+
if ( yinfo.rangeset() ) {
htest2D->GetYaxis()->SetRangeUser( yinfo.lo(), yinfo.hi() );
+ href2D->GetYaxis()->SetRangeUser( yinfo.lo(), yinfo.hi() );
}
if ( xinfo.rangeset() ) {
htest2D->GetXaxis()->SetRangeUser( xinfo.lo(), xinfo.hi() );
+ href2D->GetXaxis()->SetRangeUser( xinfo.lo(), xinfo.hi() );
}
-
-
- if ( !noreftmp ) {
- href2D->GetYaxis()->SetTitle( _histos[i][5].c_str() );
- href2D->GetXaxis()->SetTitle( _histos[i][3].c_str() );
-
-
- if ( yinfo.rangeset() ) {
- href2D->GetYaxis()->SetRangeUser( yinfo.lo(), yinfo.hi() );
- }
-
- if ( xinfo.rangeset() ) {
- href2D->GetXaxis()->SetRangeUser( xinfo.lo(), xinfo.hi() );
- }
- }
+
savedhistos.push_back( chains[j]+"/"+hist );
@@ -892,9 +826,9 @@ int main(int argc, char** argv) {
std::string title2 = hist;
title2 += "reference";
- if ( !noreftmp ) href2D->SetTitle(title2.c_str());
+ href2D->SetTitle(title2.c_str());
// gPad->SetLogz();
- if ( !noreftmp ) href2D->Draw("COLZ");
+ href2D->Draw("COLZ");
// gPad->SetLogz(true);
@@ -926,12 +860,8 @@ int main(int argc, char** argv) {
/// std::vector<std::string> histos(_Nhistos);
-
for ( int i=0 ; i<Nhistos ; i++ ) {
- noreftmp = noref;
- Plotter::setplotref(!noreftmp);
-
if ( fulldbg ) std::cout << __LINE__ << std::endl;
// if ( i!=17 ) continue;
@@ -998,10 +928,7 @@ int main(int argc, char** argv) {
ypositions.push_back( yhi - deltay*(ilines+0.5) );
}
- bool residual = false;
- if ( contains(histos[i],"_res") || contains(histos[i],"residual_") || contains(histos[i],"1d") ) residual = true;
- if ( residual ) xpos = xpos_original;
// efficiencies or residuals?
// if ( contains(histos[i],"eff") ) {
legend = Legend( xpos, xpos+0.1, ylo, ylo+chains.size()*0.06-0.005 );
@@ -1048,9 +975,8 @@ int main(int argc, char** argv) {
for ( unsigned int j=0; j<chains.size(); j++) {
- noreftmp = noref;
- Plotter::setplotref(!noreftmp);
-
+ std::cout << " processing chain[" << j << "] " << chains[j] << std::endl;
+
TH1F* htest = 0;
TH1F* href = 0;
@@ -1066,62 +992,31 @@ int main(int argc, char** argv) {
/// refit the resplots - get the 2d histogram and refit
- if ( refit_resplots && ( contains(histos[i],"/sigma") || contains(histos[i],"/mean") ) ) {
-
- bool bsigma = false;
- if ( contains(histos[i],"/sigma") ) bsigma = true;
+ if ( refit_resplots && contains(histos[i],"/sigma") ) {
- bool bmean = false;
- if ( contains(histos[i],"/mean") ) bmean = true;
+ std::cout << " refitting: " << histos[i] << std::endl;
- // std::cout << "\trefitting: " << histos[i] << std::endl;
-
- Resplot::setoldrms95(oldrms);
+ Resplot::setoldrms95(false);
Resplot::setscalerms95(true);
- std::string tmp_ = histos[i];
- std::string base;
-
- if ( bsigma ) base = chop( tmp_, "/sigma" );
- if ( bmean ) base = chop( tmp_, "/mean" );
-
+ std::string _tmp = histos[i];
+ std::string base = chop( _tmp, "/sigma" );
+
TH2D* _htest2d = (TH2D*)ftest.Get((chains[j]+"/"+base+"/2d").c_str()) ;
- TH2D* _href2d = (TH2D*)ftest.Get((refchain+"/"+base+"/2d").c_str()) ;
+ TH2D* _href2d = (TH2D*)ftest.Get((refchain+"/"+base+"/2d").c_str()) ;
savedhistos.push_back( chains[j]+"/"+base+"/2d" );
- if ( _htest2d==0 ) continue;
- if ( !noreftmp && _href2d==0 ) noreftmp = true;
- Plotter::setplotref(!noreftmp);
-
+ if ( _htest2d==0 || ( !noref && _href2d==0 ) ) continue;
+
/// get the test histogram
// std::cout << "test " << _htest2d << std::endl;
Resplot rtest("tmp", _htest2d);
- // if ( contains(histos[i],"npix") || contains(histos[i],"nsct") ) rtest.Finalise(Resplot::FitNull);
- // else rtest.Finalise(Resplot::FitNull95);
- if ( rtest.finalised() ) {
- if ( contains(histos[i],"npix") || contains(histos[i],"nsct") ) rtest.Refit(Resplot::FitNull);
- else rtest.Refit(Resplot::FitNull95);
- }
- else {
- if ( contains(histos[i],"npix") || contains(histos[i],"nsct") ) rtest.Finalise(Resplot::FitNull);
- else rtest.Finalise(Resplot::FitNull95);
- }
-
- if ( bsigma ) { htest = (TH1F*)rtest.Sigma()->Clone("rtest_sigma"); htest->SetDirectory(0); }
- if ( bmean ) { htest = (TH1F*)rtest.Mean()->Clone("rtest_mean"); htest->SetDirectory(0); }
+ rtest.Finalise(Resplot::FitNull95);
+ htest = (TH1F*)rtest.Sigma()->Clone("rtest_sigma"); htest->SetDirectory(0);
- if ( htest==0 ) {
- std::cerr << "missing histogram: " << (refchain+"/"+histos[i]) << " " << htest << std::endl;
- continue;
- }
-
-
- /// Actually D) refit the references - if we are adding together many
- /// resplots, then the means etc may not even have been calculated
- ///
/// NB: DON'T Refit the reference, since only the central values
/// are plotted
// std::cout << "ref " << _href2d << std::endl;
@@ -1132,49 +1027,20 @@ int main(int argc, char** argv) {
/// still get the reference histo
// href = (TH1F*)fref.Get((chains[j]+"/"+histos[i]).c_str()) ;
+ TH1F* hreft = (TH1F*)fref.Get( (refchain+"/"+histos[i]).c_str() );
-
- // TH1F* hreft = (TH1F*)fref.Get( (refchain+"/"+histos[i]).c_str() );
- TH1F* hreft = 0;
-
- if ( !noreftmp ) {
- if ( refitref_resplots ) {
- // std::cout << "test " << _htest2d << std::endl;
- Resplot rref("tmp", _href2d);
-
- if ( rref.finalised() ) {
- if ( contains(histos[i],"npix") || contains(histos[i],"nsct") ) rref.Refit(Resplot::FitNull);
- else rref.Refit(Resplot::FitNull95);
- }
- else {
- if ( contains(histos[i],"npix") || contains(histos[i],"nsct") ) rref.Finalise(Resplot::FitNull);
- else rref.Finalise(Resplot::FitNull95);
- }
-
- if ( bsigma ) { hreft = (TH1F*)rref.Sigma()->Clone("rref_sigma"); hreft->SetDirectory(0); }
- if ( bmean ) { hreft = (TH1F*)rref.Mean()->Clone("rref_mean"); hreft->SetDirectory(0); }
-
- }
- else {
- hreft = (TH1F*)fref.Get( (refchain+"/"+histos[i]).c_str() );
- }
- }
-
- if ( !noreftmp && hreft==0 ) {
- std::cerr << "missing histogram: " << (refchain+"/"+histos[i]) << " " << htest << std::endl;
- noreftmp = true;
- Plotter::setplotref(!noreftmp);
- }
-
- if ( !noreftmp ) {
- href = (TH1F*)hreft->Clone();
- href->SetDirectory(0);
+ if ( htest==0 || hreft==0 ) {
+ std::cerr << "missing histogram: " << (refchain+"/"+histos[i]) << " " << hreft << std::endl;
+ continue;
}
-
- // std::cout << "\tget " << (refchain+"/"+histos[i]) << "\t" << href << std::endl;
-
+
+ href = (TH1F*)hreft->Clone();
+ href->SetDirectory(0);
+
+ std::cout << "\tget " << (refchain+"/"+histos[i]) << "\t" << href << std::endl;
+
savedhistos.push_back( refchain+"/"+histos[i] );
-
+
}
else {
@@ -1192,29 +1058,24 @@ int main(int argc, char** argv) {
TH1F* hreft = (TH1F*)fref.Get((refchain+"/"+reghist).c_str()) ;
- if ( htest==0 ) {
- if ( htest==0 ) std::cerr << "missing histogram: " << (chains[j]+"/"+reghist) << " " << htest<< std::endl;
- continue;
- }
- if ( !noreftmp && hreft==0 ) {
+ if ( htest==0 || hreft==0 ) {
+ if ( htest==0 ) std::cerr << "missing histogram: " << (chains[j]+"/"+reghist) << " " << htest<< std::endl;
if ( hreft==0 ) std::cerr << "missing histogram: " << (refchain+"/"+reghist) << " " << hreft << std::endl;
- noreftmp = true;
- Plotter::setplotref(false);
+ continue;
}
if ( fulldbg ) std::cout << "htest: " << htest << std::endl;
if ( fulldbg ) std::cout << "hreft: " << hreft << std::endl;
- if ( hreft!=0 ) {
- href = (TH1F*)hreft->Clone();
- href->SetDirectory(0);
- }
+ href = (TH1F*)hreft->Clone();
+ href->SetDirectory(0);
+
std::cout << "\tget " << ( refchain+"/"+reghist) << "\thref " << href << std::endl;
std::cout << "\tget " << (chains[j]+"/"+reghist) << "\thtest " << htest << std::endl;
- if ( htest==0 || ( !noreftmp && href==0 ) ) continue;
+ if ( htest==0 || ( !noref && href==0 ) ) continue;
if ( fulldbg ) std::cout << __LINE__ << std::endl;
@@ -1259,10 +1120,9 @@ int main(int argc, char** argv) {
TH1F* hrefnumt = (TH1F*)fref.Get((refchain+"/"+histos[i]+"_n").c_str()) ;
- if ( !noreftmp && hrefnumt!=0 ) {
- hrefnum = (TH1F*)hrefnumt->Clone();
- hrefnum->SetDirectory(0);
- }
+ hrefnum = (TH1F*)hrefnumt->Clone();
+ hrefnum->SetDirectory(0);
+
// savedhistos.push_back( chains[j]+"/"+histos[i]+"_n" );
savedhistos.push_back( refchain+"/"+histos[i]+"_n" );
@@ -1339,7 +1199,7 @@ int main(int argc, char** argv) {
continue;
}
- if ( !noreftmp && href==0 ) {
+ if ( !noref && href==0 ) {
std::cout << " no ref histogram : " << (chains[j]+"/"+histos[i]) << std::endl;
continue;
}
@@ -1350,7 +1210,7 @@ int main(int argc, char** argv) {
htest->GetXaxis()->SetTitle(xaxis.c_str());
htest->GetYaxis()->SetTitle(yaxis.c_str());
- if ( !noreftmp ) {
+ if ( !noref ) {
href->GetYaxis()->SetTitleOffset(1.5);
href->GetXaxis()->SetTitleOffset(1.5);
href->GetXaxis()->SetTitle(xaxis.c_str());
@@ -1364,7 +1224,7 @@ int main(int argc, char** argv) {
if ( contains(histos[i],"ntracks") ) {
htest->Rebin(2);
htest->Sumw2();
- if ( !noreftmp ) {
+ if ( !noref ) {
href->Rebin(2);
href->Sumw2();
}
@@ -1480,8 +1340,6 @@ int main(int argc, char** argv) {
/// resolutions
- xpos = xpos_original;
-
std::cout << "calculating resolutions : " << histos[i] << " " << htest->GetName() << std::endl;
TF1* d95 = Resplot::FitNull95( (TH1D*)htest );
@@ -1587,7 +1445,7 @@ int main(int argc, char** argv) {
- if ( !noreftmp && normref && !contains( histos[i], "mean") && !contains( histos[i], "sigma" ) && !contains( histos[i], "eff" ) ) {
+ if ( !noref && normref && !contains( histos[i], "mean") && !contains( histos[i], "sigma" ) && !contains( histos[i], "eff" ) ) {
double entries = Entries( htest );
Norm( href, entries );
}
@@ -1733,7 +1591,7 @@ int main(int argc, char** argv) {
if ( contains(histos[i],"_res") || contains(histos[i],"residual_") || contains(histos[i],"1d") ){
for ( unsigned j=0 ; j<chains.size() ; j++ ) {
- if ( !noreftmp ) {
+ if ( !noref ) {
if ( j<MeanRef.size() ) {
if ( !nomeans ) DrawLabel( xpos_original-0.02, (0.57-j*0.035), MeanRef[j], colours[j%6] );
DrawLabel( xpos_original-0.02, (0.57-0.035*chains.size()-j*0.035)-0.01, RMSRef[j], colours[j%6] );
@@ -1806,10 +1664,7 @@ int main(int argc, char** argv) {
/// if deleting all non-used reference histograms
- /// make sure we are not using the same reference as test file
- bool files_duplicated = ( _fref==_ftest );
-
- if ( deleteref && !files_duplicated ) {
+ if ( deleteref ) {
if ( _fref ) {
@@ -1841,7 +1696,7 @@ int main(int argc, char** argv) {
}
TH1* href = (TH1*)fref.Get( savedhistos[i].c_str() );
- if ( !noreftmp && href ) {
+ if ( !noref && href ) {
std::cout << i << " " << savedhistos[i] << " 0x" << href << std::endl;
href->Write( dirs.back().c_str() );
}
@@ -1860,14 +1715,15 @@ int main(int argc, char** argv) {
/// close files
- if ( _fref && !files_duplicated ) _fref->Close();
if ( _ftest ) _ftest->Close();
+ if ( _fref ) _fref->Close();
+
/// now actually overwrite the old reference file
- if ( deleteref && !noref ) {
+ if ( deleteref ) {
std::cout << "ref " << frefname << "\ttest " << ftestname << std::endl;
- if ( frefname != ftestname && !files_duplicated ) {
+ if ( frefname != ftestname ) {
std::string cmd = std::string("mv ") + frefname + " " + frefname + ".bak";
std::system( cmd.c_str() );
@@ -1879,10 +1735,8 @@ int main(int argc, char** argv) {
}
}
- // std::cout << "deleting " << __LINE__ << std::endl;
-
- if ( _fref && !files_duplicated ) delete _fref;
if ( _ftest ) delete _ftest;
+ if ( _fref ) delete _fref;
return 0;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
index 6ec6b2caf911..253d4a211c3c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
@@ -24,7 +24,6 @@
#include "TFile.h"
#include "TKey.h"
-#include "TList.h"
#include "TObject.h"
#include "TDirectory.h"
#include "TH1D.h"
@@ -394,73 +393,3 @@ void xrangeuser(TH1* h, bool symmetric ) {
std::vector<double> limits = findxrangeuser( h, symmetric );
h->GetXaxis()->SetRangeUser( limits[0], limits[1] );
}
-
-
-
-std::string findcell( std::string name, const std::string regex, const std::string splitex ) {
-
- size_t posex = name.find( regex );
-
- if ( posex==std::string::npos ) return "";
-
- size_t pos = name.find_last_of( splitex );
-
- std::string duff = name;
-
- while ( pos!=std::string::npos && pos>posex+regex.size() ) {
- name = name.substr( 0, pos );
- pos = name.find_last_of( splitex );
- }
-
- pos = name.find( regex );
-
- name = name.substr( pos, name.size() );
-
- pos = name.find( splitex );
-
- if ( pos!=std::string::npos ) return name.substr( 0, pos );
-
- return name;
-}
-
-
-
-std::string findrun( TFile* f ) {
-
- TDirectory* here = gDirectory;
-
- f->cd();
-
- std::cout << "gDirectory::GetName() " << gDirectory->GetName() << std::endl;
-
- // gDirectory->pwd();
-
- // gDirectory->ls();
-
- TList* tl = gDirectory->GetListOfKeys();
-
- /// go through sub directories
-
- for ( int i=0 ; i<tl->GetSize() ; i++ ) {
-
- TKey* tobj = (TKey*)tl->At(i);
-
- if ( tobj==0 ) continue;
-
- if ( std::string(tobj->GetClassName()).find("TDirectory")!=std::string::npos ) {
-
- TDirectory* tnd = (TDirectory*)tobj->ReadObj();
-
- std::string name = tnd->GetName();
-
- if ( name.find( "run_" )==0 ) {
- here->cd();
- return name;
- }
- }
- }
-
- here->cd();
-
- return "";
-}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
index 6eef5f3db8d1..819d73c6f5e9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
@@ -26,7 +26,6 @@
#include "TStyle.h"
#include "TPad.h"
#include "TH1D.h"
-#include "TFile.h"
#include "TH1.h"
#include "TGraphAsymmErrors.h"
@@ -321,15 +320,14 @@ public:
tPlotter(T* _htest=0, T* _href=0, const std::string& s="", TGraphAsymmErrors* _tgtest=0, TGraphAsymmErrors* _tgref=0 ) :
m_htest(_htest), m_href(_href),
m_tgtest(_tgtest), m_tgref(_tgref),
- m_plotfilename(s) {
- // plotref = true;
+ m_plotfilename(s) {
}
tPlotter(const tPlotter& p) :
m_htest(p.m_htest), m_href(p.m_href),
m_tgtest(p.m_tgtest), m_tgref(p.m_tgref),
- m_plotfilename(p.m_plotfilename) {
+ m_plotfilename(p.m_plotfilename){
}
@@ -407,15 +405,10 @@ public:
// if ( contains(href()->GetName(),"sigma") ) href()->SetMinimum(0);
- // std::cout << "plotref " << plotref << " " << href() << std::endl;
-
if ( plotref && href() ) {
if ( contains(href()->GetName(),"_vs_") ||
contains(href()->GetName(),"sigma") ||
- contains(href()->GetName(),"mean") ||
- contains(href()->GetName(),"_eff") ||
- contains(href()->GetName(),"Res_") ||
- contains(href()->GetName(),"Eff_") ) href()->Draw("hist same][");
+ contains(href()->GetName(),"_eff") ) href()->Draw("hist same][");
else href()->Draw("hist same");
}
@@ -450,6 +443,10 @@ public:
std::string key = m_plotfilename;
+ char _mean[64];
+ std::sprintf( _mean, " <t> = %3.2f ms", htest()->GetMean() );
+
+
// std::cout << "adding key " << key << std::endl;
// if ( contains( key, "FastTrack" ) ) leg->AddEntry( htest(), " Run 2: Fast Tracking", "p" );
@@ -468,48 +465,15 @@ public:
if ( mean ) {
-
- char _meanref[64];
- bool displayref = false;
- if ( meanplotref && href() ) {
- displayref = true;
- std::sprintf( _meanref, " <t> = %3.2f #pm %3.2f ms (ref)", href()->GetMean(), href()->GetMeanError() );
+ key += std::string(" : ");
+ if ( key.size()<47 ) {
+ key += _mean;
+ leg->AddEntry( htest(), key.c_str(), "p" );
}
else {
- std::sprintf( _meanref, "%s", "" );
- }
-
- char _mean[64];
- std::sprintf( _mean, " <t> = %3.2f #pm %3.2f ms", htest()->GetMean(), htest()->GetMeanError() );
-
- std::cout << "alg: " << m_plotfilename << " " << _mean << "\tref: " << _meanref << std::endl;
-
- std::string rkey = key;
-
- key += std::string(" : ");
- // if ( key.size()<15 ) {
- // key += _mean;
- // leg->AddEntry( htest(), key.c_str(), "p" );
- // }
- // else {
leg->AddEntry( htest(), key.c_str(), "p" );
leg->AddEntry( hnull, _mean, "p" );
- // }
-
- if ( displayref ) {
- rkey += std::string(" : ");
- // if ( rkey.size()<15 ) {
- // rkey += _meanref;
- // leg->AddEntry( href(), rkey.c_str(), "l" );
- // }
- // else {
- leg->AddEntry( hnull, "", "l" );
- leg->AddEntry( href(), rkey.c_str(), "l" );
- leg->AddEntry( hnull, _meanref, "l" );
- // }
}
-
-
}
else leg->AddEntry( htest(), key.c_str(), "p" );
@@ -535,8 +499,7 @@ public:
public:
- static void setplotref( bool b ) { plotref=meanplotref=b; }
- static void setmeanplotref( bool b ) { meanplotref=b; }
+ static void setplotref( bool b ) { plotref=b; }
private:
@@ -550,7 +513,6 @@ private:
std::string m_plotfilename;
static bool plotref;
- static bool meanplotref;
};
@@ -558,10 +520,6 @@ template<typename T>
bool tPlotter<T>::plotref = true;
-template<typename T>
-bool tPlotter<T>::meanplotref = true;
-
-
typedef tPlotter<TH1F> Plotter;
@@ -885,12 +843,5 @@ private:
};
-std::string findcell( std::string name, const std::string regex, const std::string splitex="/" );
-
-
-std::string findrun( TFile *f );
-
-
-
#endif // COMPUTILS_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
index 825cab802128..20d69c45c113 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
@@ -41,15 +41,13 @@ int usage(const std::string& name, int status) {
s << "Usage: " << name << " [OPTIONS] expert-monitoring.root reference.root algorithm1 algorithm2 algorithm3 ...\n\n";
s << " TIDA \'" << name << "\' extracts timing histograms\n\n";
s << "Options: \n";
- s << " -o, --outputfolder value\t puts output in folder 'value' making it if it doesn't exist, \n";
- s << " -t, --tag value \t appends tag 'value' to the end of output plot names, \n";
- s << " -k, --key value \t prepends key 'value' to the front of output plot names, \n";
- s << " -a, --auto \t process all histograms that are in the file, \n";
- s << " -d, --directory value \t if auto is set, search only in specifed directory, \n";
- s << " -p, --pattern value \t if auto is set, search for histograms containing this string, \n";
- s << " -nr, --noref \t do not use a reference file, \n";
- s << " -v, --verbose \t verbose output\n";
- s << " -h, --help \t this help\n";
+ s << " -o, --outputfolder value\t puts output in folder 'value' making it if it doesn't exist, \n";
+ s << " -t, --tag value \t appends tag 'value' to the end of output plot names, \n";
+ s << " -k, --key value \t prepends key 'value' to the front of output plot names, \n";
+ s << " -a, --auto \t process all histograms that are in the file, \n";
+ s << " -d, --directory value \t if auto is set, search only in specifed directory, \n";
+ s << " -p, --pattern value \t if auto is set, search for histograms containing this string, \n";
+ s << " -h, --help \t this help\n";
s << std::endl;
return status;
}
@@ -104,12 +102,6 @@ int main(int argc, char** argv) {
TDirectory* tdir = gDirectory;
- bool verbose = false;
-
- bool noref = false;
-
- std::string frefname = "";
-
// Parse the arguments
std::vector<std::string> algorithms;
for(int argnum = 1; argnum < argc; argnum++){
@@ -136,12 +128,6 @@ int main(int argc, char** argv) {
else if (arg == "-a" || arg == "--auto") {
autochains = true;
}
- else if (arg == "-v" || arg == "--verbose") {
- verbose = true;
- }
- else if (arg == "-nr" || arg == "--noref") {
- noref = true;
- }
else if (arg == "-ap" || arg == "--autopattern") {
if (++argnum < argc) autopattern = argv[argnum];
else return usage(argv[0], -1);
@@ -165,31 +151,28 @@ int main(int argc, char** argv) {
return -2;
}
}
- else if ( frefname=="" ) frefname = arg;
+ else if (fref == 0) {
+ std::string file = globbed(arg);
+ if (exists(file)) {
+ fref = new TFile( file.c_str() );
+ }
+ else {
+ std::cerr << "main(): ref file " << arg << " does not exist" << std::endl;
+ return -3;
+ }
+ }
else {
algorithms.push_back(arg);
}
}
}
-
- if (ftest == 0 || ( noref==false && frefname=="" ) ) {
+
+ if (ftest == 0 || fref == 0 ) {
return usage(argv[0], -4);
}
-
- if ( fref == 0 && !noref ) {
- std::string file = globbed(frefname);
- if (exists(file)) {
- fref = new TFile( file.c_str() );
- }
- else {
- std::cerr << "main(): ref file " << frefname << " does not exist" << std::endl;
- return -3;
- }
- }
- if ( noref ) fref = ftest;
- if ( noref ) Plotter::setmeanplotref(!noref);
+
if ( ftest && autochains ) {
@@ -201,7 +184,6 @@ int main(int argc, char** argv) {
if ( autopattern=="" ) {
for ( unsigned j=0 ; j<dirs.size() ; j++ ) {
- if ( verbose ) std::cout << "\talgorithm " << dirs[j] << std::endl;
algorithms.push_back( dirs[j] );
}
}
@@ -282,13 +264,10 @@ int main(int argc, char** argv) {
TCanvas* c1 = new TCanvas( label("canvas-%d",int(histogram)).c_str(), "histogram", 800, 600 );
c1->cd();
- double x1 = 0.17;
- double x2 = 0.25;
- double y1 = 0.69;
- double y2 = 0.90;
-
- /// adjust the legend if no reference times are to be plotted
- if ( noref ) y1 = y2-0.5*(y2-y1);
+ double const x1 = 0.17;
+ double const x2 = 0.25;
+ double const y1 = 0.83;
+ double const y2 = 0.90;
Legend legend(x1, x2, y1, y2);
@@ -398,7 +377,7 @@ int main(int argc, char** argv) {
}
// }
- // else {
+ // else {
// plots.SetLogy(false);
// c1->SetLogy(false);
// }
@@ -429,17 +408,14 @@ int main(int argc, char** argv) {
/// AAAAARGH!!!! these deletes do not work!!! they just sit there for ever!!
/// what is wrong with these destructors !!! I ask you
-
- if ( fref!=ftest ) {
- std::cout << "deleting fref" << std::endl;
-
- // delete reftimers;
- delete fref;
- }
-
// delete testtimers;
delete ftest;
+ std::cout << "deleting fref" << std::endl;
+
+ // delete reftimers;
+ delete fref;
+
//#else
// std::cout << "rene brun is an arse" << std::endl;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
deleted file mode 100644
index e6e6a3d7bfbb..000000000000
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// @file globals.cxx
-//
-//
-// @author M Sutton
-//
-// $Id: globals.cxx, v0.0 Sun 12 Mar 2017 15:21:12 CET sutt $
-//
-// Copyright (C) 2017 M Sutton (sutt@cern.ch)
-
-#include "TrigInDetAnalysis/TIDARoiDescriptor.h"
-#include "TrigInDetAnalysis/TIDAEvent.h"
-
-TIDA::Event* gevent = 0;
-TIDARoiDescriptor* groi = 0;
-
-
-int Nvtxtracks = 0;
-int NvtxCount = 0;
-
-int NMod = 14;
-
-int r = 0;
-int lb = 0;
-int ts = 0;
-int ev = 0;
-
-double a0 = 1.5;
-
-bool hipt = false;
-bool dumpflag = false;
-
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
deleted file mode 100644
index 0a7ef44fdb0c..000000000000
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// emacs: this is -*- c++ -*-
-//
-// @file globals.h
-//
-//
-// $Id: globals.h, v0.0 Sun 12 Mar 2017 15:21:08 CET sutt $
-//
-// Copyright (C) 2017 M Sutton (sutt@cern.ch)
-
-#ifndef GLOBALS_H
-#define GLOBALS_H
-
-/// all these externals initialised in globals.cxx
-
-extern TIDARoiDescriptor* groi;
-extern TIDA::Event* gevent;
-
-extern int Nvtxtracks;
-extern int NvtxCount;
-
-extern int NMod;
-
-extern bool hipt;
-extern bool dumpflag;
-
-extern int r;
-extern int lb;
-extern int ts;
-extern int ev;
-
-extern double a0;
-
-#endif // GLOBALS_H
-
-
-
-
-
-
-
-
-
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
index 893d5527c2a3..8784f90064dd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
@@ -24,7 +24,6 @@
#include <cmath>
#include "lumiList.h"
-#include "computils.h"
class lumiParser : public lumiList {
@@ -44,13 +43,6 @@ public:
std::string cmd = "wget ";
cmd += file;
tail( file, "/" );
- if ( exists( file ) ) {
- /// save file if it exists to download again in case
- /// it has changed
- std::string mvcmd = "mv ";
- mvcmd += file + " " + file + ".bak";
- std::system( mvcmd.c_str() );
- }
std::system( cmd.c_str() );
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
index a1a865a55ebc..a5092e502e72 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
@@ -51,27 +51,6 @@
#include "zbeam.h"
-#include "computils.h"
-
-/// globals for communicating with *Analyses
-#include "globals.h"
-
-// in ConfAnalysis
-
-extern bool PRINT_BRESIDUALS;
-
-// in BinConfig.cxx
-extern BinConfig binConfig;
-
-extern BinConfig electronBinConfig;
-extern BinConfig muonBinConfig;
-extern BinConfig tauBinConfig;
-extern BinConfig bjetBinConfig;
-extern BinConfig cosmicBinConfig;
-
-
-
-
// useful function to return a string with the
// current date
std::string time_str() {
@@ -95,7 +74,26 @@ int atoi_check( const std::string& s ) {
else return i;
}
+int Nvtxtracks = 0;
+int NvtxCount = 0;
+
+bool hipt = false;
+
+bool dumpflag = false;
+
+extern bool PRINT_BRESIDUALS;
+
+
+
+int NMod = 14;
+
+int r = 0;
+int lb = 0;
+int ts = 0;
+int ev = 0;
+
+double a0 = 1.5;
/// Return selected author, expects format
@@ -213,6 +211,9 @@ struct event_list {
};
+TIDA::Event* gevent = 0;
+
+
int usage(const std::string& name, int status) {
@@ -220,15 +221,13 @@ int usage(const std::string& name, int status) {
s << "Usage: " << name << " <config filename> [OPTIONS]" << std::endl;
s << "\nOptions: \n";
- s << " -o, -f, --file value\toutput filename, \n";
- s << " -b, --binConfig value\tconfig file for histogram configuration, \n";
- s << " -r, --refChain value\treference chain, \n";
- s << " -t, --testChain value\ttest chain, \n";
- s << " -p, --pdgId value\tpdg ID of truth particle if requiring truth particle processing,\n";
- s << " -n, --nofit \ttest do not fit resplots, \n";
- s << " --rms \ttest force new rms95 errors, \n";
+ s << " -f, --file value\toutput filename, \n";
+ s << " -b, --binConfig value\tconfig file for histogram configuration, \n";
+ s << " -r, --refChain value\treference chain, \n";
+ s << " -t, --testChain value\ttest chain, \n";
// s << " -a, --all \tadd all grids (default)\n";
- s << " -h, --help \tthis help\n";
+ s << " -p, --pdgId value\tpdg ID of truth particle if requiring truth particle processing,\n";
+ s << " -h, --help \tthis help\n";
// s << "\nSee " << PACKAGE_URL << " for more details\n";
s << "\nReport bugs to sutt@cern.ch";
s << std::endl;
@@ -238,14 +237,25 @@ int usage(const std::string& name, int status) {
}
+/// global to grant access to the roi descriptor
+TIDARoiDescriptor* groi = 0;
+
+
+extern BinConfig binConfig;
+
+extern BinConfig electronBinConfig;
+extern BinConfig muonBinConfig;
+extern BinConfig tauBinConfig;
+extern BinConfig bjetBinConfig;
+extern BinConfig cosmicBinConfig;
// #define DATA
-// bool contains( const std::string& s, const std::string& r ) {
-// return s.find(r)!=std::string::npos;
-// }
+bool contains( const std::string& s, const std::string& r ) {
+ return s.find(r)!=std::string::npos;
+}
template<typename T>
std::vector<T*> pointers( std::vector<T>& v ) {
@@ -291,14 +301,11 @@ int main(int argc, char** argv)
std::string binningConfigFile = "";
- bool useoldrms = true;
- bool nofit = false;
-
for ( int i=1 ; i<argc ; i++ ) {
if ( std::string(argv[i])=="-h" || std::string(argv[i])=="--help" ) {
return usage(argv[0], 0);
}
- else if ( std::string(argv[i])=="-o" || std::string(argv[i])=="-f" || std::string(argv[i])=="--file" ) {
+ else if ( std::string(argv[i])=="-f" || std::string(argv[i])=="--file" ) {
if ( ++i>=argc ) return usage(argv[0], -1);
histofilename = argv[i];
if ( histofilename.find(".root")==std::string::npos ) histofilename += ".root";
@@ -307,8 +314,6 @@ int main(int argc, char** argv)
if ( ++i>=argc ) return usage(argv[0], -1);
refChain = argv[i];
}
- else if ( std::string(argv[i])=="--rms" ) useoldrms = false;
- else if ( std::string(argv[i])=="-n" || std::string(argv[i])=="--nofit" ) nofit = true;
else if ( std::string(argv[i])=="-t" || std::string(argv[i])=="--testChain" ) {
if ( ++i>=argc ) return usage(argv[0], -1);
testChains.push_back(argv[i]);
@@ -330,8 +335,6 @@ int main(int argc, char** argv)
datafile = argv[i];
}
}
-
-
if ( datafile=="" ) {
std::cerr << "no config file specifed\n" << endl;
@@ -344,24 +347,12 @@ int main(int argc, char** argv)
inputdata.print();
- /// true by default - command line options sets to false
- /// so should override what is in the config file
- if ( useoldrms ) {
- bool oldrms95 = true;
- inputdata.declareProperty( "OldRMS95", oldrms95 );
- std::cout << "setting Resplot old rms95 " << oldrms95 << std::endl;
- Resplot::setoldrms95( oldrms95 );
- }
- else {
- std::cout << "setting Resplot old rms95 " << useoldrms << std::endl;
- Resplot::setoldrms95( useoldrms );
- }
-
- if ( nofit ) {
- std::cout << "Not fitting resplots " << std::endl;
- Resplot::setnofit( nofit );
- }
+#if 0
+ bool oldrms95 = true;
+ inputdata.declareProperty( "OldRMS95", oldrms95 );
+ Resplot::setoldrms95( oldrms95 );
+#endif
unsigned nfiles = 0;
@@ -1088,9 +1079,9 @@ int main(int argc, char** argv)
for (unsigned int ids=0 ; ids<datasets.size() ; ids++ ) {
std::cout << "\tdataset " << datasets[ids] << std::endl;
dataset d( datasets[ids] );
- std::vector<std::string> filenames_ = d.datafiles();
- std::cout << "\tdataset contains " << filenames_.size() << " files" << std::endl;
- filenames.insert(filenames.end(), filenames_.begin(),filenames_.end());
+ std::vector<std::string> _filenames = d.datafiles();
+ std::cout << "\tdataset contains " << _filenames.size() << " files" << std::endl;
+ filenames.insert(filenames.end(),_filenames.begin(),_filenames.end());
}
}
else if ( inputdata.isTagDefined("DataFiles") ) filenames = inputdata.GetStringVector("DataFiles");
@@ -1121,7 +1112,7 @@ int main(int argc, char** argv)
if ( finput==0 || !finput->IsOpen() || finput->IsZombie() ) {
- std::cerr << "Error: could not open input file: " << filenames[i] << std::endl;
+ std::cerr << "Error: could not open input file" << filenames[i] << std::endl;
exit(-1);
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
index 4b068386729c..08abf41d70ba 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
@@ -46,7 +46,7 @@ atlas_add_library( TIDA
Analysis/src/ConfAnalysis.cxx
Analysis/src/ConfVtxAnalysis.cxx
Analysis/src/PurityAnalysis.cxx
- Analysis/src/globals.cxx
+ Analysis/src/rmain.cxx
NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES TrigInDetAnalysisExampleLib Resplot Readcards
@@ -112,18 +112,11 @@ atlas_add_executable( TIDAmakeSmallRefFile
LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
atlas_add_executable( TIDAruntool
- Analysis/src/runtool.cxx
- Analysis/src/computils.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} )
-
-atlas_add_executable( TIDAsb
- Analysis/src/chainparser.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES Readcards )
-
+ Analysis/src/runtool.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} )
# Install files from the package:
-atlas_install_runtime( share/TIDA*.dat share/Test*.dat share/TIDA*.py )
+atlas_install_runtime( share/TIDA*.dat share/Test_bin.dat share/TIDA*.py )
atlas_install_scripts( scripts/TIDA*.sh )
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
index e787938d5509..d6941041635c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
@@ -81,7 +81,7 @@ void ReadCards::Construct(const std::string& filename) {
else std::sprintf( tfile, ".readcards-%d", pid );
char cmd[256];
- std::sprintf( cmd, "cpp -I. -P %s > %s", mFileName.c_str(), tfile );
+ std::sprintf( cmd, "cpp -P %s > %s", mFileName.c_str(), tfile );
std::system( cmd );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
index 44b5ce3285a9..9c0a60f4dafa 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
@@ -37,7 +37,6 @@ ClassImp(Resplot)
bool Resplot::mAddDirectoryStatus = true;
bool Resplot::interpolate_flag = true;
-bool Resplot::nofit = false;
/// use the new error estimates
bool Resplot::oldrms95 = true;
@@ -429,6 +428,15 @@ int Resplot::Finalise(double a, double b, TF1* (*func)(TH1D* s, double a, double
// std::cout << i << " fitnull " << getWeights( s ) << std::endl;
+#if 0
+ int ib = s->GetNbinsX()/2;
+
+ if ( s->GetBinContent(ib) ) {
+ std::cout << "hhhh " << s->GetBinError(ib) << " " << s->GetBinContent(ib)
+ << " " << m_h2d->GetBinError(i,ib) << " " << m_h2d->GetBinContent(i,ib) << std::endl;
+ }
+#endif
+
if ( !m_uniform ) binwidth(s);
s->SetTitle(projname.c_str());
if ( m_yaxis!="" ) s->SetXTitle(m_yaxis.c_str());
@@ -438,19 +446,15 @@ int Resplot::Finalise(double a, double b, TF1* (*func)(TH1D* s, double a, double
// ZeroErrors(s);
- TF1* f1 = 0;
-
-
- if ( !nofit ) f1 = func(s, a, b);
-
- // std::cout << "nofit " << nofit << "\tf1 " << f1 << std::endl;
+ TF1* f1 = func(s, a, b);
// unZeroErrors(s);
- if ( f1!=0 ) {
+ if ( f1!=NULL ) {
+
f1->SetLineWidth(1);
f1->SetNpx(5000);
m_fitname = f1->GetName();
@@ -503,26 +507,20 @@ int Resplot::Finalise(double a, double b, TF1* (*func)(TH1D* s, double a, double
// get the overall resolution and offset
if ( !m_uniform ) binwidth(m_h1d);
+ ZeroErrors(m_h1d);
+ TF1* f2 = func(m_h1d, a, b);
+
- TF1* f2 = 0;
-
- if ( !nofit ) {
- ZeroErrors(m_h1d);
- f2 = func(m_h1d, a, b);
- unZeroErrors(m_h1d);
- }
-
- if ( f2!=0 ) {
+ unZeroErrors(m_h1d);
+ if ( f2!=NULL ) {
// std::cout << " fit = " << f2 << std::endl;
f2->SetLineWidth(1);
f2->SetNpx(5000);
g_mean = StatVal( f2->GetParameter(1), f2->GetParError(1) );
g_sigma = StatVal( f2->GetParameter(2), f2->GetParError(2) );
-
- // std::cout << gDirectory->GetName() << "\tgmean " << g_mean << "\tgsigma " << g_sigma << std::endl;
-
+
std::string mname = std::string(f2->GetParName(1));
std::string sname = std::string(f2->GetParName(2));
@@ -534,7 +532,7 @@ int Resplot::Finalise(double a, double b, TF1* (*func)(TH1D* s, double a, double
delete f2;
}
else {
- if ( !nofit ) std::cerr << "null overall fit Resplot:" << m_name << std::endl;
+ std::cerr << "null overall fit Resplot:" << m_name << std::endl;
g_mean = StatVal(0,0);
g_sigma = StatVal(0,0);
}
@@ -1303,7 +1301,7 @@ TF1* Resplot::FitATan(TH1D* s, double , double ) {
TF1* Resplot::FitNull(TH1D* s, double , double ) {
- // unZeroErrors(s);
+ unZeroErrors(s);
TF1* f=new TF1("null", "[0]+[1]+[2]");
@@ -1315,8 +1313,6 @@ TF1* Resplot::FitNull(TH1D* s, double , double ) {
f->FixParameter(1, s->GetMean()); f->SetParError(1, s->GetMeanError());
f->FixParameter(2, s->GetRMS()); f->SetParError(2, s->GetRMSError());
- // std::cout << gDirectory->GetName() << " " << s->GetName() << "\tFitNull mean: " << f->GetParameter(1) << "\tsigma: " << f->GetParameter(2) << std::endl;
-
return f;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
index 693c8a4ede58..6933771aa7d3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
@@ -364,8 +364,6 @@ public:
TH1D* Uncertainty() { return m_Nentries; }
const TH1D* Uncertainty() const { return m_Nentries; }
- bool finalised() const { return m_finalised; }
-
// and the fitted slices
std::vector<TH1D*> Slices() { return m_slices; }
@@ -552,7 +550,6 @@ public:
static std::string version() { return rversion; }
static bool setoldrms95(bool b) { return oldrms95=b; }
static bool setscalerms95(bool b) { return scalerms95=b; }
- static bool setnofit(bool b) { return nofit=b; }
/// flip the x and y axes
static TH2D* rotate(const TH2* h);
@@ -675,9 +672,6 @@ private:
static bool oldrms95;
static bool scalerms95;
- static bool nofit;
-
-
static ERROR ErrorSet; //! don't persistify this
ClassDef(Resplot, 1)
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/cmt/requirements b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/cmt/requirements
index f409aa47914b..2404e3ae868d 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/cmt/requirements
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/cmt/requirements
@@ -42,7 +42,7 @@ macro_append TIDAcomputils_cppflags " -I../Readcards/src -I../Resplot/src "
application TIDAreader "../Analysis/src/reader.cxx
macro_append TIDAreader_cppflags " -I../Readcards/src"
-application TIDArdict "../Analysis/src/rmain.cxx ../Analysis/src/computils.cxx
+application TIDArdict "../Analysis/src/rmain.cxx"
macro_append TIDArdict_cppflags " -I../Resplot/src -I../Readcards/src "
macro_append TIDArdictlinkopts " -lResplot -lReadcards -lTIDA -lXrdPosix "
macro_append TIDArdict_dependencies " Resplot Readcards TIDA "
@@ -74,18 +74,11 @@ macro_append TIDAlistroot_cppflags " -I../Readcards/src "
macro_append TIDAlistrootlinkopts " -lReadcards "
macro_append TIDAlistroot_dependencies " Readcards "
-application TIDAruntool "../Analysis/src/runtool.cxx ../Analysis/src/computils.cxx ""
-macro_append TIDAruntool_cppflags " -I../Readcards/src "
-macro_append TIDArunntoollinkopts " -lReadcards "
-macro_append TIDAruntool_dependencies " Readcards "
+application TIDAruntool "../Analysis/src/runtool.cxx"
# macro_append TIDAlistrootlinkopts " -lResplot -lTIDA"
# macro_append TIDAlistroot_dependencies " Resplot TIDA "
-application TIDAsb "../Analysis/src/chainparser.cxx"
-macro_append TIDAsb_cppflags " -I../Readcards/src "
-macro_append TIDAsblinkopts " -lReadcards"
-macro_append TIDAsb_dependencies " Readcards "
@@ -97,7 +90,7 @@ macro_append TIDAmakeSmallRefFile_dependencies " "
apply_pattern declare_scripts files="../scripts/TIDA*.sh"
-apply_pattern declare_runtime extras="../share/TIDA*.dat ../share/TIDA*.py ../share/Test_*.dat"
+apply_pattern declare_runtime extras="../share/TIDA*.dat ../share/TIDA*.py ../share/Test_bin.dat"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDApost.sh b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDApost.sh
deleted file mode 100755
index 5b99d737740d..000000000000
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDApost.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-pwd
-
-echo "args: $*"
-
-BASEDIR=/afs/cern.ch/user/s/sutt/public
-
-RUNSCRIPT=$BASEDIR/TIDArdict.sh
-
-cp $RUNSCRIPT .
-
-./TIDArdict.sh $*
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDArun.sh b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDArun.sh
index 740d577a23bf..1beefe681ffa 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDArun.sh
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/scripts/TIDArun.sh
@@ -4,7 +4,17 @@ pwd
echo "args: $*"
-BASEDIR=/eos/atlas/atlascerngroupdisk/proj-sit/trigindet
+BASEDIR=/afs/cern.ch/user/s/sutt/public
+
+
+# copy basic web page information
+
+for FILE in style.css index.php; do
+ echo "checking file $FILE"
+ if [ ! -e $FILE ]; then
+ cp $BASEDIR/TIDAWeb/TIDAV/$FILE .
+ fi
+done
echo
echo "copy reference file and run comparitor"
@@ -14,69 +24,39 @@ BASEREFDIR=$BASEDIR/TrigInDetValidationReference
if [ -e TrkNtuple-0000.root ]; then
- RELEASE=$(TIDAreader.exe -ro TrkNtuple-0000.root | grep release | awk '{print $2}' | head -1)
+ RELEASE=$(TIDAreader.exe -ro data*.root | grep release | awk '{print $2}' | head -1)
REFDIR=$BASEREFDIR/share
- echo "RELEASE: $RELEASE"
-
if [ -d $BASEREFDIR/$RELEASE ]; then
REFDIR=$BASEREFDIR/$RELEASE
fi
echo "fetching reference files from $REFDIR"
-
- EXPERT=$(echo $1 $2 | grep expert)
-
- # if expert timing histos
- if [ "x$EXPERT" != "x" ]; then
- if [ "x$RTTJOBNAME" != "x" ]; then
- EXPERTREF="expert-monitoring-$(echo $RTTJOBNAME | sed 's|TrigInDetValidation_||g')-ref.root"
- REFFILE=$REFDIR/expert/$EXPERTREF
- else
- REFFILE=$REFDIR/expert/$2
- fi
- else
- REFFILE=$REFDIR/$2
- fi
-
- NOREF=
-
- if [ ! -e $REFFILE ]; then
-
- echo "no reference file $REFFILE - will process without"
-
- NOREF=--noref
-
- else
+
+ REFFILE=$REFDIR/$2
+ if [ -e $REFFILE ]; then
echo "copying $REFFILE"
LOCALFILE=$(basename $REFFILE)
- # don't bother to copy it if it already exists in this directory
- [ -e $LOCALFILE ] || cp $REFFILE .
-
- fi
+ # don;t bother to copy it if it already exists in this directory
+ if [ ! -e $LOCALFILE ]; then
+ cp $REFFILE .
+ fi
+
+ ls -l
- ls -l
+ echo
+ echo "running comparitor " `date`
+ echo
- for arg in $*; do
- if $(echo "$arg" | grep -q "TIDA.*.dat"); then get_files -data "$arg"; fi
- if $(echo "$arg" | grep -q "Test.*.dat"); then get_files -data "$arg"; fi
- done
+ TIDAcomparitor.exe $*
- if [ "x$EXPERT" == "x" ]; then
- get_files -data TIDAhistos-vtx.dat
- echo -e "\nrunning comparitor " $(date) "\n"
- TIDAcomparitor.exe $* $NOREF
else
- echo -e "\nrunning cpucost " $(date) "\n"
- TIDAcpucost.exe $* $NOREF
+ echo "no reference file $REFFILE"
fi
- echo "finished postprocessing"
-
- ls -l
fi
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata11-rtt-offline.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata11-rtt-offline.dat
index 7ee987bfe180..6f56335340cc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata11-rtt-offline.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata11-rtt-offline.dat
@@ -36,8 +36,8 @@ testChains = {
// "Electrons",
// "Truth",
- /// "Truth",
- /// "Offline",
+ "Truth",
+ "Offline",
// "L2_e22vh_medium_IDTrkNoCut:TrigL2SiTrackFinder_eGamma:0",
// "L2_e22vh_medium_IDTrkNoCut:TrigL2SiTrackFinder_eGamma:1",
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhistos-vtx.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhistos-vtx.dat
deleted file mode 100644
index f0d00b11e010..000000000000
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhistos-vtx.dat
+++ /dev/null
@@ -1,46 +0,0 @@
-// emacs: this is -*- c++ -*-
-
-histos = {
-
- /// xPrimVx plots
- "leadpt", "Leading p_{T}", "xaxis:log:auto", "Leading offline track p_{T} [GeV]", "yaxis:lin:autonw", "(1/n)dn/dp_{T} [GeV^{-1}]" ,
- "ntrax", "Number of tracks", "xaxis:lin:auto", "Offline track multiplcicty", "yaxis:log:autonw", "(1/n)dn/dN" ,
- "ntrax_rec", "Number of tracks", "xaxis:lin:auto", "Trigger track multiplicity", "yaxis:log:autonw", "(1/n)dn/dN" ,
-
- "zed", "Vertex z position", "xaxis:lin:auto:-175:175", "Offline vertex z [mm]", "yaxis:log:auton", "(1/n)dn/dz [mm^{-1}]" ,
- "zed_rec", "Vertex z position", "xaxis:lin:auto:-175:175", "Trigger Vertex z [mm]", "yaxis:log:auton", "(1/n)dn/dz [mm^{-1}]" ,
-
- // "nvtx", "Number of vertices", "xaxis:lin:auto", "Number of vertices", "yaxis:log:auton", "" ,
- // "nvtx_rec", "Number of vertices", "xaxis:lin:auto", "Number of vertices", "yaxis:log:autonw", "" ,
-
- "mu", "mu", "xaxis:lin:auto", "pileup <#mu>", "yaxis:log:auton:0.1:1.2", "normalised entries" ,
- "mu_eff", "efficiency vs mu", "xaxis:lin:auto", "pileup <#mu>", "yaxis:lin:0.5:1.05", "Efficiency" ,
-
- /// xPrimVx efficiencies
- "leadpt_eff", "Efficiency Leading p_{T}", "xaxis:log:auto", "Leading track p_{T} [GeV]", "yaxis:lin:auto:0.90:1.02", "Vertex finding efficiency" ,
-
- "ntrax_eff", "Tracks efficiency", "xaxis:lin:auto", "Number of tracks", "yaxis:lin:0.80:1.02", "Vertex finding efficiency" ,
- "nvtx_eff", "Vertices efficiency", "xaxis:lin:auto", "Number of vertices", "yaxis:lin:auto:0.5:1.05", "Vertex finding efficiency" ,
- "zed_eff", "Efficiency z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:lin:0.50:1.05", "Vertex finding efficiency" ,
-
- "lb", "lumi blocks", "xaxis:lin:auto", "luminosity block", "yaxis:lin:autonw", "(1/n)dn/dlumiblock" ,
- "lb_eff", "Efficiency lb", "xaxis:lin:auto", "luminosity block", "yaxis:lin:0.50:1.05", "Vertex finding efficiency" ,
-
- /// xPrimVx residual
- "rdz_vs_zed/sigma", "Resolution z vs z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:lin:auto:0:0.5", "z_{0} resolution [mm]" ,
- "rdz_vs_zed/mean", "Offset z vs z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:lin:-0.25:0.25", "z_{0} mean [mm]" ,
-
- "rdz_vs_zed/1d", "Residual z", "xaxis:lin:-10:10", "#Delta z [mm]", "yaxis:log:autonw", "(1/N)dN/dz [mm^{-1}]" ,
-
- "rdz_vs_ntrax/sigma", "Residual z vs N_{tracks}", "xaxis:lin:auto", "Offline track multiplicity", "yaxis:log:0.03:10", "z_{0} resolution [mm]" ,
- "rdz_vs_ntrax/mean", "Offset z vs N_{tracks}", "xaxis:lin:auto", "Offline track multiplicity", "yaxis:lin:-0.25:0.25.", "z_{0} mean [mm]" ,
-
-
- // "rdz_vs_nvtx/sigma", "Residual z vs N_{vtx}", "xaxis:lin:auto", "Number of online vertices", "yaxis:lin:auto", "z_{0} resolution [mm]" ,
- "rdz_vs_leadpt/sigma", "Residual z vs lead p_{T}", "xaxis:log:auto", "Leading Track p_{T} [GeV]", "yaxis:lin:auto", "z_{0} resolution [mm]" ,
-
- // "rleadpt_vs_sumpt2/2d", "Residual lead p_{T} vs #Sigma p_{T}^{2}", "xaxis:lin:auto", "#Sigma p_{T}^{2} [GeV^{2}]", "yaxis:lin:auto", "Leading Track p_{T} [GeV]" ,
- // "rntrax_vs_sumpt2/2d", "Residual N tracks vs #Sigma p_{T}^{2}", "xaxis:lin:auto", "#Sigma p_{T}^{2} [GeV^{2}]", "yaxis:lin:auto", "N tracks" ,
-
-};
-
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
index 6e2c977b2e5c..d1d46c673f6d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
@@ -91,7 +91,7 @@ public:
private:
- // double md;
+ double md;
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
index 5ee31de08453..41ffda7d0e87 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
@@ -18,7 +18,7 @@
namespace TIDA {
bool isGoodOffline(const xAOD::Electron& elec, const unsigned int selection = 0, double ETOffline=0 );
bool isGoodOffline(const xAOD::Muon& muon, double ETOffline=0);
- bool isGoodOffline(const xAOD::TauJet& tau, const unsigned int selection=0, int requireNtracks=0, double EtOffline=0.0 );
+ bool isGoodOffline(const xAOD::TauJet& tau, bool doThreeProng = false, const unsigned int selection = 0, double EtOffline = 0.0 );
}
#else
@@ -30,7 +30,7 @@ namespace TIDA {
namespace TIDA {
bool isGoodOffline(const Analysis::Electron& elec);
bool isGoodOffline(const Analysis::Muon& muon);
- bool isGoodOffline(const Analysis::TauJet& tau, bool doThreeProng=false, double EtCutOffline=0.0);
+ bool isGoodOffline(const Analysis::TauJet& tau, bool doThreeProng = false, double EtCutOffline = 0.0);
}
#endif
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
index 42c4bd394c90..f5bce63ebab6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
@@ -33,7 +33,6 @@
#ifdef XAODTRACKING_TRACKPARTICLE_H
#include "xAODMuon/MuonContainer.h"
#include "xAODEgamma/ElectronContainer.h"
-#include "xAODEgamma/ElectronxAODHelpers.h"
#include "xAODTau/TauJetContainer.h"
#else
#include "muonEvent/MuonContainer.h"
@@ -465,9 +464,7 @@ protected:
////////////////////////////////////////////////////////////////////////////////////////////
/// select offline electrons
////////////////////////////////////////////////////////////////////////////////////////////
- unsigned processElectrons( TrigTrackSelector& selectorRef, const unsigned int selection=0,
- bool raw_track=false,
- double ETOffline=0,
+ unsigned processElectrons( TrigTrackSelector& selectorRef, const unsigned int selection=0, double ETOffline=0,
# ifdef XAODTRACKING_TRACKPARTICLE_H
const std::string& containerName = "Electrons"
# else
@@ -501,8 +498,8 @@ protected:
m_provider->msg(MSG::INFO) << "Event with " << container->size() << " Electron object(s) " << endmsg;
- Container::const_iterator elec = container->begin();
- Container::const_iterator elec_end = container->end();
+ auto elec = container->begin();
+ auto elec_end = container->end();
for( ; elec!=elec_end ; ++elec ){
//m_provider->msg(MSG::DEBUG) << " Electron " << (*elec)
@@ -517,15 +514,12 @@ protected:
bool good_electron = false;
# ifdef XAODTRACKING_TRACKPARTICLE_H
- good_electron = TIDA::isGoodOffline( *(*elec), selection, ETOffline );
+ good_electron = TIDA::isGoodOffline(*(*elec), selection, ETOffline );
# else
- good_electron = TIDA::isGoodOffline( *(*elec));
+ good_electron = TIDA::isGoodOffline(*(*elec));
# endif
-
- if (good_electron) {
- if ( raw_track ) selectorRef.selectTrack( xAOD::EgammaHelpers::getOriginalTrackParticle( *elec ) );
- else selectorRef.selectTrack( (*elec)->trackParticle() );
- }
+
+ if (good_electron) selectorRef.selectTrack( (*elec)->trackParticle() );
}
return selectorRef.tracks().size();
@@ -594,8 +588,8 @@ protected:
/// select offline taus
////////////////////////////////////////////////////////////////////////////////////////////
unsigned processTaus( TrigTrackSelector& selectorRef,
+ bool doThreeProng=true,
const unsigned selection=0,
- int requireNtracks=0,
double EtCutOffline=0,
# ifdef XAODTRACKING_TRACKPARTICLE_H
const std::string& containerName = "TauJets"
@@ -637,33 +631,20 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
for ( ; tau!=tau_end ; ++tau ) {
-# ifdef XAODTRACKING_TRACKPARTICLE_H
- // unsigned N = (*tau)->nTracks();
-
-# ifndef XAODTAU_VERSIONS_TAUJET_V3_H
- int N = (*tau)->nTracks();
- // std::cout << "SUTT no tau detail " << N << "\t3prong: " << doThreeProng << std::endl;
-# else
- int N=0;
- (*tau)->detail( xAOD::TauJetParameters::nChargedTracks, N );
- // std::cout << "SUTT tau detail: N " << N << "\t3prong: " << doThreeProng << std::endl;
-# endif
-
-# else
- unsigned N = (*tau)->numTrack();
-# endif
-
-
bool good_tau = false;
# ifdef XAODTRACKING_TRACKPARTICLE_H
- good_tau = TIDA::isGoodOffline( *(*tau), selection, requireNtracks, EtCutOffline );
+ good_tau = TIDA::isGoodOffline( *(*tau), doThreeProng, selection, EtCutOffline );
# else
- good_tau = TIDA::isGoodOffline( *(*tau), requireNtracks, EtCutOffline );
+ good_tau = TIDA::isGoodOffline( *(*tau), doThreeProng, EtCutOffline );
# endif
-
- // std::cout << "SUTT tau ntracks: " << N << "\tgoodtau: " << good_tau << "\tpt: " << (*tau)->p4().Et() << "\t3prong: " << doThreeProng << std::endl;
if (good_tau){
+# ifdef XAODTRACKING_TRACKPARTICLE_H
+ unsigned N = (*tau)->nTracks();
+# else
+ unsigned N = (*tau)->numTrack();
+# endif
+
for ( unsigned i=N ; i-- ; ) {
# ifdef XAODTAU_TAUTRACK_H
selectorRef.selectTrack((*tau)->track(i)->track());
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
index 46584edd2af2..8e71840eef23 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
@@ -13,7 +13,7 @@ bool TIDA::isGoodOffline(const xAOD::Electron& elec, const unsigned int selectio
double et = elec.e()*sintheta;
if ( std::fabs(et)<ETOffline ) return false;
- // if ( std::fabs(elec.e())<ETOffline ) return false;
+ if ( std::fabs(elec.e())<ETOffline ) return false;
if (selection == 1) return elec.passSelection("Tight");
else if (selection == 2) return elec.passSelection("Medium");
else if (selection == 3) return elec.passSelection("Loose");
@@ -29,33 +29,22 @@ bool TIDA::isGoodOffline(const xAOD::Muon& /*muon*/, double ) { return true; }
// xAOD offline tau selection
// selection: 0 = take all, 1 = tight, 2 = medium, 3 = loose, any other unsigned int = no JetBDTSig requirement
-bool TIDA::isGoodOffline(const xAOD::TauJet& tau, const unsigned int selection, int requireNtracks, double EtCutOffline ) {
+bool TIDA::isGoodOffline(const xAOD::TauJet& tau, bool doThreeProng, const unsigned int selection, double EtCutOffline ) {
- // still require the ET threshold and the track multiplicity
- // if ( selection==0) return true;
+ if ( selection== 0) return true;
/// hmmm
TLorentzVector TauTLV = tau.p4();
double eta_Tau = TauTLV.Eta();
double et_Tau = TauTLV.Et();
- if ( std::fabs(eta_Tau)>2.47 ) return false;
+ if ( std::fabs(eta_Tau)>2.47 ) return false;
if ( std::fabs(et_Tau)<EtCutOffline ) return false;
- // int ntrack_Tau = tau.nTracks();
+ int ntrack_Tau = tau.nTracks();
-#ifdef XAODTRACKING_TRACKPARTICLE_H
-#ifndef XAODTAU_VERSIONS_TAUJET_V3_H
- int Ntracks = tau.nTracks();
- // std::cout << "SUTT no tau detail " << Ntracks << "\t(isGood)" << std::endl;
-#else
- int Ntracks=0;
- tau.detail( xAOD::TauJetParameters::nChargedTracks, Ntracks );
- // std::cout << "SUTT tau detail: N " << Ntracks << "\t(isGood)" << std::endl;
-#endif
-#else
- int Ntracks = tau.numTrack();
-#endif
+ if ( doThreeProng==false && ntrack_Tau!=1 ) return false;
+ else if ( doThreeProng==true && ntrack_Tau!=3 ) return false;
// Could this selection just be replaced by a string that is passed in? Or an enumerate if the function is needed to be called when incrementing an int for the selection?
bool good_tau = false;
@@ -65,16 +54,17 @@ bool TIDA::isGoodOffline(const xAOD::TauJet& tau, const unsigned int selection,
else if ( selection == 3 ) good_tau = tau.isTau(xAOD::TauJetParameters::JetBDTSigLoose);
else good_tau = true;
- /// instead of a bool to decide on whether 1 or 3 tracks are required,
- /// why not just specify the number of tracks ?
- // if ( doThreeProng==false && Ntracks!=1 ) return false;
- // if ( doThreeProng==true && Ntracks!=3 ) return false;
- if ( requireNtracks>0 && Ntracks!=requireNtracks ) return false;
//bool not_a_electron = !( tauisTau(xAOD::TauJetParameters::EleBDTMedium) );
//bool not_a_muon = !( tauisTau(xAOD::TauJetParameters::MuonVeto) );
//bool best_tau = good_tau && not_a_electron && not_a_muon;
+ // bool best_tau = good_tau;
+ // if (!best_tau) return false;
+ // else if (best_tau) return true;
+
+ // return false; // Safeguard by defaulting to returning false if the rest of the method does not function correctly and this return point is reached
+
return good_tau;
}
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/TrigIDtrkMonitoring/HLTIDZeeTagProbe.h b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/TrigIDtrkMonitoring/HLTIDZeeTagProbe.h
index 27fe26b11538..5eca43bf5e2b 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/TrigIDtrkMonitoring/HLTIDZeeTagProbe.h
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/TrigIDtrkMonitoring/HLTIDZeeTagProbe.h
@@ -1,4 +1,6 @@
-/// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
#if 0
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
index f7a3516bbb94..0f1c5970288a 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
@@ -18,12 +18,11 @@ def TrigIDPhysValMonitoringTool():
from AthenaCommon.AppMgr import release_metadata
d = release_metadata()
- def makePhysvalMon(name, pdgid, chainnames, useHighestPT, cosmic = False):
+ def makePhysvalMon(name, pdgid, chainnames, cosmic = False):
Monname = "TestIDPhysValMon" + name
TestIDPhysValMon = TrigTestPhysValMon(name=Monname)
TestIDPhysValMon.SliceTag = "HLT/IDMon/" + name
TestIDPhysValMon.OutputLevel = INFO
- TestIDPhysValMon.UseHighestPT = useHighestPT
try:
TestIDPhysValMon.EnableLumi = False
@@ -48,9 +47,8 @@ def TrigIDPhysValMonitoringTool():
else:
TestIDPhysValMon.mcTruth = False
TestIDPhysValMon.ntupleChainNames = ['Offline',name]
-# use default values ?
-# TestIDPhysValMon.sctHitsOffline = 1
-# TestIDPhysValMon.pixHitsOffline = 1
+ TestIDPhysValMon.sctHitsOffline = 1
+ TestIDPhysValMon.pixHitsOffline = 1
TestIDPhysValMon.ntupleChainNames += chainnames
@@ -64,29 +62,26 @@ def TrigIDPhysValMonitoringTool():
############### Electrons ###############
name = "Electron"
pdgid = 11
- UseHighestPT = True
chainnames = [
"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_EFID",
"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_IDTrig",
"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_FTF"
]
- outputlist += [makePhysvalMon(name, pdgid, useHighestPT, chainnames)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames)]
############### Muons ###############
name = "Muon"
pdgid = 13
- useHighestPT = True
chainnames = [
"HLT_mu.*idperf.*:InDetTrigTrackingxAODCnv_Muon_EFID",
"HLT_mu.*idperf.*:InDetTrigTrackingxAODCnv_Muon_IDTrig",
"HLT_mu.*idperf.*:InDetTrigTrackingxAODCnv_Muon_FTF"
]
- outputlist += [makePhysvalMon(name, pdgid, useHighestPT, chainnames)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames)]
############### Taus ###############
name = "Tau"
pdgid = 15
- useHighestPT = True
chainnames = [
"HLT_tau.*idperf.*:InDetTrigTrackingxAODCnv_Tau_EFID",
"HLT_tau.*idperf.*:key=InDetTrigTrackingxAODCnv_Tau_IDTrig:roi=forID3",
@@ -94,12 +89,11 @@ def TrigIDPhysValMonitoringTool():
"HLT_tau.*idperf.*:key=InDetTrigTrackingxAODCnv_TauCore_FTF:roi=forID1",
"HLT_tau.*idperf.*:key=InDetTrigTrackingxAODCnv_TauIso_FTF:roi=forID3"
]
- outputlist += [makePhysvalMon(name, pdgid, useHighestPT, chainnames)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames)]
############### Bjets ###############
name = "Bjet"
pdgid = 5
- useHighestPT = False
chainnames = [
"HLT_j.*bperf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=TrigSuperRoi",
"HLT_j.*bperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
@@ -110,27 +104,25 @@ def TrigIDPhysValMonitoringTool():
"HLT_mu.*bperf_dr05:InDetTrigTrackingxAODCnv_Bjet_EFID",
"HLT_mu.*bperf_dr05:InDetTrigTrackingxAODCnv_Bjet_FTF"
]
- outputlist += [makePhysvalMon(name, pdgid, useHighestPT, chainnames)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames)]
############### Bphys ###############
name = "Bphys"
pdgid = 0 # Doesn't make sense
- useHighestPT = False
chainnames = [
"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
]
- outputlist += [makePhysvalMon(name, pdgid, useHighestPT, chainnames)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames)]
############### Cosmics ###############
name = "Cosmic"
- useHighestPT = False
pdgid = 0 # Not used for cosmic
chainnames = [
'HLT_.*id.*cosmic.*:InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID',
'HLT_.*id.*cosmic.*:InDetTrigTrackingxAODCnv_CosmicsN_EFID'
]
- outputlist += [makePhysvalMon(name, pdgid, chainnames, useHighestPT, cosmic=True)]
+ outputlist += [makePhysvalMon(name, pdgid, chainnames, cosmic=True)]
return outputlist
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
index 69e3466e8a7e..35889a94fc32 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
@@ -429,22 +429,10 @@ def TrigIDtrkMonitoringTool():
# tidabase.OutputLevel = DEBUG
tidaftk.ntupleChainNames += [
"Offline",
- #jets
"HLT_j.*perf_.*_FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit",
"HLT_j.*perf_.*_FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig",
"HLT_j.*perf_.*_FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK",
- "HLT_j.*perf_.*_FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig",
- #taus
- "HLT_tau.*_idperf_.*FTK:key=InDetTrigTrackingxAODCnv_Tau_FTK",
- "HLT_tau.*_idperf_.*FTK:key=InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig",
- "HLT_tau.*_FTKNoPrec:key=InDetTrigTrackingxAODCnv_Tau_FTK",
- "HLT_tau.*_FTKRefit:key=InDetTrigTrackingxAODCnv_Tau_FTKRefit",
- "HLT_tau.*_FTKRefit:key=InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig",
- #muons
- "HLT_mu.*_idperf_FTK:key=InDetTrigTrackingxAODCnv_Muon_FTK",
- "HLT_mu.*_idperf_FTK:key=InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig",
- "HLT_mu.*_idperf_FTKRefit:key=InDetTrigTrackingxAODCnv_Muon_FTKRefit",
- "HLT_mu.*_idperf_FTKRefit:key=InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig"
+ "HLT_j.*perf_.*_FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig"
]
ToolSvc += tidaftk;
list += [ "TrigTestBase/IDFTKTool" ]
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/src/HLTIDZeeTagProbe.cxx b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/src/HLTIDZeeTagProbe.cxx
index a0aee46c281d..5e7607fd85fb 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/src/HLTIDZeeTagProbe.cxx
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/src/HLTIDZeeTagProbe.cxx
@@ -1,4 +1,6 @@
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
#if 0
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_beamspot_ttbar.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_beamspot_ttbar.xml
index 15ad5a3661b4..0807522fb7a0 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_beamspot_ttbar.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_beamspot_ttbar.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_FTK_ttbar_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,6 +38,19 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-beamspot-FTK.root data-FTK_beamspot_ttbar-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF HLT_beamspot_allTE_FTK_InDetTrigTrackingxAODCnv_BeamSpot_FTK -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
@@ -57,6 +68,8 @@
</testToRemove>
+ <auxFilePattern>data-FTK_beamspot_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_beamspot_ttbar-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -64,4 +77,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_bjet_ttbar.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_bjet_ttbar.xml
index f9764f36742e..b9ae43cda073 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_bjet_ttbar.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_bjet_ttbar.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_FTK_ttbar_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,13 +38,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -55,6 +52,32 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_FTF HLT_j55_bperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK HLT_j55_bperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig HLT_j55_bperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -70,6 +93,8 @@
</testToRemove>
+ <auxFilePattern>data-FTK_bjet_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_bjet_ttbar-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -79,4 +104,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_tautau.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_tautau.xml
index f9b2b7c9bae0..62621f9fb718 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_tautau.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_tautau.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_tautau-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_tautau-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_FTLJ_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_mu_tautau-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_mu_tautau-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>Test_bin.dat</auxFilePattern>
@@ -78,4 +104,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_ttbar.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_ttbar.xml
index 63e39ca07331..90f70d4ad214 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_ttbar.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_mu_ttbar.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,13 +54,12 @@
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -72,13 +68,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,59 @@
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -100,6 +148,8 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_mu_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_mu_ttbar-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>Test_bin.dat</auxFilePattern>
@@ -108,4 +158,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_tau_tautau.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_tau_tautau.xml
index f8ace74a5eb9..b7761f4ad817 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_tau_tautau.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_FTK_tau_tautau.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_tau_tautau-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_tau_tautau-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>Test_bin.dat</auxFilePattern>
@@ -78,4 +104,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml
index 62d873aaf3c7..065926c0fd42 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml
@@ -15,7 +15,7 @@
<kv/>
<rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <mailto>sutt@cern.ch,jiri.masik@cern.ch,julie.kirk@stfc.ac.uk</mailto>
+ <mailto>sutt@cern.ch,jiri.masik@cern.ch</mailto>
<refRelease>14.5.0</refRelease>
@@ -29,9 +29,7 @@
-# include "TrigInDetValidation_all_ttbar_pu40.xml"
# include "TrigInDetValidation_all_ttbar_pu46.xml"
-# include "TrigInDetValidation_all_ttbar_pu80.xml"
# include "TrigInDetValidation_beamspot_ttbar_pu46.xml"
@@ -64,16 +62,6 @@
# include "TrigInDetValidation_bjet_IBL_pu40_test.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_offline.xml"
-# include "TrigInDetValidation_bjet_IBL_pu46.xml"
-# include "TrigInDetValidation_bjet_IBL_pu80.xml"
-
-# include "TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml"
-# include "TrigInDetValidation_bjet_IBL_pu40_super1.xml"
-# include "TrigInDetValidation_bjet_IBL_pu40_super2.xml"
-# include "TrigInDetValidation_bjet_IBL_pu40_super3.xml"
-# include "TrigInDetValidation_bjet_IBL_pu40_super4.xml"
-
-
<!-- # include "TrigInDetValidation_tau_pu46.xml" -->
# include "TrigInDetValidation_tau_IBL_pu46.xml"
# include "TrigInDetValidation_tau_IBL_pu46_offline.xml"
@@ -119,7 +107,6 @@
<keepFilePattern displayColor="blue">*.root</keepFilePattern>
<keepFilePattern maxsize="150">TrigInDet*.log</keepFilePattern>
<keepFilePattern>*.log</keepFilePattern>
- <keepFilePattern>*.root</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.dat</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.html</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.htm</keepFilePattern>
@@ -129,26 +116,10 @@
<keepFilePattern displayColor="red">*.css</keepFilePattern>
<keepFilePattern>TIDAWeb/STAR</keepFilePattern>
<keepFilePattern>TIDAWeb/build/STAR</keepFilePattern>
-
<keepFilePattern>times/STAR</keepFilePattern>
- <keepFilePattern>times-FTF/STAR</keepFilePattern>
-
- <keepFilePattern>times/STAR.p*</keepFilePattern>
- <keepFilePattern>times-FTF/STAR.p*</keepFilePattern>
-
- <keepFilePattern>times/STAR.pdf</keepFilePattern>
- <keepFilePattern>times/STAR.png</keepFilePattern>
-
- <keepFilePattern>times-FTF/STAR.pdf</keepFilePattern>
- <keepFilePattern>times-FTF/STAR.png</keepFilePattern>
-
<keepFilePattern>*.png</keepFilePattern>
<keepFilePattern>*.ps</keepFilePattern>
- <keepFilePattern>*.php</keepFilePattern>
- <keepFilePattern>*.php</keepFilePattern>
- <keepFilePattern>*.css</keepFilePattern>
- <keepFilePattern>*.dat</keepFilePattern>
- <keepFilePattern>*.sh</keepFilePattern>
+ <keepFilePattern>*.hist</keepFilePattern>
<keepFilePattern>*.pool.root.1</keepFilePattern>
<keepFilePattern>*.pool.root.2</keepFilePattern>
<keepFilePattern>*.pdf</keepFilePattern>
@@ -196,27 +167,6 @@
<keepFilePattern>HLTL2-plots-beamspot/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTEF-test-plots-lowpt/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-test-plots/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-lowpt/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-electron/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTEF-test-plots-lowpt-electron/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-test-plots-electron/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-electron-lowpt/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-muon/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-muon/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-tau/STAR.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-tau/STAR.p*</keepFilePattern>
-
-
-
<keepFilePattern>costMonitoring*/STAR</keepFilePattern>
<keepFilePattern>costMonitoring*/csv/STAR</keepFilePattern>
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu40.xml
deleted file mode 100644
index d4487809ad62..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu40.xml
+++ /dev/null
@@ -1,189 +0,0 @@
- <athena trendId='all_pu40' userJobId='TrigInDetValidation_all_ttbar_pu40'>
- <doc>All slices, ttbar events, pu40, run2 chains</doc>
- <displayName>All slices, ttbar, pu40, run2 chains</displayName>
- <commandLineFlags>EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample2.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="05">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="06">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
- </arg>
- </action>
-
-
-
- <action position="07">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
- </arg>
- </action>
-
-
-
- <action position="08">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="09">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="10">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
- </arg>
- </action>
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu46.xml
index de2471232b52..f7f17ce71102 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu46.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,13 +54,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -72,13 +68,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -87,13 +82,12 @@
</action>
-
<action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -102,13 +96,12 @@
</action>
-
<action position="07">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -116,14 +109,13 @@
</arg>
</action>
-
<action position="08">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -131,7 +123,6 @@
</arg>
</action>
-
<action position="09">
@@ -139,7 +130,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -147,7 +138,6 @@
</arg>
</action>
-
<action position="10">
@@ -155,7 +145,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -164,6 +154,127 @@
</action>
+ <action position="11">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="12">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="13">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="14">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="15">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots-muon </argvalue>
+ </arg>
+ </action>
+
+ <action position="16">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots-muon </argvalue>
+ </arg>
+ </action>
+
+ <action position="17">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots-tau </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="18">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots-tau </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="19">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-test-plots-bjet </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -179,6 +290,8 @@
</testToRemove>
+ <auxFilePattern>data-all_ttbar_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-all_ttbar_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -186,4 +299,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu80.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu80.xml
deleted file mode 100644
index fcb69f1e75c2..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu80.xml
+++ /dev/null
@@ -1,189 +0,0 @@
- <athena trendId='all_pu80' userJobId='TrigInDetValidation_all_ttbar_pu80'>
- <doc>All slices, ttbar events, pu80, run2 chains</doc>
- <displayName>All slices, ttbar, pu80, run2 chains</displayName>
- <commandLineFlags>EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample3.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="05">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="06">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
- </arg>
- </action>
-
-
-
- <action position="07">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
- </arg>
- </action>
-
-
-
- <action position="08">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="09">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="10">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
- </arg>
- </action>
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_aux.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_aux.xml
index 419e4667c369..999d924ca1cd 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_aux.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_aux.xml
@@ -1,11 +1,11 @@
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/STAR</auxFilePattern>
<auxFilePattern>TIDAWeb/build/STAR</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_beamspot_ttbar_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_beamspot_ttbar_pu46.xml
index 27c8bf4d0a57..b71dd77343e3 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_beamspot_ttbar_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_beamspot_ttbar_pu46.xml
@@ -68,6 +68,8 @@
</testToRemove>
+ <auxFilePattern>data-beamspot_ttbar_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-beamspot_ttbar_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet.xml
index 57bb28d6fc17..578823d66a0c 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,33 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet.root data-bjet-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet.root data-bjet-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -73,6 +97,8 @@
</testToRemove>
+ <auxFilePattern>data-bjet-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<athenaCommonFlags />
@@ -81,4 +107,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40.xml
index 6317a6396898..80b49987e756 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,6 +53,33 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -70,6 +94,8 @@
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -79,4 +105,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_offline.xml
index 45468d0a9001..3262a511076b 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_offline.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_offline.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,13 +53,12 @@
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -71,6 +67,46 @@
</action>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx/xPrimVx HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_EFHistoVtx/EFHistoVtx -c TIDAvertex.dat -d HLTL2-vtx </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -86,6 +122,8 @@
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40_offline-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -95,4 +133,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ10.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ10.xml
deleted file mode 100644
index f705eb06c1d3..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ10.xml
+++ /dev/null
@@ -1,80 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_splitZ10'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;splitZHalfWidth=10;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ15.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ15.xml
deleted file mode 100644
index 43bf0b8dceef..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ15.xml
+++ /dev/null
@@ -1,80 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_splitZ15'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;splitZHalfWidth=15;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ5.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ5.xml
deleted file mode 100644
index f6e735227b2b..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ5.xml
+++ /dev/null
@@ -1,80 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_splitZ5'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;splitZHalfWidth=5;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ7_5.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ7_5.xml
deleted file mode 100644
index 10edffd81310..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_splitZ7_5.xml
+++ /dev/null
@@ -1,80 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_splitZ7_5'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;splitZHalfWidth=7.5;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super1.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super1.xml
deleted file mode 100644
index 6ec8023dc9d2..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super1.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super1'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=2;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super2.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super2.xml
deleted file mode 100644
index a5813b0ef38b..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super2.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super2'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=5;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super3.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super3.xml
deleted file mode 100644
index f034730e82a6..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super3.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super3'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=10;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super4.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super4.xml
deleted file mode 100644
index a5ed5f70b79d..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_super4.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super4'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=10;bjetDynamicEtFactor=10;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging-offline.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_test.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_test.xml
index 811f057725f8..98583e7009cf 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_test.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_test.xml
@@ -10,13 +10,12 @@
# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDApost.sh</argvalue>
+ <argvalue>TIDArdict.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,8 +54,50 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
-# include "TrigInDetValidation_expertMonitoring_run.xml"
+
+# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +109,8 @@
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -79,4 +120,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml
deleted file mode 100644
index adcbfff616a7..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_trkpt2'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;minVtxTrackpT=2000;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample1.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu46.xml
deleted file mode 100644
index 5e57883ab3b7..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu46.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu46'>
- <doc>Bjetslice, ttbar, pu46, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu46, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample2.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu80.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu80.xml
deleted file mode 100644
index 033432b14800..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_IBL_pu80.xml
+++ /dev/null
@@ -1,82 +0,0 @@
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu80'>
- <doc>Bjetslice, ttbar, pu80, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu80, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-# include "samples/TrigInDetValidation_ttbar_sample3.xml"
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-# include "TrigInDetValidation_expertMonitoring.xml"
-# include "TrigInDetValidation_costMonitoring.xml"
-# include "TrigInDetValidation_extra.xml"
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-# include "TrigInDetValidation_aux.xml"
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_pu46.xml
index ff00540f468b..01c12af1857c 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_bjet_pu46.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_bjet_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -26,13 +25,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,7 +39,6 @@
</action>
-
<action position="03">
@@ -49,7 +46,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,6 +56,35 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_pu46-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots</argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -73,6 +99,8 @@
</testToRemove>
+ <auxFilePattern>data-bjet_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -80,4 +108,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_cosmic.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_cosmic.xml
index bcdd88f11d05..84d1d956c68c 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_cosmic.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_cosmic.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,6 +40,19 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-cosmic.root data-cosmic-reference.root HLT_id_cosmic_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -57,9 +68,10 @@
</testToRemove>
# include "TrigInDetValidation_aux.xml"
+ <auxFilePattern>data-cosmic-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-cosmic-ref.root</auxFilePattern>
<athenaCommonFlags />
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Jpsiee_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Jpsiee_pu40.xml
index 0cfaf5bc809b..4e5cf8ad8e9c 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Jpsiee_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Jpsiee_pu40.xml
@@ -11,7 +11,6 @@
# include "samples/TrigInDetValidation_el_sample7.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
@@ -34,7 +32,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,14 +41,13 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,35 @@
</arg>
</action>
+
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -72,6 +98,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Jpsiee_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Jpsiee_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -81,4 +109,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40.xml
index edeb680b1d6e..db7e562f94e9 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
@@ -34,7 +32,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -44,13 +42,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -60,13 +57,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -75,13 +71,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,62 @@
</arg>
</action>
+
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -103,6 +154,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -112,4 +165,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline.xml
index 0759607dd99a..18488080635a 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_offline-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.xml
index 9cd0301b41c5..688d18e57d09 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_offline_rzMatcher-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.xml
index fc433e4ea65c..04b99b8f9bf6 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_rzMatcher-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46.xml
index 454f034db6c3..3f30454b42bc 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
@@ -34,7 +32,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,13 +55,12 @@
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -75,13 +71,12 @@
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,62 @@
</arg>
</action>
+
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -105,6 +156,8 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -114,4 +167,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46_run1.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46_run1.xml
index 6053ac6419ce..039e96025474 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46_run1.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_Zee_pu46_run1.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,13 +55,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,6 +70,47 @@
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-pileup.root data-el_Zee_pu46_run1-reference.root HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_1 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-pileup.root data-el_Zee_pu46_run1-reference.root HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-pileup.root data-el_Zee_pu46_run1-reference.root HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_1 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -89,6 +126,8 @@
# include "TrigInDetValidation_aux.xml"
+ <auxFilePattern>data-el_Zee_pu46_run1-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_pu46_run1-ref.root</auxFilePattern>
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
<athenaCommonFlags />
@@ -96,4 +135,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_5.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_5.xml
index 9eea323a7b56..28f874040ee0 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_5.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_5.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_el_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -24,7 +23,6 @@
</arg>
</action>
-
<action position="02">
@@ -32,7 +30,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,14 +53,13 @@
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -71,6 +67,47 @@
</arg>
</action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_single_e_5-reference.root EF_e24vh_medium1_IDTrkNoCut_IDT_TrigFastTrackFinder_eGamma EF_e24vh_medium1_IDTrkNoCut_IDT_InDetTrigParticleCreation_Electron_IDTrig -d EF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_single_e_5-reference.root HLT_e5_loose_idperf_TrigFastTrackFinder_eGamma HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_single_e_5-reference.root HLT_e5_loose_idperf_TrigFastTrackFinder_eGamma HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -85,6 +122,9 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_5-reference.root</auxFilePattern>
+ <auxFilePattern>data-el_single_e_5-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_5-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -94,4 +134,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL.xml
index 89e74a429c9e..41d5657309eb 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_el_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,13 +55,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -73,13 +69,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,61 @@
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_IBL-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_IBL-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -110,4 +162,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40.xml
index ef03efd3210f..665e65a60b23 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -90,6 +85,61 @@
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_IBL_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40_robustness.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40_robustness.xml
index 4c53bc942b20..d9e38345dd62 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40_robustness.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_IBL_pu40_robustness.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -29,13 +28,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -44,13 +42,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -60,13 +57,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -75,13 +71,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -91,6 +86,62 @@
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40_robust-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40_robust-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40_robust-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40_robust-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -103,6 +154,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_IBL_pu40_robust-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_IBL_pu40_robust-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -112,4 +165,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0.xml
index c0636f8e1819..580a4da73618 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,13 +55,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -73,13 +69,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,60 @@
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -101,9 +150,10 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_larged0-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_larged0_PU-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -111,4 +161,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0_PU.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0_PU.xml
index c2ae23594b11..b211e8396cd1 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0_PU.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_larged0_PU.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,13 +55,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -73,13 +69,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,60 @@
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -101,9 +150,10 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_larged0_PU-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_larged0-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -111,4 +161,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40.xml
index 43ea9de047e1..00e2b238e863 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_el_sample3.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -90,6 +85,62 @@
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -102,6 +153,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +164,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_robustness.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_robustness.xml
index 6a6f0dafee80..47d54be7876b 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_robustness.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_robustness.xml
@@ -11,7 +11,6 @@
# include "samples/TrigInDetValidation_el_sample3.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -90,6 +85,61 @@
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_robust-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_robust-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_robust-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_robust-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_pu40_robust-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_pu40_robust-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_run1.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_run1.xml
index 8f8c6efc2c92..24fd39897187 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_run1.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_single_e_7-80_pu40_run1.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -29,13 +28,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -45,13 +43,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -62,13 +59,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -77,13 +73,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -93,6 +88,64 @@
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_run1-reference.root HLT_e24_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_run1-reference.root HLT_e24_loose_idperf_TrigFastTrackFinder_eGamma HLT_e24_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_run1-reference.root HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron.root data-el_single_e_7-80_pu40_run1-reference.root HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_1 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -105,6 +158,8 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -113,4 +168,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu100.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu100.xml
index 1b24b72850ac..60c4e2ce1a6f 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu100.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu100.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu100-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu100-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu100-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu100-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu100-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu100-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu138.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu138.xml
index 4610d5afb775..f443ef02eacd 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu138.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu138.xml
@@ -13,7 +13,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,7 +26,6 @@
</arg>
</action>
-
<action position="02">
@@ -35,7 +33,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -45,13 +43,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -61,13 +58,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -76,13 +72,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -90,6 +85,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu138-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu138-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu138-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu138-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -104,6 +154,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu138-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu138-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -113,4 +165,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu40.xml
index a3acaac067aa..1606a95e08e8 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu40.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -26,7 +25,6 @@
</arg>
</action>
-
<action position="02">
@@ -34,7 +32,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -44,13 +42,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -60,13 +57,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -75,13 +71,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -103,6 +153,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -112,4 +164,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu46.xml
index 7c5647afdb03..33cd67339550 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu46.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu69.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu69.xml
index 319547222179..37b6669047d2 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu69.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu69.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
@@ -34,7 +32,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -44,13 +42,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -60,13 +57,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -75,13 +71,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -89,6 +84,62 @@
</arg>
</action>
+
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu69-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu69-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu69-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu69-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -103,6 +154,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu69-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu69-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -112,4 +165,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu80.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu80.xml
index d98ab962be86..125d3b682b85 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu80.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_el_ttbar_pu80.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,7 +24,6 @@
</arg>
</action>
-
<action position="02">
@@ -33,7 +31,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,13 +56,12 @@
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -74,13 +70,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -88,6 +83,61 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -102,6 +152,8 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu80-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu80-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
@@ -111,4 +163,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring.xml
index 546e0d0d6d5a..22ea2873db21 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring.xml
@@ -5,7 +5,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -13,16 +13,3 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring_run.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring_run.xml
deleted file mode 100644
index 44ae1bbe7d68..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_expertMonitoring_run.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- emacs: this is -*- html -*- -->
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias.xml
index c7309962cf91..4268b25fb5e4 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_minBias_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,6 +38,19 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-monitor.root data-minBias-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -51,7 +62,9 @@
</testToRemove>
+ <auxFilePattern>data-minBias-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -60,4 +73,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_mergeDataPrep.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_mergeDataPrep.xml
index 7c6f4a1c34f0..63009e029255 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_mergeDataPrep.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_mergeDataPrep.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_minBias_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,13 +38,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -55,6 +52,32 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-monitor-merge.root data-minBias_mergeDataPrep-reference.root EF_InDetMonMergeDP_FS_InDetTrigParticleCreation_FullScan_EFID -d EF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-monitor-merge.root data-minBias_mergeDataPrep-reference.root L2_InDetMonMergeDP_FS_TrigL2SiTrackFinder_FullScan_0 L2_InDetMonMergeDP_FS_TrigL2SiTrackFinder_FullScan_1 L2_InDetMonMergeDP_FS_TrigL2SiTrackFinder_FullScan_2 L2_InDetMonMergeDP_FS_TrigL2SiTrackFinder_FullScan_3 -d L2-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -68,6 +91,8 @@
</testToRemove>
+ <auxFilePattern>data-minBias_mergeDataPrep-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias_mergeDataPrep-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -77,4 +102,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_offline.xml
index 74c600e38d30..b458a360aac2 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_offline.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_offline.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_minBias_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,6 +38,19 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-minBias.root data-minBias_offline-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -51,7 +62,9 @@
</testToRemove>
+ <auxFilePattern>data-minBias_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -60,4 +73,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_pileUp.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_pileUp.xml
index 15be2a4396cb..485d6be7167e 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_pileUp.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_minBias_pileUp.xml
@@ -11,7 +11,6 @@
# include "samples/TrigInDetValidation_minBias_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,13 @@
</arg>
</action>
-
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
+ <auxFilePattern>expert-monitoring-minBias_pileUp-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -40,4 +39,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40.xml
index 4878d38ddf78..9ca459d4351c 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,47 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +108,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -78,4 +118,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.xml
index 9e44c86f7ae5..6d1cd63f4587 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,6 +54,32 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -70,6 +93,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_offline-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -78,4 +103,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.xml
index ef46c1fcba99..0b4cea8448b8 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,6 +56,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -71,6 +95,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_offline_rzMatcher-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -79,4 +105,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.xml
index 6c57692b8446..0bc1d5dc7229 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher.xml
@@ -12,7 +12,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -28,13 +27,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -43,13 +41,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -59,6 +56,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -71,6 +95,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_rzMatcher-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -79,4 +105,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40.xml
index f7b06da05f29..45185830e314 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40.xml
@@ -10,7 +10,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -26,13 +25,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,6 +54,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_0 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -77,4 +103,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40_run1.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40_run1.xml
index 93c2f9c43363..007045b9d3cf 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40_run1.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_Zmumu_pu40_run1.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_mu_sample4.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -26,13 +25,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,6 +54,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup.root data-mu_Zmumu_pu40_run1-reference.root HLT_mu24_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup.root data-mu_Zmumu_pu40_run1-reference.root HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_0 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_1 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_pu40-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -78,4 +104,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys.xml
index f89bcd142761..a1dd41aa92a8 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys.xml
@@ -9,7 +9,6 @@
# include "samples/TrigInDetValidation_mu_sample1.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,13 +24,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,13 +38,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,6 +53,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_L2Star_idperf_TrigL2SiTrackFinder_Muon_1 HLT_mu6_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_EFID HLT_mu6_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -68,6 +92,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_bphys-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_bphys-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -75,4 +101,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys_IBL.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys_IBL.xml
index 9efd3198bd8d..c846f657593b 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys_IBL.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_bphys_IBL.xml
@@ -11,7 +11,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -27,13 +26,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -42,13 +40,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -58,6 +55,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_bphys_IBL-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_bphys_IBL-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -78,4 +104,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_100.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_100.xml
index a59cb59fea68..b314c8e82fa5 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_100.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_100.xml
@@ -8,7 +8,6 @@
<queue>long</queue>
# include "samples/TrigInDetValidation_mu_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -24,13 +23,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -39,13 +37,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -55,6 +52,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_100-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_100-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_0 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_1 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -67,6 +91,8 @@
</testToRemove>
+ <auxFilePattern>data-mu_single_mu_100-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_single_mu_100-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -76,4 +102,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0.xml
index 6721254650bb..49fbf3a47297 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0.xml
@@ -8,7 +8,6 @@
<queue>long</queue>
# include "samples/TrigInDetValidation_mu_sample7.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -24,13 +23,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -39,13 +37,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -55,6 +52,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -67,8 +91,9 @@
</testToRemove>
+ <auxFilePattern>data-mu_single_mu_larged0-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_single_mu_larged0-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -77,4 +102,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0_PU.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0_PU.xml
index 19ef7f39e3dd..44f4f064a0c3 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0_PU.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_mu_single_mu_larged0_PU.xml
@@ -8,7 +8,6 @@
<queue>long</queue>
# include "samples/TrigInDetValidation_mu_sample8.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -24,13 +23,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -39,13 +37,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -55,6 +52,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -67,8 +91,9 @@
</testToRemove>
+ <auxFilePattern>data-mu_single_mu_larged0_PU-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_single_mu_larged0_PU-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -77,4 +102,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml
index 8ccba4694654..a3ba40d70462 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_tau_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,14 +24,13 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,7 +38,6 @@
</arg>
</action>
-
<action position="03">
@@ -48,7 +45,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,14 +53,13 @@
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -72,6 +68,47 @@
</action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -85,6 +122,8 @@
</testToRemove>
+ <auxFilePattern>data-tau_IBL_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_IBL_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -92,4 +131,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml
index b0ca998b9d53..ebca67c42f0b 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_tau_sample0.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -24,7 +23,6 @@
</arg>
</action>
-
<action position="03">
@@ -32,7 +30,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,7 +38,6 @@
</arg>
</action>
-
<action position="04">
@@ -48,7 +45,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,14 +53,13 @@
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -71,6 +67,47 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
# include "TrigInDetValidation_expertMonitoring.xml"
@@ -85,6 +122,8 @@
</testToRemove>
+ <auxFilePattern>data-tau_IBL_pu46_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_IBL_pu46_offline-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -92,4 +131,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46.xml
index cde1eeaf0f5b..00446bf46d49 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_tau_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -25,14 +24,13 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -40,7 +38,6 @@
</arg>
</action>
-
<action position="03">
@@ -48,7 +45,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -56,14 +53,13 @@
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -72,6 +68,47 @@
</action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-merge.root data-tau_pu46-reference.root HLT_tau25_idperf_track:InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-merge.root data-tau_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-merge.root data-tau_pu46-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
@@ -85,6 +122,8 @@
</testToRemove>
+ <auxFilePattern>data-tau_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -92,4 +131,3 @@
</athena>
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46_run1.xml b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46_run1.xml
index 15123f291f56..b3fdbfa75ffd 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46_run1.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_pu46_run1.xml
@@ -10,7 +10,6 @@
# include "samples/TrigInDetValidation_tau_sample2.xml"
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -26,13 +25,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -41,13 +39,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -57,6 +54,33 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau.root data-tau_pu46_run1-reference.root HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau.root data-tau_pu46_run1-reference.root HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_1 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
@@ -70,6 +94,8 @@
</testToRemove>
+ <auxFilePattern>data-tau_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_pu46-ref.root</auxFilePattern>
# include "TrigInDetValidation_aux.xml"
@@ -78,4 +104,3 @@
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
index 99b5de515c23..d1b115245a04 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
@@ -68,10 +68,6 @@ install : all
mv ../test/$(XMLFILE) ../test/$(XMLFILE).bak
mv $(XMLFILE) ../test
-move :
- mv ../test/$(XMLFILE) ../test/$(XMLFILE).bak
- mv $(XMLFILE) ../test
-
all: $(XMLFILE)
$(FILES) : $(JOBS)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/doc/README b/Trigger/TrigValidation/TrigInDetValidation/doc/README
index ab9db3d7bd64..ff6879cc5d26 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/doc/README
+++ b/Trigger/TrigValidation/TrigInDetValidation/doc/README
@@ -4,18 +4,18 @@ This contains everything you need to run and test the IDTrigger in the RTT
The directory structure is
- share - py job options files for running the RTT processing
- test - global TestConfiguration xml file for running the jobs in the RTT
- TIDAbuild - xml fragments and makefile to build the global xml file
- utils - useful utilities to allow testing the xml jobs
- doc - this documantation
+ share - py job options files for running the RTT processing
+ test - global TestConfiguration xml file for running the jobs in the RTT
+ build - xml fragments and makefile to build the global xml file
+ utils - useful utilities to allow testing the xml jobs
+ doc - this documantation
Making the xml file
-------------------
In the
- TIDAbuild
+ build
directory, there are separate small xml fragments for individual jobs to be
run in the RTT, for example ...
@@ -36,11 +36,7 @@ which simply includes all the separate xml fragments to make the large
xml file for the RTT.
Do NOT edit this large xml file directly - instead modify the xml fragments
-and then run
-
- make
-
-in the build directory.
+and then run make in the build directory.
This also tests the xml integrity of the file.
@@ -58,20 +54,7 @@ NB: Because we use the c preprocessor to compine the xml fragments, then
so the preprocessor creates these patterns for us, and they are not then
interpretted as the open comments
-
-
-Data samples
--------------
-
-The different data samples to run on are stored in the
-
- TIDAbuild/samples
-
-directory. The different data samples should be used by
-
- #include
-
-statements in the xml fragment for the relevant job.
+
Utilsities for testing
----------------------
@@ -120,21 +103,6 @@ script.
Rather than try to run the script directly, which may not work, you should edit
it, or simply cut and paste the commands to ru nthe stages that you require.
-
-Finishing up
-------------
-
-To build the full, large xml configuration file ...
-
- test/TrigInDetValidation_TestConfiguration.xml
-
-you need to run
-
-make
-
-in the TIDAbuild directory.
-
-This also runs the xml checker to ensure that there are no xml syntax errors
-in main file
+
\ No newline at end of file
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/InDetModules.py b/Trigger/TrigValidation/TrigInDetValidation/python/InDetModules.py
index fd27d0b04888..cd64f18565b7 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/InDetModules.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/InDetModules.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
#ID modules as obtained by RegSelSvc.WriteTables
#Format: layer, det, r, phi, z, rob, hash
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/__init__.py b/Trigger/TrigValidation/TrigInDetValidation/python/__init__.py
index e69de29bb2d1..74583d364ec2 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/__init__.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu40.sh
deleted file mode 100755
index 7fa98a9d5223..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu40.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
-athena.py -c 'XMLDataSet="TrigInDetValidation_all_ttbar_pu40";EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
-
-
-get_files -data TIDAdata11-rtt.dat
-get_files -data Test_bin.dat
-TIDArdict.exe TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau
-
-TIDAcomparitor.exe data-all.root data-all.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet TIDArun.sh data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron TIDArun.sh data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron TIDArun.sh data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron-lowpt TIDArun.sh data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron-lowpt TIDArun.sh data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots-muon TIDArun.sh data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots-muon TIDArun.sh data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots-tau TIDArun.sh data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots-tau TIDArun.sh data-all.root data-all.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-test-plots-bjet
-
-get_files -data expert-monitoring-all_ttbar_pu46-ref.root
-TIDAcpucost.exe expert-monitoring.root expert-monitoring-all_ttbar_pu46-ref.root --auto -o times
-
-RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" check_log.pl --conf checklogTriggerTest.conf %JOBLOG
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu46.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu46.sh
index 241e6c8b6ce4..7634e1751043 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu46.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu46.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
-athena.py -c 'XMLDataSet="TrigInDetValidation_all_ttbar_pu46";EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
+get_files -jo TrigInDetValidation_RTT_topOptions_AllSlices.py
+athena.py -c 'XMLDataSet="TrigInDetValidation_all_ttbar_pu46";EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation_RTT_topOptions_AllSlices.py
get_files -data TIDAdata11-rtt.dat
@@ -9,22 +9,22 @@ get_files -data Test_bin.dat
TIDArdict.exe TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_TrigFastTrackFinder_eGamma HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_EFID HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-electron
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_TrigFastTrackFinder_eGamma HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-electron
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_TrigFastTrackFinder_eGamma HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_EFID HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-electron-lowpt
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_TrigFastTrackFinder_eGamma HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-electron-lowpt
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_TrigFastTrackFinder_Muon HLT_mu24_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-plots-muon
get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_TrigFastTrackFinder_Muon HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_0 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_1 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-plots-muon
get_files -data data-all_ttbar_pu46-reference.root
TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau
@@ -33,21 +33,12 @@ get_files -data data-all_ttbar_pu46-reference.root
TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau
get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron-lowpt TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron-lowpt TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots-muon TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots-muon TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots-tau TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots-tau TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-test-plots-bjet
+TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_TrigFastTrackFinder_Jet HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_EFID HLT_j55_EFID_bperf_InDetTrigTrackingxAODCnv_Bjet_EFID -d HLTEF-plots-bjet
get_files -data expert-monitoring-all_ttbar_pu46-ref.root
TIDAcpucost.exe expert-monitoring.root expert-monitoring-all_ttbar_pu46-ref.root --auto -o times
-RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals
+RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir
TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu80.sh
deleted file mode 100755
index 615a68962371..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_all_ttbar_pu80.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
-athena.py -c 'XMLDataSet="TrigInDetValidation_all_ttbar_pu80";EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices.py
-
-
-get_files -data TIDAdata11-rtt.dat
-get_files -data Test_bin.dat
-TIDArdict.exe TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau
-
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau
-
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-get_files -data data-all_ttbar_pu46-reference.root
-TIDAcomparitor.exe data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron-lowpt TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron-lowpt TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots-muon TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots-muon TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots-tau TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots-tau TIDArun.sh data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-test-plots-bjet
-
-get_files -data expert-monitoring-all_ttbar_pu46-ref.root
-TIDAcpucost.exe expert-monitoring.root expert-monitoring-all_ttbar_pu46-ref.root --auto -o times
-
-RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" check_log.pl --conf checklogTriggerTest.conf %JOBLOG
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu40.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu40.sh
index 49acfac8d5d5..6db035d1d5cf 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu40.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu40.sh
@@ -12,9 +12,7 @@ get_files -data data-bjet_IBL_pu40-reference.root
TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots
+TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots
get_files -data expert-monitoring-bjet_IBL_pu40-ref.root
TIDAcpucost.exe expert-monitoring.root expert-monitoring-bjet_IBL_pu40-ref.root --auto -o times
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu46.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu46.sh
deleted file mode 100755
index b5d32267f365..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu46.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
-athena.py -c 'XMLDataSet="TrigInDetValidation_bjet_IBL_pu46";EventMax=900;runMergedChain=True;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
-
-
-get_files -data TIDAdata11-rtt.dat
-get_files -data Test_bin.dat
-TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
-
-get_files -data data-bjet_IBL_pu40-reference.root
-TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
-
-get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots
-
-get_files -data expert-monitoring-bjet_IBL_pu40-ref.root
-TIDAcpucost.exe expert-monitoring.root expert-monitoring-bjet_IBL_pu40-ref.root --auto -o times
-
-RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" check_log.pl --conf checklogTriggerTest.conf %JOBLOG
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu80.sh b/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu80.sh
deleted file mode 100755
index f4bfc3aca599..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/scripts/TrigInDetValidation_bjet_IBL_pu80.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-get_files -jo TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
-athena.py -c 'XMLDataSet="TrigInDetValidation_bjet_IBL_pu80";EventMax=900;runMergedChain=True;globalTag="OFLCOND-RUN12-SDR-17"' TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice.py
-
-
-get_files -data TIDAdata11-rtt.dat
-get_files -data Test_bin.dat
-TIDArdict.exe TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat
-
-get_files -data data-bjet_IBL_pu40-reference.root
-TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots
-
-get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-get_files -data data-bjet_IBL_pu40-reference.root
-TIDAcomparitor.exe data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots TIDArun.sh data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots
-
-get_files -data expert-monitoring-bjet_IBL_pu40-ref.root
-TIDAcpucost.exe expert-monitoring.root expert-monitoring-bjet_IBL_pu40-ref.root --auto -o times
-
-RunTrigCostD3PD.exe -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall"
-
-TIDAcpucost.exe costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" check_log.pl --conf checklogTriggerTest.conf %JOBLOG
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
index 4347f437db04..2251c9bf3f70 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
@@ -61,70 +61,8 @@ def resetSigs():
TriggerFlags.BjetSlice.setAll();
TriggerFlags.BjetSlice.signatures = idtrigChainlist
-
-# tags for bjet vertex optimisation testing
-#####################################################
-## Primary vertex finding optimisations
-#####################################################
-
-# if 'bjetEtaHalfWidth' in dir() or
-# 'bjetPhiHalfWidth' in dir() or
-# 'bjetJetMinEt' in dir() or
-# 'bjetNJetsMax' in dir() or
-# 'bjetDynamicMinJetEt' in dir() or
-# 'bjetDynamicNjetsMax' in dir() or
-# 'bjetDynamicEtFactor' in dir():
-
-from TrigBjetHypo.TrigSuperRoiBuilderAllTEConfig import getSuperRoiBuilderAllTEInstance
-theSuperRoi=getSuperRoiBuilderAllTEInstance()
-
-# Vary size of SuperRoi constituents. Suggest Eta/PhiHalfWidth = 0.1, 0.15, 0.2
-if 'bjetEtaHalfWidth' in dir():
- theSuperRoi.EtaHalfWidth = bjetEtaHalfWidth
-
-if 'bjetPhiHalfWidth' in dir():
- theSuperRoi.PhiHalfWidth = bjetPhiHalfWidth
-
-# Raise the pT threshold of jets used to construct the super ROI. Suggest 30, 35, 40
-if 'bjetJetMinEt' in dir():
- theSuperRoi.JetMinEt = bjetJetMinEt
-
-# Limit number of jets used to construct the super ROI. Suggest 5, 10, 15, 20
-if 'bjetNJetsMax' in dir():
- theSuperRoi.NJetsMax = NJetsMax
-
-# Dynamically scale the min jet Et threshold as a function of the number of jets.
-# Suggest (X, Y) values of (5, 2), (5, 5), (5, 10)
-if 'bjetDynamicMinJetEt' in dir():
- theSuperRoi.DynamicMinJetEt = bjetDynamicMinJetEt
-
-if 'bjetDynamicNJetsMax' in dir():
- theSuperRoi.DynamicNJetsMax = bjetDynamicNJetsMax
-
-if 'bjetDynamicEtFactor' in dir():
- theSuperRoi.DynamicEtFactor = bjetDynamicEtFactor
-
-#####################################################
-## b-tagging optimisations
-#####################################################
-
-print theSuperRoi
-
-if 'splitZHalfWidth' in dir() :
- from TrigBjetHypo.TrigJetSplitterAllTEConfig import getJetSplitterAllTEInstance, getJetSplitterFTKAllTEInstance
- theJetSplit=getJetSplitterAllTEInstance()
-
-# Vary z half-width of RoIs used for b-tagging. Suggest zHalfWidth = 20, 15, 10, 9, 8, 7, 6, 5 mm
- theJetSplit.ZHalfWidth = splitZHalfWidth
-
- print theJetSplit
-
include("TrigInDetValidation/TrigInDetValidation_RTT_Common.py")
-# minimum track pT for the bjet vertex tracking
-if 'minVtxTrackpT' in dir() :
- topSequence.TrigSteer_HLT.TrigFastTrackFinder_BjetVtx.pTmin = minVtxTrackpT
-
# print "*********************************"
# print "*********************************"
# print " *** WARNING ***"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_TestConfiguration.xml b/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_TestConfiguration.xml
index ba5e2abeab42..8507d03ea9ee 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_TestConfiguration.xml
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/TrigInDetValidation_TestConfiguration.xml
@@ -15,7 +15,7 @@
<kv/>
<rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <mailto>sutt@cern.ch,jiri.masik@cern.ch,julie.kirk@stfc.ac.uk</mailto>
+ <mailto>sutt@cern.ch,jiri.masik@cern.ch</mailto>
<refRelease>14.5.0</refRelease>
@@ -30,9 +30,9 @@
- <athena trendId='all_pu40' userJobId='TrigInDetValidation_all_ttbar_pu40'>
- <doc>All slices, ttbar events, pu40, run2 chains</doc>
- <displayName>All slices, ttbar, pu40, run2 chains</displayName>
+ <athena trendId='all_pu46' userJobId='TrigInDetValidation_all_ttbar_pu46'>
+ <doc>All slices, ttbar events, pu46, run2 chains</doc>
+ <displayName>All slices, ttbar, pu46, run2 chains</displayName>
<commandLineFlags>EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
@@ -40,13 +40,19 @@
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000003.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -61,113 +67,105 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
</arg>
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
</arg>
</action>
-
<action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
</arg>
</action>
-
<action position="07">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
</arg>
</action>
-
<action position="08">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
</arg>
</action>
-
<action position="09">
@@ -175,15 +173,14 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
</arg>
</action>
-
<action position="10">
@@ -191,41 +188,149 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
</arg>
</action>
+ <action position="11">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="12">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="13">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-electron-lowpt </argvalue>
+ </arg>
+ </action>
+ <action position="14">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-electron-lowpt </argvalue>
+ </arg>
+ </action>
+ <action position="15">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots-muon </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="16">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots-muon </argvalue>
</arg>
</action>
+
+ <action position="17">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-test-plots-tau </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="18">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-test-plots-tau </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="19">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-test-plots-bjet </argvalue>
+ </arg>
+ </action>
+
+
- <action position="21">
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -318,15 +423,17 @@
</testToRemove>
+ <auxFilePattern>data-all_ttbar_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-all_ttbar_pu46-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -338,11 +445,11 @@
- <athena trendId='all_pu46' userJobId='TrigInDetValidation_all_ttbar_pu46'>
- <doc>All slices, ttbar events, pu46, run2 chains</doc>
- <displayName>All slices, ttbar, pu46, run2 chains</displayName>
- <commandLineFlags>EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices</options>
+ <athena trendId='all_pu46' userJobId='TrigInDetValidation_beamspot_ttbar_pu46'>
+ <doc>BeamSpot slice, ttbar events, pu46, run2 chains</doc>
+ <displayName>BeamSpot slice, ttbar, pu46, run2 chains</displayName>
+ <commandLineFlags>EventMax=1000;runMergedChain=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
@@ -361,7 +468,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -371,29 +477,26 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat </argvalue>
</arg>
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
+ <argvalue>data-all.root data-beamspot_ttbar_pu46-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
-
-
- <action position="03">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -402,118 +505,235 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
+ <argvalue>data-all.root data-beamspot_ttbar_pu46-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+
+
+ <action position="20">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
- <action position="05">
+ <action position="30">
<modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
+ <testname>ExeRunner</testname>
<arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
+ <argname>exeName</argname>
+ <argvalue>RunTrigCostD3PD.exe</argvalue>
+ </arg>
<arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
- </arg>
+ <argname>exeParamString</argname>
+ <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
+ </arg>
</action>
-
-
- <action position="06">
+ <action position="31">
<modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
+ <testname>ExeRunner</testname>
<arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcpucost.exe</argvalue>
+ </arg>
<arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
- </arg>
+ <argname>exeParamString</argname>
+ <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
+ </arg>
</action>
-
-
- <action position="07">
+ <action position="32">
<modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
+ <testname>ExeRunner</testname>
<arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcpucost.exe</argvalue>
+ </arg>
<arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
- </arg>
+ <argname>exeParamString</argname>
+ <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
+ </arg>
</action>
-
- <action position="08">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
+
+
+ <action position="33">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcpucost.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
+ </arg>
+ </action>
+
+ <action position="34">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcpucost.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
+ </arg>
+ </action>
+
+ <action position="40">
+ <modulename>CheckLog_TriggerTest</modulename>
+ <testname>CheckLog_TriggerTest</testname>
+ <arg>
+ <argname>command</argname>
+ <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
+ </arg>
+ </action>
+
+
+
+
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
+
+ <auxFilePattern>data-beamspot_ttbar_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-beamspot_ttbar_pu46-ref.root</auxFilePattern>
+
+
+ <auxFilePattern>TIDA*.dat</auxFilePattern>
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
+ <auxFilePattern>TIDAWeb/*</auxFilePattern>
+ <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
+ <auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
+ <auxFilePattern>TIDAindex*.php</auxFilePattern>
+ <auxFilePattern>TIDAstyle.css</auxFilePattern>
+
+
+ <athenaCommonFlags />
+ </athena>
+
+
+
+
+
+ <athena trendId='electron_merging_lowpt' userJobId='TrigInDetValidation_el_Jpsiee_pu40'>
+ <doc>Jpsie3e3, pu0, run2 chains</doc>
+ <displayName>ElectronSlice-Jpsie3e3, pu40, run2 chains</displayName>
+ <commandLineFlags>EventMax=10000;runMergedChain=True</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
+ <package>Trigger/TrigValidation/TrigInDetValidation</package>
+ <group>TrigInDetValidation</group>
+ <queue>long</queue>
+
+
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000006.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000007.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000010.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000017.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000021.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000023.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000024.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000029.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000039.pool.root.1</dataset>
+
+
+ <action position="01">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
</arg>
- </action>
-
+ </action>
-
- <action position="09">
+
+
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
- </action>
+ </action>
-
- <action position="10">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
- </arg>
- </action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
@@ -523,7 +743,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -531,19 +751,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -624,145 +831,133 @@
</action>
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
+ <auxFilePattern>data-el_Jpsiee_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Jpsiee_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
-
- <athenaCommonFlags />
+
+ <athenaCommonFlags />
</athena>
- <athena trendId='all_pu80' userJobId='TrigInDetValidation_all_ttbar_pu80'>
- <doc>All slices, ttbar events, pu80, run2 chains</doc>
- <displayName>All slices, ttbar, pu80, run2 chains</displayName>
- <commandLineFlags>EventMax=1000;runMergedChain=True;doIDNewTracking=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_AllSlices</options>
+
+ <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_larged0'>
+ <doc>Single part electron test 7-80 GeV, larged0</doc>
+ <displayName>ElectronSlice single particle e 7-80 GeV, larged0</displayName>
+ <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000003.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000003.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000004.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000005.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000006.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000007.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000010.pool.root.1</dataset>
-
<action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -r Offline -f data-all.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArdict.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron </argvalue>
+ <argvalue>TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat </argvalue>
</arg>
</action>
-
- <action position="03">
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
-
- <action position="04">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-electron-lowpt </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
- <action position="05">
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-electron-lowpt </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
-
- <action position="06">
+ <action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots-muon </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
</arg>
</action>
- <action position="07">
+ <action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -771,84 +966,63 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots-muon </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
-
- <action position="08">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="09">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="10">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig -d HLTEF-plots-bjet </argvalue>
- </arg>
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
</action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -933,73 +1107,74 @@
-
-
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_larged0-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_larged0_PU-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
+
-
<athenaCommonFlags />
</athena>
-
- <athena trendId='all_pu46' userJobId='TrigInDetValidation_beamspot_ttbar_pu46'>
- <doc>BeamSpot slice, ttbar events, pu46, run2 chains</doc>
- <displayName>BeamSpot slice, ttbar, pu46, run2 chains</displayName>
- <commandLineFlags>EventMax=1000;runMergedChain=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice</options>
+ <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_larged0_PU'>
+ <doc>Single part electron test 7-80 GeV, larged0</doc>
+ <displayName>ElectronSlice single particle e 7-80 GeV, larged0</displayName>
+ <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000006.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000010.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000011.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000012.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000013.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000014.pool.root.1</dataset>
+
-
<action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat </argvalue>
- </arg>
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat </argvalue>
+ </arg>
</action>
- <action position="02">
+
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -1008,52 +1183,121 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-beamspot_ttbar_pu46-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
</arg>
</action>
- <action position="03">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-all.root data-beamspot_ttbar_pu46-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -1138,28 +1382,29 @@
-
-
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_larged0_PU-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_larged0-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
+
-
<athenaCommonFlags />
</athena>
@@ -1167,102 +1412,171 @@
- <athena trendId='electron_merging_lowpt' userJobId='TrigInDetValidation_el_Jpsiee_pu40'>
- <doc>Jpsie3e3, pu0, run2 chains</doc>
- <displayName>ElectronSlice-Jpsie3e3, pu40, run2 chains</displayName>
- <commandLineFlags>EventMax=10000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000006.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000007.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000010.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000017.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000021.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000023.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000024.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000029.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000039.pool.root.1</dataset>
-
+ <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_IBL'>
+ <doc>Single part electron test 7-80 GeV pu 0, IBL, run2 chains</doc>
+ <displayName>ElectronSlice single partile e 7-80 GeV, pu 0, IBL, run2 chains</displayName>
+ <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
+ <package>Trigger/TrigValidation/TrigInDetValidation</package>
+ <group>TrigInDetValidation</group>
+ <queue>long</queue>
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
- </arg>
- </action>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000003.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000004.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000005.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000006.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000007.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000010.pool.root.1</dataset>
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
- </arg>
- </action>
+ <action position="01">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat </argvalue>
+ </arg>
+ </action>
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Jpsiee_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
- </arg>
- </action>
+
+ <action position="02">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
+ </arg>
+ </action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -1346,38 +1660,39 @@
</action>
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
+ <auxFilePattern>data-el_single_e_7-80_IBL-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_IBL-ref.root</auxFilePattern>
+
+ <auxFilePattern>TIDA*.dat</auxFilePattern>
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
+ <athenaCommonFlags />
+ </athena>
- <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_larged0'>
- <doc>Single part electron test 7-80 GeV, larged0</doc>
- <displayName>ElectronSlice single particle e 7-80 GeV, larged0</displayName>
+ <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_IBL_pu40'>
+ <doc>Single part electron test 7-80 GeV, pu40, IBL, run2 chains</doc>
+ <displayName>ElectronSlice single particle e 7-80 GeV, pu40, IBL run2 chains</displayName>
<commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
@@ -1385,17 +1700,16 @@
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000003.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000004.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000005.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000006.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000007.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000010.pool.root.1</dataset>
-
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000003.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000004.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000005.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000006.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000007.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000010.pool.root.1</dataset>
@@ -1408,7 +1722,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat </argvalue>
</arg>
</action>
@@ -1420,87 +1734,126 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
</arg>
</action>
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -1591,20 +1944,21 @@
</testToRemove>
+ <auxFilePattern>data-el_single_e_7-80_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_single_e_7-80_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
<auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -1614,78 +1968,107 @@
- <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_larged0_PU'>
- <doc>Single part electron test 7-80 GeV, larged0</doc>
- <displayName>ElectronSlice single particle e 7-80 GeV, larged0</displayName>
- <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40'>
+ <doc>Zee, pu40, IBL, run2 chains</doc>
+ <displayName>Zee pu40, IBL, run2 chains</displayName>
+ <commandLineFlags>EventMax=5000;runMergedChain=True</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
+ <package>Trigger/TrigValidation/TrigInDetValidation</package>
+ <group>TrigInDetValidation</group>
+ <queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000006.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000010.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000011.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000012.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000013.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000014.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
+
+
+ <action position="01">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
+ </arg>
+ </action>
+
+
- <action position="01">
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-larged0-el.dat -f data-electron-IBL.root -p 11 -b Test_bin_larged0.dat </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
- <action position="02">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
- <action position="03">
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
- <action position="04">
+ <action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -1694,13 +2077,12 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
- <action position="05">
+ <action position="07">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -1709,37 +2091,50 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_larged0_PU-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -1823,111 +2218,135 @@
</action>
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
+ <auxFilePattern>data-el_Zee_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
-
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <athenaCommonFlags />
+
+ <athenaCommonFlags />
</athena>
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_offline'>
+ <doc>Zee, pu40, IBL, run2 chains</doc>
+ <displayName>Zee pu40, IBL, run2 chains</displayName>
+ <commandLineFlags>EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
+ <package>Trigger/TrigValidation/TrigInDetValidation</package>
+ <group>TrigInDetValidation</group>
+ <queue>long</queue>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
+
- <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_IBL'>
- <doc>Single part electron test 7-80 GeV pu 0, IBL, run2 chains</doc>
- <displayName>ElectronSlice single partile e 7-80 GeV, pu 0, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000003.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000004.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000005.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000006.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000007.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000010.pool.root.1</dataset>
-
-
+
+ <action position="01">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt-offline.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
+ </arg>
+ </action>
- <action position="01">
+
+
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
-
- <action position="02">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
- <action position="03">
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
-
- <action position="04">
+
+
+ <action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -1936,13 +2355,12 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
- <action position="05">
+ <action position="07">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -1951,37 +2369,50 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -2065,108 +2496,135 @@
</action>
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
+ <auxFilePattern>data-el_Zee_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_offline-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <athenaCommonFlags />
+
+ <athenaCommonFlags />
</athena>
- <athena trendId='electronIBLTrend' userJobId='TrigInDetValidation_el_single_e_7-80_IBL_pu40'>
- <doc>Single part electron test 7-80 GeV, pu40, IBL, run2 chains</doc>
- <displayName>ElectronSlice single particle e 7-80 GeV, pu40, IBL run2 chains</displayName>
- <commandLineFlags>EventMax=15000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher'>
+ <doc>Zee, pu40, IBL, run2 chains</doc>
+ <displayName>Zee pu40, IBL, run2 chains</displayName>
+ <commandLineFlags>EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
+ <package>Trigger/TrigValidation/TrigInDetValidation</package>
+ <group>TrigInDetValidation</group>
+ <queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000003.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000004.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000005.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000006.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000007.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000010.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
+
+
+ <action position="01">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt-offline-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
+ </arg>
+ </action>
- <action position="01">
+
+
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-IBL.root -p 11 -b Test_bin.dat </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
-
- <action position="02">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
- <action position="03">
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
-
- <action position="04">
+
+
+ <action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -2175,13 +2633,12 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
- <action position="05">
+ <action position="07">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -2190,37 +2647,50 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-IBL.root data-el_single_e_7-80_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -2304,40 +2774,40 @@
</action>
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
+ <auxFilePattern>data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_offline_rzMatcher-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
- <athenaCommonFlags />
+
+ <athenaCommonFlags />
</athena>
-
-
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40'>
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher'>
<doc>Zee, pu40, IBL, run2 chains</doc>
<displayName>Zee pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=5000;runMergedChain=True</commandLineFlags>
+ <commandLineFlags>EventMax=5000;runMergedChain=True;PdgId=11</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
@@ -2358,7 +2828,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -2368,101 +2837,138 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
</arg>
</action>
-
-
-
+
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
</arg>
</action>
+
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -2553,15 +3059,17 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40_rzMatcher-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -2575,30 +3083,22 @@
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_offline'>
- <doc>Zee, pu40, IBL, run2 chains</doc>
- <displayName>Zee pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11</commandLineFlags>
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_ttbar_pu40'>
+ <doc>ttbar, pu40, run2 chains</doc>
+ <displayName>ttbar pu40, run2 chains</displayName>
+ <commandLineFlags>EventMax=8000;runMergedChain=True</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
-
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000003.pool.root.1</dataset>
-
+
<action position="01">
<modulename>RttLibraryTools</modulename>
@@ -2609,61 +3109,72 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
</arg>
</action>
-
-
+
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
-
<action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="06">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -2672,37 +3183,64 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -2793,15 +3331,17 @@
</testToRemove>
+ <auxFilePattern>data-el_ttbar_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -2814,31 +3354,22 @@
-
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_offline_rzMatcher'>
- <doc>Zee, pu40, IBL, run2 chains</doc>
- <displayName>Zee pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=2500;runMergedChain=True;doIDNewTracking=True;PdgId=11</commandLineFlags>
+ <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_ttbar_pu80'>
+ <doc>ttbar, pu80, run2 chains</doc>
+ <displayName>ttbar pu80, run2 chains</displayName>
+ <commandLineFlags>EventMax=4000;runMergedChain=True</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
-
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000002.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000003.pool.root.1</dataset>
-
+
<action position="01">
<modulename>RttLibraryTools</modulename>
@@ -2849,2239 +3380,138 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
</arg>
</action>
-
-
+
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_offline_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_Zee_IBL_pu40_rzMatcher'>
- <doc>Zee, pu40, IBL, run2 chains</doc>
- <displayName>Zee pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=5000;runMergedChain=True;PdgId=11</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000008.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000009.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000013.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000014.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000019.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000023.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000024.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000025.pool.root.1</dataset>
-
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-rzMatcher.dat -f data-electron-merge.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="05">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40_rzMatcher-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_ttbar_pu40'>
- <doc>ttbar, pu40, run2 chains</doc>
- <displayName>ttbar pu40, run2 chains</displayName>
- <commandLineFlags>EventMax=8000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000003.pool.root.1</dataset>
-
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="05">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
- <athena trendId='Zeeelectron_merging' userJobId='TrigInDetValidation_el_ttbar_pu80'>
- <doc>ttbar, pu80, run2 chains</doc>
- <displayName>ttbar pu80, run2 chains</displayName>
- <commandLineFlags>EventMax=4000;runMergedChain=True</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_ElectronSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000003.pool.root.1</dataset>
-
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
- <action position="05">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
- <athena trendId='cosmicTrend' userJobId='TrigInDetValidation_cosmic'>
- <doc> Cosmic slice test</doc>
- <displayName>CosmicSlice</displayName>
- <commandLineFlags>EventMax=5000;</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_CosmicSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
-
- <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000050.pool.root.1</dataset>-->
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000892.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000981.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000100.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000118.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000240.pool.root.1</dataset>
- <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000286.pool.root.1</dataset>-->
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000451.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000638.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000701.pool.root.1</dataset>
- <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000873.pool.root.1</dataset>-->
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAcosmic-rtt.dat -f data-cosmic.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-cosmic.root data-cosmic-reference.root HLT_id_cosmic_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_test'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDApost.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_offline'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains, vs offline</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains, vs offline</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
- <action position="04">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx/xPrimVx HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_EFHistoVtx/EFHistoVtx -c TIDAvertex.dat -d HLTL2-vtx </argvalue>
- </arg>
- </action>
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu46'>
- <doc>Bjetslice, ttbar, pu46, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu46, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000003.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu80'>
- <doc>Bjetslice, ttbar, pu80, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu80, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000001.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000002.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7195/RDO.06752780._000003.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
- </action>
-
-
-
-
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
- </arg>
- </action>
-
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
-
-
- <action position="30">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>RunTrigCostD3PD.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> -f trig_cost.root --outputTagFromAthena --monitorAllChainSeqAlg --monitorROI --linkOutputDir --monitorGlobals </argvalue>
- </arg>
- </action>
-
- <action position="31">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall --auto -d "/Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="32">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent --auto -d "/Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="33">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perCall-chain --auto -d "/Chain_Algorithm" -p "_Time_perCall" </argvalue>
- </arg>
- </action>
-
- <action position="34">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDAcpucost.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue> costMon/TrigCostRoot_Results.root costMon/TrigCostRoot_Results.root -o cost-perEvent-chain --auto -d "/Chain_Algorithm" -p "_Time_perEvent" </argvalue>
- </arg>
- </action>
-
- <action position="40">
- <modulename>CheckLog_TriggerTest</modulename>
- <testname>CheckLog_TriggerTest</testname>
- <arg>
- <argname>command</argname>
- <argvalue>check_log.pl --conf checklogTriggerTest.conf %JOBLOG</argvalue>
- </arg>
- </action>
-
-
-
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
-
-
- <auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
- <auxFilePattern>TIDAWeb/*</auxFilePattern>
- <auxFilePattern>TIDAWeb/build/*</auxFilePattern>
- <auxFilePattern>TIDAindex.html</auxFilePattern>
- <auxFilePattern>TIDAindex-*.htm</auxFilePattern>
- <auxFilePattern>TIDAindex*.php</auxFilePattern>
- <auxFilePattern>TIDAstyle.css</auxFilePattern>
-
-
- <athenaCommonFlags />
- </athena>
-
-
-
-
-
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_trkpt2'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;minVtxTrackpT=2000;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
- <package>Trigger/TrigValidation/TrigInDetValidation</package>
- <group>TrigInDetValidation</group>
- <queue>long</queue>
-
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
-
-
-
- <action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
- </action>
-
-
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
- </action>
-
-
-
-
- <action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ </arg>
</action>
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
+
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-electron-merge.root data-el_ttbar_pu80-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -5165,114 +3595,112 @@
</action>
+
+ <testToRemove>
+ <jobGroupName>RTT:Top</jobGroupName>
+ <testidentifier>CheckFileRunner0</testidentifier>
+ </testToRemove>
+
- <testToRemove>
- <jobGroupName>RTT:Top</jobGroupName>
- <testidentifier>CheckFileRunner0</testidentifier>
- </testToRemove>
-
-
+ <auxFilePattern>data-el_ttbar_pu80-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_ttbar_pu80-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
+ <auxFilePattern>TIDAindex-lowpt.html</auxFilePattern>
-
- <athenaCommonFlags />
+
+ <athenaCommonFlags />
</athena>
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super1'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=2;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
- <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
+ <athena trendId='cosmicTrend' userJobId='TrigInDetValidation_cosmic'>
+ <doc> Cosmic slice test</doc>
+ <displayName>CosmicSlice</displayName>
+ <commandLineFlags>EventMax=5000;</commandLineFlags>
+ <options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_CosmicSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
-
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000041.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000044.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000048.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000051.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000053.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000054.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000055.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000059.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000060.pool.root.1</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
+ <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000050.pool.root.1</dataset>-->
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000892.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000981.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000100.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000118.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000240.pool.root.1</dataset>
+ <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000286.pool.root.1</dataset>-->
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000451.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000638.pool.root.1</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000701.pool.root.1</dataset>
+ <!--<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc14_cos.108865.CosSimPixVolSolOnTorOn.recon.RDO.s2111_r6258_tid05313290_00/RDO.05313290._000873.pool.root.1</dataset>-->
+
<action position="01">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
- </arg>
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAcosmic-rtt.dat -f data-cosmic.root -b Test_bin.dat </argvalue>
+ </arg>
</action>
-
- <action position="02">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
- </arg>
+ <action position="02">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-cosmic.root data-cosmic-reference.root HLT_id_cosmic_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID -d HLTEF-plots </argvalue>
+ </arg>
</action>
-
-
<action position="03">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
- </arg>
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-cosmic.root data-cosmic-reference.root HLT_id_cosmic_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID -d HLTEF-test-plots </argvalue>
+ </arg>
</action>
-
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -5280,19 +3708,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -5374,6 +3789,8 @@
+
+
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
@@ -5381,31 +3798,29 @@
-
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
+ <auxFilePattern>data-cosmic-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-cosmic-ref.root</auxFilePattern>
-
<athenaCommonFlags />
</athena>
-
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super2'>
+ <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40'>
<doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
<displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=5;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
+ <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
@@ -5425,7 +3840,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -5435,29 +3849,41 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
</arg>
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -5466,11 +3892,24 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
</arg>
</action>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
@@ -5480,7 +3919,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -5488,19 +3927,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -5588,15 +4014,17 @@
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -5609,11 +4037,10 @@
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super3'>
+ <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_test'>
<doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
<displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=5;bjetDynamicEtFactor=10;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
+ <commandLineFlags>EventMax=900;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
@@ -5633,23 +4060,51 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArdict.exe</argvalue>
+ <argvalue>TIDArdict.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>TIDAdata11-rtt.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="02">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging.root -b Test_bin.dat </argvalue>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
</arg>
</action>
- <action position="02">
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -5658,14 +4113,26 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
</arg>
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
- <action position="03">
+ <action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -5674,7 +4141,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
+ <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
</arg>
</action>
@@ -5682,13 +4149,12 @@
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -5696,19 +4162,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -5796,15 +4249,17 @@
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -5817,11 +4272,10 @@
-
- <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_super4'>
- <doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
- <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
- <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;bjetDynamicMinJetEt=True;bjetDynamicNJetsMax=10;bjetDynamicEtFactor=10;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
+ <athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40_offline'>
+ <doc>Bjetslice, ttbar, pu40, IBL, run2 chains, vs offline</doc>
+ <displayName>BjetSlice, ttbar, pu40, IBL, run2 chains, vs offline</displayName>
+ <commandLineFlags>EventMax=900;doIDNewTracking=True;runMergedChain=True;globalTag='OFLCOND-RUN12-SDR-17'</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BjetSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
@@ -5841,7 +4295,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -5851,29 +4304,55 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup-merging-offline.root -b Test_bin.dat </argvalue>
+ <argvalue>TIDAdata11-rtt-offline.dat -f data-bjet-pileup.root -b Test_bin.dat </argvalue>
</arg>
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx/xPrimVx HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_EFHistoVtx/EFHistoVtx -c TIDAvertex.dat -d HLTL2-vtx </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -5882,11 +4361,36 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-bjet-pileup-merging.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-plots </argvalue>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID -d HLTEF-test-plots </argvalue>
</arg>
</action>
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split:TrigFastTrackFinder_Jet_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-pileup.root data-bjet_IBL_pu40_offline-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_xPrimVx/xPrimVx HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi_EFHistoVtx/EFHistoVtx -c TIDAvertex.dat -d HLTL2-vtx </argvalue>
+ </arg>
+ </action>
@@ -5896,7 +4400,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -5904,19 +4408,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -5998,21 +4489,25 @@
+
+
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40_offline-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -6026,8 +4521,6 @@
-
-
<athena trendId='tau_merging' userJobId='TrigInDetValidation_tau_IBL_pu46' >
<doc>TauSlice, H->tautau IBL sample, pu46, run2 chains</doc>
<displayName>TauSlice, H->tautau IBL sample, pu46, run2 chains</displayName>
@@ -6049,7 +4542,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._004832.pool.root.1</dataset>
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -6064,14 +4556,13 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6079,7 +4570,6 @@
</arg>
</action>
-
<action position="03">
@@ -6087,7 +4577,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6095,14 +4585,13 @@
</arg>
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6111,6 +4600,47 @@
</action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
@@ -6119,7 +4649,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6127,19 +4657,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -6227,15 +4744,17 @@
</testToRemove>
+ <auxFilePattern>data-tau_IBL_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_IBL_pu46-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -6246,7 +4765,6 @@
-
<athena trendId='tau_merging' userJobId='TrigInDetValidation_tau_IBL_pu46_offline' >
<doc>TauSlice, H->tautau IBL sample, pu46, run2 chains</doc>
<displayName>TauSlice, H->tautau IBL sample, pu46, run2 chains</displayName>
@@ -6268,7 +4786,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._004832.pool.root.1</dataset>
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -6282,7 +4799,6 @@
</arg>
</action>
-
<action position="03">
@@ -6290,7 +4806,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6298,7 +4814,6 @@
</arg>
</action>
-
<action position="04">
@@ -6306,7 +4821,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6314,14 +4829,13 @@
</arg>
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6329,6 +4843,47 @@
</arg>
</action>
+
+
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
@@ -6338,7 +4893,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6346,19 +4901,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -6446,15 +4988,17 @@
</testToRemove>
+ <auxFilePattern>data-tau_IBL_pu46_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_IBL_pu46_offline-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -6466,7 +5010,6 @@
-
<athena trendId='muonTrend' userJobId='TrigInDetValidation_mu_single_mu_larged0'>
<doc>Single muon 100 GeV, run2 chains </doc>
<displayName>MuonSlice-single muon larged0, pu0, run2 chains</displayName>
@@ -6487,7 +5030,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240174._000009.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240174._000010.pool.root.1</dataset>
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -6503,8 +5045,36 @@
-
<action position="02">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
+
+
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -6513,13 +5083,11 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
-
- <action position="03">
+ <action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -6528,20 +5096,19 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-muon.root data-mu_single_mu_larged0-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6549,19 +5116,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -6649,19 +5203,20 @@
</testToRemove>
+ <auxFilePattern>data-mu_single_mu_larged0-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_single_mu_larged0-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -6671,7 +5226,6 @@
-
<athena trendId='muonTrend' userJobId='TrigInDetValidation_mu_single_mu_larged0_PU'>
<doc>Single muon 100 GeV, run2 chains </doc>
<displayName>MuonSlice-single muon larged0, pu, run2 chains</displayName>
@@ -6693,7 +5247,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945423._000010.pool.root.1</dataset>
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -6709,13 +5262,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6724,13 +5276,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6740,31 +5291,45 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon.root data-mu_single_mu_larged0_PU-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -6855,19 +5420,20 @@
</testToRemove>
+ <auxFilePattern>data-mu_single_mu_larged0_PU-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_single_mu_larged0_PU-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
- <auxFilePattern>Test_bin_larged0.dat</auxFilePattern>
<athenaCommonFlags />
@@ -6878,7 +5444,6 @@
-
<athena trendId='muonPileupMergingTrend' userJobId='TrigInDetValidation_mu_Zmumu_IBL_pu40'>
<doc>Z->mumu pu40, IBL, run2 chains</doc>
<displayName>MuonSlice, Z->mumu, pu40, IBL, run2 chains</displayName>
@@ -6905,7 +5470,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -6921,13 +5485,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6936,13 +5499,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -6951,31 +5513,59 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -7066,15 +5656,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -7086,7 +5678,6 @@
-
<athena trendId='muonPileupMergingTrend' userJobId='TrigInDetValidation_mu_Zmumu_IBL_pu40_offline'>
<doc>Z->mumu pu40, IBL, run2 chains</doc>
<displayName>MuonSlice, Z->mumu, pu40, IBL, run2 chains</displayName>
@@ -7113,7 +5704,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -7128,13 +5718,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7143,13 +5732,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7158,32 +5746,45 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -7274,15 +5875,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_offline-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -7294,7 +5897,6 @@
-
<athena trendId='muonPileupMergingTrend' userJobId='TrigInDetValidation_mu_Zmumu_IBL_pu40_offline_rzMatcher'>
<doc>Z->mumu pu40, IBL, run2 chains</doc>
<displayName>MuonSlice, Z->mumu, pu40, IBL, run2 chains</displayName>
@@ -7321,7 +5923,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -7337,13 +5938,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7352,13 +5952,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7368,31 +5967,45 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -7483,15 +6096,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_offline_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_offline_rzMatcher-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -7503,7 +6118,6 @@
-
<athena trendId='muonPileupMergingTrend' userJobId='TrigInDetValidation_mu_Zmumu_IBL_pu40_rzMatcher'>
<doc>Z->mumu pu40, IBL, run2 chains</doc>
<displayName>MuonSlice, Z->mumu, pu40, IBL, run2 chains</displayName>
@@ -7530,7 +6144,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -7546,13 +6159,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7561,13 +6173,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7577,31 +6188,45 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -7692,15 +6317,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40_rzMatcher-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40_rzMatcher-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -7713,7 +6340,6 @@
-
<athena trendId='muonBphysMergingTrend' userJobId='TrigInDetValidation_mu_bphys_IBL'>
<doc>Muon slice B->Jpsi->mumu IBL sample, run2 chains</doc>
<displayName>MuonSlice, B->Jpsi->mumu IBL , run2 chains</displayName>
@@ -7731,7 +6357,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -7747,13 +6372,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7762,8 +6386,35 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDAcomparitor.exe</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ </arg>
+ </action>
+
+
+
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
- <action position="03">
+ <action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
@@ -7772,20 +6423,19 @@
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7793,19 +6443,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -7893,15 +6530,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_bphys_IBL-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_bphys_IBL-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -7915,7 +6554,6 @@
-
<athena userJobId='TrigInDetValidation_minBias'>
<doc>Tests LVL2 and EF ID full scan instance of tracking algorithms in the di-jet sample</doc>
<displayName>FullScan on di-jet events</displayName>
@@ -7959,7 +6597,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -7974,13 +6611,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -7989,31 +6625,31 @@
</action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-monitor.root data-minBias-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -8103,16 +6739,18 @@
</testToRemove>
+ <auxFilePattern>data-minBias-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -8124,7 +6762,6 @@
-
<athena userJobId='TrigInDetValidation_minBias_offline'>
<doc>Tests ID full scan tracking in the di-jet sample vs offline</doc>
<displayName>FullScan on di-jet event vs offlines</displayName>
@@ -8168,7 +6805,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -8183,13 +6819,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8198,31 +6833,31 @@
</action>
-
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-minBias.root data-minBias_offline-reference.root HLT_mb_idperf_L1MBTS_2_InDetTrigTrackingxAODCnv_minBias_EFID -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -8312,16 +6947,18 @@
</testToRemove>
+ <auxFilePattern>data-minBias_offline-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -8335,7 +6972,6 @@
-
<athena trendId='FTKMergingTrend' userJobId='TrigInDetValidation_FTK_mu_ttbar'>
<doc>Muon slice FTK ttbar sample</doc>
<displayName>MuonSlice FTK ttbar sample</displayName>
@@ -8362,7 +6998,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -8378,13 +7013,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8393,13 +7027,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8408,13 +7041,12 @@
</action>
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8423,13 +7055,12 @@
</action>
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8439,31 +7070,71 @@
+ <action position="06">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="07">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu24_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+ <action position="08">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit -d HLTL2-test-plots-lowpt </argvalue>
+ </arg>
+ </action>
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="09">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-muon-FTK.root data-FTK_mu_ttbar-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_FTK_idperf_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig HLT_mu6_FTKRefit_idperf_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig -d HLTEF-test-plots-lowpt </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -8554,15 +7225,17 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_mu_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_mu_ttbar-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -8574,7 +7247,6 @@
-
<athena trendId='FTKMergingTrend' userJobId='TrigInDetValidation_FTK_tau_tautau'>
<doc>Tau slice FTK tautau sample</doc>
<displayName>TauSlice FTK tautau sample</displayName>
@@ -8595,7 +7267,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -8611,13 +7282,12 @@
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8626,13 +7296,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8642,31 +7311,45 @@
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
-
- <action position="20">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDArun.sh</argvalue>
</arg>
- <arg>
+ <arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
+ <argvalue>data-tau-FTK.root data-FTK_tau_tautau-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_FTK:InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig HLT_tau25_idperf_FTKRefit:InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
</arg>
</action>
- <action position="21">
+
+
+
+ <action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
+ <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -o times </argvalue>
</arg>
</action>
@@ -8757,15 +7440,17 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_tau_tautau-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_tau_tautau-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -8777,7 +7462,6 @@
-
<athena trendId='FTKMergingTrend' userJobId='TrigInDetValidation_FTK_bjet_ttbar'>
<doc>Bjetslice, ttbar, FTK chains</doc>
<displayName>BjetSlice, ttbar, FYK chains</displayName>
@@ -8803,7 +7487,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -8818,13 +7501,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8833,13 +7515,12 @@
</action>
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8848,6 +7529,32 @@
</action>
+ <action position="04">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_FTF_forID HLT_j55_bperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_FTF HLT_j55_bperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK HLT_j55_bperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
+ <action position="05">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-bjet-FTK.root data-FTK_bjet_ttbar-reference.root HLT_j55_bperf_split_InDetTrigTrackingxAODCnv_Bjet_IDTrig_forID HLT_j55_bperf_split_FTKVtx_InDetTrigTrackingxAODCnv_Bjet_IDTrig HLT_j55_bperf_split_FTK_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig HLT_j55_bperf_split_FTKRefit_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig -d HLTEF-test-plots </argvalue>
+ </arg>
+ </action>
+
@@ -8856,7 +7563,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -8864,19 +7571,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -8966,15 +7660,17 @@
</testToRemove>
+ <auxFilePattern>data-FTK_bjet_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_bjet_ttbar-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -8987,7 +7683,6 @@
-
<athena trendId='all_pu46' userJobId='TrigInDetValidation_FTK_beamspot_ttbar'>
<doc>BeamSpot slice, ttbar events, FTK, pu46, run2 chains</doc>
<displayName>BeamSpot slice, ttbar, FTK, pu46, run2 chains</displayName>
@@ -9013,7 +7708,6 @@
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -9028,13 +7722,12 @@
</action>
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -9043,6 +7736,19 @@
</action>
+ <action position="03">
+ <modulename>RttLibraryTools</modulename>
+ <testname>ExeRunner</testname>
+ <arg>
+ <argname>exeName</argname>
+ <argvalue>TIDArun.sh</argvalue>
+ </arg>
+ <arg>
+ <argname>exeParamString</argname>
+ <argvalue>data-beamspot-FTK.root data-FTK_beamspot_ttbar-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF HLT_beamspot_allTE_FTK_InDetTrigTrackingxAODCnv_BeamSpot_FTK -d HLTL2-test-plots </argvalue>
+ </arg>
+ </action>
+
@@ -9053,7 +7759,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -9061,19 +7767,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -9163,15 +7856,17 @@
</testToRemove>
+ <auxFilePattern>data-FTK_beamspot_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_beamspot_ttbar-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin*.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -9182,7 +7877,6 @@
-
</jobList>
<jobGroups>
@@ -9202,7 +7896,6 @@
<keepFilePattern displayColor="blue">*.root</keepFilePattern>
<keepFilePattern maxsize="150">TrigInDet*.log</keepFilePattern>
<keepFilePattern>*.log</keepFilePattern>
- <keepFilePattern>*.root</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.dat</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.html</keepFilePattern>
<keepFilePattern displayColor="red">TIDA*.htm</keepFilePattern>
@@ -9212,26 +7905,10 @@
<keepFilePattern displayColor="red">*.css</keepFilePattern>
<keepFilePattern>TIDAWeb/*</keepFilePattern>
<keepFilePattern>TIDAWeb/build/*</keepFilePattern>
-
<keepFilePattern>times/*</keepFilePattern>
- <keepFilePattern>times-FTF/*</keepFilePattern>
-
- <keepFilePattern>times/*.p*</keepFilePattern>
- <keepFilePattern>times-FTF/*.p*</keepFilePattern>
-
- <keepFilePattern>times/*.pdf</keepFilePattern>
- <keepFilePattern>times/*.png</keepFilePattern>
-
- <keepFilePattern>times-FTF/*.pdf</keepFilePattern>
- <keepFilePattern>times-FTF/*.png</keepFilePattern>
-
<keepFilePattern>*.png</keepFilePattern>
<keepFilePattern>*.ps</keepFilePattern>
- <keepFilePattern>*.php</keepFilePattern>
- <keepFilePattern>*.php</keepFilePattern>
- <keepFilePattern>*.css</keepFilePattern>
- <keepFilePattern>*.dat</keepFilePattern>
- <keepFilePattern>*.sh</keepFilePattern>
+ <keepFilePattern>*.hist</keepFilePattern>
<keepFilePattern>*.pool.root.1</keepFilePattern>
<keepFilePattern>*.pool.root.2</keepFilePattern>
<keepFilePattern>*.pdf</keepFilePattern>
@@ -9279,27 +7956,6 @@
<keepFilePattern>HLTL2-plots-beamspot/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots/*.p*</keepFilePattern>
- <keepFilePattern>HLTEF-test-plots-lowpt/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-test-plots/*.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-lowpt/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-electron/*.p*</keepFilePattern>
- <keepFilePattern>HLTEF-test-plots-lowpt-electron/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-test-plots-electron/*.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-electron-lowpt/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-muon/*.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-muon/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTEF-test-plots-tau/*.p*</keepFilePattern>
- <keepFilePattern>HLTL2-test-plots-tau/*.p*</keepFilePattern>
-
-
-
<keepFilePattern>costMonitoring*/*</keepFilePattern>
<keepFilePattern>costMonitoring*/csv/*</keepFilePattern>
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs b/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
index 7f24292082a2..cb6631d2c762 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
@@ -110,11 +110,10 @@ foreach xmlfile ( $files )
# # echo "joboption $joboptions cmdlineflags $cmdlineflags"
- if ( "$joboptions" != "" ) then
- echo >> $outfile
- echo "get_files -jo $joboptions.py" >> $outfile
-# echo "athena.py -c 'include("\"$pyfile\"";$cmdlineflags' $joboptions.py" >> $_file.sh
- echo "athena.py -c 'XMLDataSet="\"$jobid\"";$cmdlineflags' $joboptions.py" >> $outfile
+ if ( "$joboptions" != "" ) then
+ echo "\nget_files -jo $joboptions.py" >> $outfile
+# echo "athena.py -c 'include("\"$pyfile\"";$cmdlineflags' $joboptions.py \n\n" >> $_file.sh
+ echo "athena.py -c 'XMLDataSet="\"$jobid\"";$cmdlineflags' $joboptions.py \n\n" >> $outfile
endif
# cat /tmp/_args
@@ -131,62 +130,39 @@ foreach xmlfile ( $files )
set arg = `tail -$N /tmp/_args | head -1`
- # NB: the TIDArun.sh exeRunners do not need to get_files the reference
- # files, since the TIDArun.sh script copies them itself
-
- if ( "$arg" == "TIDArdict.exe" || \
- "$arg" == "TIDAcomparitor.exe" || \
- "$arg" == "TIDAcpucost.exe" || \
- "$arg" == "TIDArdict" || \
- "$arg" == "TIDAcomparitor" || \
- "$arg" == "TIDAcpucost" || \
- "$arg" == "TIDAcpucost" || \
- "$arg" == "TIDArun.sh" || \
- "$arg" == "RunTrigCostD3PD.exe" ) then
- if ( "$command" != "" ) then
- echo "$command" >> $outfile
- echo >> $outfile
- endif
- set command = "$arg"
-
-# echo "COMMAND: $command"
-
+ if ( "$arg" == "TIDArdict.exe" || "$arg" == "TIDAcomparitor.exe" || "$arg" == "TIDAcpucost.exe" || "$arg" == "RunTrigCostD3PD.exe" ) then
+ if ( "$command" != "" ) then
+ echo "$command\n" >> $outfile
+ endif
+ set command = "$arg"
else
- if ( "$command" == "TIDAcpucost.exe" || \
- "$command" == "TIDAcpucost" ) then
-
+ if ( "$command" == "TIDAcpucost.exe" ) then
set auxfile = `grep auxFile /tmp/$_file.xml | grep expert | $SED 's|.*<auxFilePattern>||g' | $SED 's|</auxFilePattern>||g'`
set arg = `echo "$arg" | $SED "s| \S*\*\S* | $auxfile |g"`
- endif
-
- foreach ffile ( $arg )
-
-# echo "FFILE $ffile"
-
- set ext = `echo $ffile | cut -d . -f2`
- set ref = `echo $ffile | grep ".*ref.*.root"`
-# echo "ffile: $ffile"
-# echo "ref: $ref : ext: $ext"
- if ( "$ext" == "dat" || "$ref" != "" ) then
-# echo " getting file $ffile"
- if ( "$command" != "TIDArun.sh" ) then
- echo "get_files -data $ffile" >> $outfile
- endif
- endif
- end
- set command = "$command $arg"
- endif
-
- @ N--
+ endif
+
+ foreach ffile ( $arg )
+ set ext = `echo $ffile | cut -d . -f2`
+ set ref = `echo $ffile | grep ".*ref.*.root"`
+# echo "ffile: $ffile"
+# echo "ref: $ref : ext: $ext"
+ if ( "$ext" == "dat" || "$ref" != "" ) then
+# echo " getting file $ffile"
+ echo "get_files -data $ffile" >> $outfile
+ endif
+ end
+ set command = "$command $arg"
+ endif
+
+ @ N--
end
if ( "$command" != "" ) then
- echo "$command" >> $outfile
- echo >> $outfile
+ echo "$command\n\n" >> $outfile
endif
endif
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/makefile b/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/makefile
deleted file mode 100644
index 5c893f1093cd..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-sb : selectblock.cxx
- g++ -o $@ $<
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx b/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
deleted file mode 100644
index c7ef1cc6ab2b..000000000000
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// @file selectblock.cxx
-//
-//
-// @author M.Sutton
-//
-// Copyright (C) 2017 M.Sutton (sutt@cern.ch)
-//
-// $Id: selectblock.cxx, v0.0 Mon 23 Jan 2017 12:30:25 CET sutt $
-
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <vector>
-#include <cstdlib>
-#include <cstdio>
-
-template<typename T>
-std::ostream& operator<<( std::ostream& s, std::vector<T>& v ) {
- for ( size_t i=0 ; i<v.size() ; i++ ) s << v[i] << std::endl;
- return s;
-}
-
-
-void replace( std::vector<std::string> b, int position, const std::string& regex, const std::string& pattern ) {
- for ( int i=0 ; i<b.size() ; i++ ) {
-
- size_t p0 = b[i].find( "position=" );
-
- std::string newline;
-
- if ( p0!=std::string::npos ) {
- char nl[128];
-
- sprintf( nl, b[i].substr( 0, p0 ).c_str() );
-
- std::string ns=nl;
- ns+="position=\"%02d\">";
-
- sprintf( nl, ns.c_str(), position );
-
-
- newline = nl;
- }
- else {
-
- size_t p = b[i].find( regex );
-
- if ( p!=std::string::npos ) {
- newline = b[i].replace( p, regex.size(), pattern );
- }
- else newline = b[i];
- }
-
- if ( newline.find("-plots")!=std::string::npos ) {
- newline.replace( newline.find("-plots"), 6, "-test-plots" );
- }
-
- std::cout << newline << std::endl;
- }
-}
-
-
-bool comparitor( std::vector<std::string>& b ) {
- // for ( size_t i=0 ; i<b.size() ; i++ ) if ( b[i].find("TIDAcomparitor")!=std::string::npos ) return true;
- for ( size_t i=0 ; i<b.size() ; i++ ) if ( b[i].find("TIDArun")!=std::string::npos ) return true;
- return false;
-}
-
-
-int main( int argc, char** argv ) {
-
- if ( argc<2 ) return -1;
-
- std::ifstream file( argv[1] );
-
- std::vector<std::vector<std::string> > block(1,std::vector<std::string>() );
-
- bool start = false;
-
- std::string line;
-
- std::vector<int> position(1, 0);
-
- int iblock = 0;
-
- while( getline( file, line ) && !file.fail() ) {
-
- if ( line.find("action")!=std::string::npos ) {
- if ( line.find("/action")==std::string::npos ) {
- start = true;
- std::string tmp = line;
- size_t pos = tmp.find("\"");
- std::string p = tmp.substr( pos+1, tmp.size()-pos-1 );
- pos = p.find("\"");
- p = p.substr( 0, pos );
- // position[iblock] = std::atoi( p.c_str() );
-
- // std::cout << "pos: " << position << std::endl;
-
- if ( iblock==0 ) {
- iblock++;
- block.push_back(std::vector<std::string>());
- position.push_back( 0 );
- }
- position[iblock] = std::atoi( p.c_str() );
- }
- }
-
- block[iblock].push_back(line);
-
-
- if ( line.find("/action")!=std::string::npos ) {
- start = false;
- iblock++;
- block.push_back(std::vector<std::string>());
- position.push_back( 0 );
- }
-
- }
-
- // std::cout << "\nBLOCKS " << block.size() << "\t" << position.size() << std::endl;
-
-
- int maxblock = 0;
-
- for ( size_t i=0 ; i<block.size() ; i++ ) {
- if ( comparitor(block[i]) && position[i]>position[maxblock] ) maxblock = i;
- }
-
- int lastblock = 0;
-
- for ( size_t i=0 ; i<block.size() ; i++ ) if ( position[i]>0 ) lastblock = i;
-
- // std::cout << "maxblock " << maxblock << std::endl;
-
- for ( size_t i=0 ; i<=lastblock ; i++ ) {
- if ( !comparitor( block[i] ) ) std::cout << block[i] << std::endl;
- }
-
- int nblock = position[maxblock]+1;
-
- // for ( size_t i=0 ; i<block.size() ; i++ ) {
- // if ( comparitor(block[i]) && position[i]>0 ) {
- // replace( block[i], nblock++, "TIDAcomparitor.exe", "TIDArun.sh" );
- // }
- // }
-
- for ( size_t i=lastblock+1 ; i<block.size() ; i++ ) std::cout << block[i] << std::endl;
-
-
- return 0;
-}
-
diff --git a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/TrigInDetValidationLight_TestConfiguration_main.xml b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/TrigInDetValidationLight_TestConfiguration_main.xml
index 4fa758029818..1d1d2f7b0890 100644
--- a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/TrigInDetValidationLight_TestConfiguration_main.xml
+++ b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/TrigInDetValidationLight_TestConfiguration_main.xml
@@ -15,7 +15,7 @@
<kv/>
<rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <mailto>sutt@cern.ch,jiri.masik@cern.ch,kirk@stfc.ac.uk</mailto>
+ <mailto>D.Emeliyanov@rl.ac.uk,jiri.masik@cern.ch</mailto>
<refRelease>14.5.0</refRelease>
@@ -68,20 +68,7 @@
<keepFilePattern displayColor="red">TIDA*.css</keepFilePattern>
<keepFilePattern>TIDAWeb/STAR</keepFilePattern>
<keepFilePattern>TIDAWeb/build/STAR</keepFilePattern>
-
<keepFilePattern>times/STAR</keepFilePattern>
- <keepFilePattern>times-FTF/STAR</keepFilePattern>
-
- <keepFilePattern>times/STAR.p*</keepFilePattern>
- <keepFilePattern>times-FTF/STAR.p*</keepFilePattern>
-
- <keepFilePattern>times/STAR.pdf</keepFilePattern>
- <keepFilePattern>times/STAR.png</keepFilePattern>
-
- <keepFilePattern>times-FTF/STAR.pdf</keepFilePattern>
- <keepFilePattern>times-FTF/STAR.png</keepFilePattern>
-
-
<keepFilePattern>*.png</keepFilePattern>
<keepFilePattern>*.ps</keepFilePattern>
<keepFilePattern>*.hist</keepFilePattern>
@@ -125,8 +112,6 @@
<keepFilePattern>HLTL2-plots-bjet-lowpt/STAR.p*</keepFilePattern>
<keepFilePattern>HLT-plots-PrmVtx/STAR.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-vtx/STAR.p*</keepFilePattern>
<keepFilePattern>costMonitoring*/STAR</keepFilePattern>
<keepFilePattern>costMonitoring*/csv/STAR</keepFilePattern>
diff --git a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
index 92e0fadf8474..2241c2a57268 100644
--- a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
+++ b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
@@ -15,9 +15,7 @@
# TIDV = $(ATLAS_TEST_AREA)/Trigger/TrigValidation/TrigInDetValidation/TrigInDetValidation-00-07-18/build
-# TIDV = $(ATLAS_TEST_AREA)/InstallArea/share/TIDAbuild
-TIDV = ../../TrigInDetValidation/TIDAbuild
-
+TIDV = $(ATLAS_TEST_AREA)/InstallArea/share/TIDAbuild
JOBS = \
$(TIDV)/TrigInDetValidation_el_Zee_IBL_pu40.xml \
@@ -50,21 +48,12 @@ all: $(XMLFILE)
$(FILES) : $(JOBS)
- cat /tmp/_$@ | grep -v \# > $@
- validateXML.py $@
-
-
$(XMLFILE) : clean $(FILES) $(JOBS) $(AUXFILES)
- cpp -traditional-cpp $(IFILES) $(FILES) | sed 's|STAR|\*|g' | grep -v "\# " | grep -v "emacs:" > /tmp/_$@
+ cpp -traditional-cpp $(IFILES) $(FILES) -DSTAR="*" | grep -v "\# " | grep -v "emacs:" > /tmp/_$@
cat /tmp/_$@ | grep -v \# > $@
python /afs/cern.ch/user/r/rtt/public/validateXML.py $@
-move :
- mv ../test/$(XMLFILE) ../test/$(XMLFILE).bak
- mv $(XMLFILE) ../test
-
-
scripts : $(patsubst %.xml,$(SCRIPTDIR)/%.sh,$(JOBS))
$(SCRIPTDIR)/%.sh : %.xml
diff --git a/Trigger/TrigValidation/TrigInDetValidationLight/test/TrigInDetValidationLight_TestConfiguration.xml b/Trigger/TrigValidation/TrigInDetValidationLight/test/TrigInDetValidationLight_TestConfiguration.xml
index 5e74c4effab6..e83c374440bf 100644
--- a/Trigger/TrigValidation/TrigInDetValidationLight/test/TrigInDetValidationLight_TestConfiguration.xml
+++ b/Trigger/TrigValidation/TrigInDetValidationLight/test/TrigInDetValidationLight_TestConfiguration.xml
@@ -15,7 +15,7 @@
<kv/>
<rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <mailto>sutt@cern.ch,jiri.masik@cern.ch,kirk@stfc.ac.uk</mailto>
+ <mailto>D.Emeliyanov@rl.ac.uk,jiri.masik@cern.ch</mailto>
<refRelease>14.5.0</refRelease>
@@ -51,8 +51,6 @@
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -65,8 +63,6 @@
<argvalue>TIDAdata11-rtt.dat -f data-electron-merge.root -p 11 -b Test_bin.dat </argvalue>
</arg>
</action>
-
-
@@ -75,71 +71,64 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e24_medium_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots </argvalue>
</arg>
</action>
-
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e24_medium_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e24_medium_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots </argvalue>
</arg>
</action>
-
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig -d HLTEF-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_IDTrig HLT_e5_loose_L2Star_idperf_InDetTrigTrackingxAODCnv_Electron_EFID -d HLTEF-plots-lowpt </argvalue>
</arg>
</action>
-
-
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF -d HLTL2-plots-lowpt </argvalue>
+ <argvalue>data-electron-merge.root data-el_Zee_IBL_pu40-reference.root HLT_e5_loose_idperf_InDetTrigTrackingxAODCnv_Electron_FTF HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_0 HLT_e5_loose_L2Star_idperf_TrigL2SiTrackFinder_eGamma_2 -d HLTL2-plots-lowpt </argvalue>
</arg>
</action>
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -147,19 +136,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -247,15 +223,17 @@
</testToRemove>
+ <auxFilePattern>data-el_Zee_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-el_Zee_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -268,8 +246,6 @@
-
-
<athena trendId='bjetIBLPU40Trend' userJobId='TrigInDetValidation_bjet_IBL_pu40'>
<doc>Bjetslice, ttbar, pu40, IBL, run2 chains</doc>
<displayName>BjetSlice, ttbar, pu40, IBL, run2 chains</displayName>
@@ -292,8 +268,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7143/RDO.06718152._000071.pool.root.1</dataset>
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -307,14 +281,12 @@
</arg>
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -323,14 +295,12 @@
</action>
-
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -340,15 +310,12 @@
-
-
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -356,19 +323,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -450,21 +404,25 @@
+
+
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
+ <auxFilePattern>data-bjet_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-bjet_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -477,8 +435,6 @@
-
-
<athena trendId='tau_merging' userJobId='TrigInDetValidation_tau_IBL_pu46' >
<doc>TauSlice, H->tautau IBL sample, pu46, run2 chains</doc>
<displayName>TauSlice, H->tautau IBL sample, pu46, run2 chains</displayName>
@@ -499,8 +455,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._004797.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._004832.pool.root.1</dataset>
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -514,23 +468,19 @@
</arg>
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots </argvalue>
</arg>
</action>
-
-
<action position="03">
@@ -538,22 +488,20 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-plots </argvalue>
</arg>
</action>
-
-
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -564,13 +512,12 @@
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -578,19 +525,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -678,15 +612,17 @@
</testToRemove>
+ <auxFilePattern>data-tau_IBL_pu46-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-tau_IBL_pu46-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -697,8 +633,6 @@
-
-
<athena trendId='muonPileupMergingTrend' userJobId='TrigInDetValidation_mu_Zmumu_IBL_pu40'>
<doc>Z->mumu pu40, IBL, run2 chains</doc>
<displayName>MuonSlice, Z->mumu, pu40, IBL, run2 chains</displayName>
@@ -724,8 +658,6 @@
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -740,33 +672,29 @@
</action>
-
-
- <action position="02">
+ <action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_0 HLT_mu24_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-plots </argvalue>
</arg>
</action>
-
-
- <action position="03">
+ <action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-muon-pileup-merge.root data-mu_Zmumu_IBL_pu40-reference.root HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu24_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-plots </argvalue>
</arg>
</action>
@@ -778,7 +706,7 @@
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -786,19 +714,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -886,15 +801,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_Zmumu_IBL_pu40-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_Zmumu_IBL_pu40-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -906,8 +823,6 @@
-
-
<athena trendId='muonBphysMergingTrend' userJobId='TrigInDetValidation_mu_bphys_IBL'>
<doc>Muon slice B->Jpsi->mumu IBL sample, run2 chains</doc>
<displayName>MuonSlice, B->Jpsi->mumu IBL , run2 chains</displayName>
@@ -924,8 +839,6 @@
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -940,46 +853,41 @@
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF -d HLTL2-plots </argvalue>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_L2Star_idperf_TrigL2SiTrackFinder_Muon_1 HLT_mu6_L2Star_idperf_TrigL2SiTrackFinder_Muon_2 -d HLTL2-plots </argvalue>
</arg>
</action>
-
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
- <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig -d HLTEF-plots </argvalue>
+ <argvalue>data-muon-bphys-merge.root data-mu_bphys_IBL-reference.root HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_FTF HLT_mu6_idperf_InDetTrigTrackingxAODCnv_Muon_IDTrig HLT_mu6_L2Star_idperf_InDetTrigTrackingxAODCnv_Muon_EFID -d HLTEF-plots </argvalue>
</arg>
</action>
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -987,19 +895,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -1087,15 +982,17 @@
</testToRemove>
+ <auxFilePattern>data-mu_bphys_IBL-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-mu_bphys_IBL-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -1107,8 +1004,6 @@
-
-
<athena userJobId='TrigInDetValidation_minBias'>
<doc>Tests LVL2 and EF ID full scan instance of tracking algorithms in the di-jet sample</doc>
<displayName>FullScan on di-jet events</displayName>
@@ -1151,8 +1046,6 @@
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000948.pool.root.1</dataset>
-
-
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
@@ -1166,14 +1059,12 @@
</arg>
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1183,13 +1074,12 @@
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1197,19 +1087,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -1296,16 +1173,18 @@
</testToRemove>
+ <auxFilePattern>data-minBias-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-minBias-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -1317,8 +1196,6 @@
-
-
<athena trendId='FTKMergingTrend' userJobId='TrigInDetValidation_FTK_bjet_ttbar'>
<doc>Bjetslice, ttbar, FTK chains</doc>
<displayName>BjetSlice, ttbar, FYK chains</displayName>
@@ -1329,18 +1206,16 @@
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000010.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000017.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000031.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000039.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000049.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000063.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000079.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000082.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000091.RDO_FTK.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000094.RDO_FTK.root</dataset>
-
-
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000001.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000002.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000003.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000004.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000005.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000006.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000007.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000008.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000009.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.410000.recon.RDO.e3698_s2608_s2183_r6630_20.7.2.3.updatesJohn.newFormat.v1_EXT2.58456700/user.jahreda.7261042.EXT2._000010.RDO_FTK.pool.root</dataset>
@@ -1358,14 +1233,12 @@
</arg>
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1373,14 +1246,12 @@
</arg>
</action>
-
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1391,13 +1262,12 @@
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1405,19 +1275,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -1507,15 +1364,17 @@
</testToRemove>
+ <auxFilePattern>data-FTK_bjet_ttbar-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_bjet_ttbar-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -1528,8 +1387,6 @@
-
-
<athena trendId='FTKMergingTrend' userJobId='TrigInDetValidation_FTK_tau_tautau'>
<doc>Tau slice FTK tautau sample</doc>
<displayName>TauSlice FTK tautau sample</displayName>
@@ -1540,12 +1397,16 @@
<queue>long</queue>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000002.RDO_FTK_ttbar.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000006.RDO_FTK_ttbar.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000043.RDO_FTK_ttbar.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000044.RDO_FTK_ttbar.root</dataset>
- <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.147408.PowhegPythia8_AZNLO_Ztautau.recon.RDO.e3099_s2578_r7611.beamspotJohn.v6_EXT2/user.jahreda.8926715.EXT2._000053.RDO_FTK_ttbar.root</dataset>
-
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000001.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000002.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000003.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000004.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000005.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000006.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000007.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000008.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000009.RDO_FTK.pool.root</dataset>
+ <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.mc15_13TeV.147818.Ztautau.recon.RDO.e3802_s2608_s2183_r6635.updatesJohn.newFormat.v1_EXT2.58456225/user.jahreda.7261043.EXT2._000010.RDO_FTK.pool.root</dataset>
@@ -1565,14 +1426,12 @@
</action>
-
-
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1580,14 +1439,12 @@
</arg>
</action>
-
-
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcomparitor.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1598,13 +1455,12 @@
-
<action position="20">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
+ <argvalue>TIDAcpucost.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
@@ -1612,19 +1468,6 @@
</arg>
</action>
- <action position="21">
- <modulename>RttLibraryTools</modulename>
- <testname>ExeRunner</testname>
- <arg>
- <argname>exeName</argname>
- <argvalue>TIDArun.sh</argvalue>
- </arg>
- <arg>
- <argname>exeParamString</argname>
- <argvalue>expert-monitoring.root expert-monitoring*-ref.root --auto -p FastTrack -o times-FTF </argvalue>
- </arg>
- </action>
-
<action position="30">
@@ -1712,15 +1555,17 @@
</testToRemove>
<auxFilePattern>TIDAdata*.dat</auxFilePattern>
+ <auxFilePattern>data-FTK_tau_tautau-reference.root</auxFilePattern>
+ <auxFilePattern>expert-monitoring-FTK_tau_tautau-ref.root</auxFilePattern>
<auxFilePattern>TIDA*.dat</auxFilePattern>
- <auxFilePattern>Test*.dat</auxFilePattern>
- <auxFilePattern>TIDA*.sh</auxFilePattern>
-
+ <auxFilePattern>Test_bin.dat</auxFilePattern>
+
<auxFilePattern>TIDAWeb/*</auxFilePattern>
<auxFilePattern>TIDAWeb/build/*</auxFilePattern>
<auxFilePattern>TIDAindex.html</auxFilePattern>
+ <auxFilePattern>TIDAindex-EFID.html</auxFilePattern>
<auxFilePattern>TIDAindex-*.htm</auxFilePattern>
<auxFilePattern>TIDAindex*.php</auxFilePattern>
<auxFilePattern>TIDAstyle.css</auxFilePattern>
@@ -1731,8 +1576,6 @@
</athena>
-
-
</jobList>
<jobGroups>
@@ -1758,20 +1601,7 @@
<keepFilePattern displayColor="red">TIDA*.css</keepFilePattern>
<keepFilePattern>TIDAWeb/*</keepFilePattern>
<keepFilePattern>TIDAWeb/build/*</keepFilePattern>
-
<keepFilePattern>times/*</keepFilePattern>
- <keepFilePattern>times-FTF/*</keepFilePattern>
-
- <keepFilePattern>times/*.p*</keepFilePattern>
- <keepFilePattern>times-FTF/*.p*</keepFilePattern>
-
- <keepFilePattern>times/*.pdf</keepFilePattern>
- <keepFilePattern>times/*.png</keepFilePattern>
-
- <keepFilePattern>times-FTF/*.pdf</keepFilePattern>
- <keepFilePattern>times-FTF/*.png</keepFilePattern>
-
-
<keepFilePattern>*.png</keepFilePattern>
<keepFilePattern>*.ps</keepFilePattern>
<keepFilePattern>*.hist</keepFilePattern>
@@ -1815,8 +1645,6 @@
<keepFilePattern>HLTL2-plots-bjet-lowpt/*.p*</keepFilePattern>
<keepFilePattern>HLT-plots-PrmVtx/*.p*</keepFilePattern>
-
- <keepFilePattern>HLTL2-vtx/*.p*</keepFilePattern>
<keepFilePattern>costMonitoring*/*</keepFilePattern>
<keepFilePattern>costMonitoring*/csv/*</keepFilePattern>
--
GitLab