diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfigMT_Ntuple.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfigMT_Ntuple.h
index 2939ddb730be1677ccd665544fb6b63e3e65865a..b6104590d924820386080d2d4db3278d504e398a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfigMT_Ntuple.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfigMT_Ntuple.h
@@ -38,12 +38,14 @@ public:
const std::vector<std::string>& chainNames, std::string outputFileName="TrkNtuple.root",
double tauEtCutOffline=0.0, int TruthPdgId = 0, bool keepAllEvents_=false ) :
AnalysisConfig_Ntuple( roiInfo, chainNames, outputFileName, tauEtCutOffline, TruthPdgId, keepAllEvents_ ),
- m_fiducial_radius(47)
+ m_fiducial_radius(47),
+ m_ptmin(1000)
{ }
virtual ~AnalysisConfigMT_Ntuple() { }
void set_fiducial_radius( double d ) { m_fiducial_radius = d; }
+ void set_ptmin( double d ) { m_ptmin = d; }
protected:
@@ -52,6 +54,7 @@ protected:
private:
double m_fiducial_radius;
+ double m_ptmin;
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
index 7c70b661b0f2662d4cb651ad699cbae57fb3f300..6d13a1a7867a0fad279d52fc7c09f2c639e70ff6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
@@ -147,6 +147,7 @@ public:
bool m_legacy;
double m_fiducial_radius;
+
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
index cbae0534088fef92084066afbbf661daf71b2d78..5afb71ddef9da96a68d214aa1e41d3928a8b4102 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
@@ -164,8 +164,8 @@ void AnalysisConfigMT_Ntuple::loop() {
/// FIXME: should really have hardcoded limits encoded as
/// const variables
Filter_etaPT filterRef(5,500);
- Filter_etaPT filter_etaPT(3.0,1000);
- Filter_pdgIdpTeta filter_pdgIdpTeta(m_TruthPdgId,3.0,1000); // |eta|<3, pt>1GeV
+ Filter_etaPT filter_etaPT(3.0,m_ptmin);
+ Filter_pdgIdpTeta filter_pdgIdpTeta(m_TruthPdgId,3.0,m_ptmin); // |eta|<3, pt>1GeV
TrackFilter* truthFilter = &filter_etaPT;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
index 67e16003b75189042c64cb4451f24ad4d3558428..9c024fba8b39de09094acfa7692102ccdf666a9a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
@@ -145,6 +145,7 @@ StatusCode TrigTestMonToolAC::init() {
m_outputFileName, m_tauEtCutOffline, m_selectTruthPdgId,
m_keepAllEvents );
ac->set_fiducial_radius( m_fiducial_radius );
+ ac->set_ptmin( m_pTCutOffline );
m_sequences.push_back( ac );
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_cuts.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_cuts.dat
index b73d35fb102d3766a3082ceadb275cf78e96eca2..bb90e62aed098fdd4b0008e49dcae4857855cfc0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_cuts.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_cuts.dat
@@ -1,6 +1,6 @@
#ifdef MINBIAS
-pT = 1000;
+pT = 400;
#else
pT = 3000;
#endif
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index 3fdc4eb99b773769a80c762bad8e42834adcf678..e0fb1c1c247d94f478983ecbfc1a3ff659170233 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -156,7 +156,7 @@ class TrigInDetReco(ExecStep):
##################################################
class TrigInDetAna(ExecStep):
- def __init__(self, name='TrigInDetAna', lrt=False):
+ def __init__(self, name='TrigInDetAna', extra=None):
ExecStep.__init__(self, name )
self.type = 'athena'
self.job_options = 'TrigInDetValidation/TrigInDetValidation_AODtoTrkNtuple.py'
@@ -167,8 +167,8 @@ class TrigInDetAna(ExecStep):
self.input = ''
self.perfmon=False
self.imf=False
- if (lrt):
- self.args = ' -c "LRT=True" '
+ if extra is not None:
+ self.args = extra
##################################################
# Additional exec (athena) steps - RDO to CostMonitoring
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
index 0534d22370822791418710c3e9735a7104f7a8a9..d9e0304dc0f28d28666cd5eefcf32d019d242e30 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
@@ -95,6 +95,9 @@ if ( True ) :
if LRT == True :
TestMonTool.FiducialRadius = 500.
+ if 'ptmin' in dir():
+ TestMonTool.pTCutOffline = ptmin
+
TestMonTool.KeepAllEvents = False
# TestMonTool.TrigConfigTool = "TrigConf::xAODConfigTool"
TestMonTool.ntupleChainNames += [
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
index 0819bc3b8719d6ca341a24c64efed287c90a5f80..440529279fe9c67dfe98a1517c95fcb7a08ead78 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
@@ -107,10 +107,13 @@ if GridFiles:
test = Test.Test()
test.art_type = Art_type
-lrt_mode = False
-if 'LRT' in dir() :
- lrt_mode = LRT
-aod_to_ntup = TrigInDetAna(lrt=lrt_mode)
+
+if 'Extra' not in locals() :
+ Extra = None
+
+aod_to_ntup = TrigInDetAna(extra=Extra)
+
+
rdo_to_cost = TrigCostStep()
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py
index 2466c0f6cb80707619a492adef5c37d541af86fa..377c60e047e8bf062844ff2e0b11c99eb71cc3e5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py
@@ -28,13 +28,12 @@
Slices = ['FSLRT']
-LRT = True
Events = 8000
Threads = 8
Slots = 8
Input = 'RHadron' # defined in TrigValTools/share/TrigValInputs.json
GridFiles = False
-
+Extra = ' -c "LRT=True" '
Jobs = [ ( "Truth", " TIDAdata-run3-lrt.dat -o data-hists.root ", "Test_bin_lrt.dat" ),
( "Offline", " TIDAdata-run3-offline-lrt.dat -r Offline -o data-hists-offline.root", "Test_bin_lrt.dat" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
index 2662e32507af3d0a3e94c0b313d3d231b6fc09c4..104efc5ee3ae977b3430c73f6c66912c629625ff 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
@@ -31,6 +31,7 @@ Events = 8000
Threads = 8
Slots = 8
Input = 'minbias' # defined in TrigValTools/share/TrigValInputs.json
+Extra = " -c 'ptmin=400' "
Jobs = [ ( "Truth", " TIDAdata-run3-minbias.dat -o data-hists.root" ),
( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py
index 0c40f0bdd1e748bec5214339b9e9af685634ff1b..d10c5b84080371580df03e59ea4e5cb37adac5e2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py
@@ -28,13 +28,12 @@
Slices = ['L2muonLRT']
-LRT = True
Events = 8000
Threads = 8
Slots = 8
Input = 'StauStau' # defined in TrigValTools/share/TrigValInputs.json
GridFiles = False
-
+Extra = ' -c "LRT=True" '
Jobs = [ ( "Truth", " TIDAdata-run3-lrt.dat -o data-hists.root -p 13", "Test_bin_lrt.dat" ),
( "Offline", " TIDAdata-run3-offline-lrt.dat -r Offline -o data-hists-offline.root", "Test_bin_lrt.dat" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py
index 7961acd2e7f08541fa0c9ced90cafa82a6b0e61c..b25f6958416f1acc5dab692e7caa0ed0eb2b7e1f 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py
@@ -28,7 +28,7 @@
Slices = ['L2muonLRT']
-LRT = True
+Extra = ' -c "LRT=True" '
Events = 8000
Threads = 8
Slots = 8