diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/JetInputProviderFEX.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/JetInputProviderFEX.cxx
index 1b0f839894a8cfc6da73f7fb96539ec215547a78..fa79f90a53356b44dc2bbcd35a6d7365ef596540 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/JetInputProviderFEX.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/JetInputProviderFEX.cxx
@@ -69,7 +69,7 @@ JetInputProviderFEX::handle(const Incident& incident) {
replace( histPath.begin(), histPath.end(), '.', '/');
//jJet
- auto hjJetPt = std::make_unique<TH1I>( "jJetTOBPt", "jJet TOB Pt", 40, 0, 200);
+ auto hjJetPt = std::make_unique<TH1I>( "jJetTOBPt", "jJet TOB Pt", 100, 0, 500);
hjJetPt->SetXTitle("p_{T}");
auto hjJetEtaPhi = std::make_unique<TH2I>( "jJetTOBPhiEta", "jJet TOB Location", 220, -110, 110, 128, 0, 128);
@@ -92,7 +92,7 @@ JetInputProviderFEX::handle(const Incident& incident) {
}
//jLargeRJet
- auto hjLargeRJetPt = std::make_unique<TH1I>( "jLargeRJetTOBPt", "jLargeRJet TOB Pt", 80, 0, 400);
+ auto hjLargeRJetPt = std::make_unique<TH1I>( "jLargeRJetTOBPt", "jLargeRJet TOB Pt", 100, 0, 2000);
hjLargeRJetPt->SetXTitle("p_{T}");
auto hjLargeRJetEtaPhi = std::make_unique<TH2I>( "jLargeRJetTOBPhiEta", "jLargeRJet TOB Location", 220, -110, 110, 128, 0, 128);
@@ -173,14 +173,14 @@ JetInputProviderFEX::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) const {
ATH_MSG_DEBUG( "EDM jFEX jTau Number: "
<< +jFexRoI->jFexNumber() // returns an 8 bit unsigned integer referring to the jFEX number
<< " et: "
- << jFexRoI->et() // returns the et value of the jet in 200 MeV unit
+ << jFexRoI->et() // returns the et value of the jet in MeV unit
<< " eta: "
<< jFexRoI->globalEta() // returns a floating point global eta (will be at full precision 0.025, but currently only at 0.1)
<< " phi: "
<< jFexRoI->globalPhi() // returns a floating point global phi
);
- unsigned int Et = jFexRoI->et()*2; //Convert Et to 100 MeV unit
+ unsigned int Et = jFexRoI->et()/100.; //Convert Et to 100 MeV unit
// Eta and phi is local coordinates, need to switch with global coordinates.
double phi = jFexRoI->globalPhi()/10.;
double eta = jFexRoI->globalEta()/10.;
@@ -206,14 +206,14 @@ JetInputProviderFEX::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) const {
ATH_MSG_DEBUG( "EDM jFex JJet Number: "
<< +jFexRoI->jFexNumber() // returns an 8 bit unsigned integer referring to the jFEX number
<< " et: "
- << jFexRoI->et() // returns the et value of the jet in 200 MeV unit
+ << jFexRoI->et() // returns the et value of the jet in MeV unit
<< " eta: "
<< jFexRoI->globalEta() // returns a floating point global eta (will be at full precision 0.025, but currently only at 0.1)
<< " phi: "
<< jFexRoI->globalPhi() // returns a floating point global phi
);
- unsigned int Et = jFexRoI->et()*2; //Convert Et to 100 MeV unit
+ unsigned int Et = jFexRoI->et()/100.; //Convert Et to 100 MeV unit
// Eta and phi is local coordinates, need to switch with global coordinates.
double phi = jFexRoI->globalPhi()/10.;
double eta = jFexRoI->globalEta()/10.;
@@ -239,14 +239,14 @@ JetInputProviderFEX::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) const {
ATH_MSG_DEBUG( "EDM jFex jJet Number: "
<< +jFexRoI->jFexNumber() // returns an 8 bit unsigned integer referring to the jFEX number
<< " et: "
- << jFexRoI->et() // returns the et value of the jet in 200 MeV unit
+ << jFexRoI->et() // returns the et value of the jet in MeV unit
<< " eta: "
<< jFexRoI->globalEta() // returns a floating point global eta (will be at full precision 0.025, but currently only at 0.1)
<< " phi: "
<< jFexRoI->globalPhi() // returns a floating point global phi
);
- unsigned int Et = jFexRoI->et()*2; //Convert Et to 100 MeV unit
+ unsigned int Et = jFexRoI->et()/100.; //Convert Et to 100 MeV unit
// Eta and phi is local coordinates, need to switch with global coordinates.
double phi = jFexRoI->globalPhi()/10.;
double eta = jFexRoI->globalEta()/10.;
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index fa001fd0875c0f07c3f6c696537b1e771b219ac9..da038600e55e4239ff5ed6825e3281727dac49af 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -193,7 +193,7 @@ class TopoAlgoDef:
elif jet_type=='FjJ':
mineta = 31*_eta_conversion
minet = 15*_et_conversion
- alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab' )
+ alg = AlgConf.jJetSelect( name = jet_type+'ab', inputs = 'jJetTobs', outputs = jet_type+'ab' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.OutputWidthSelectJET)
alg.addvariable('MinET', minet)
@@ -202,14 +202,14 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
#input list needed for ATR-18824 (TODO: to be replaced by fwd jEM)
- alg = AlgConf.JetSort( name = 'FjJjs23ETA49', inputs = 'JetTobArray', outputs = 'FjJjs23ETA49')
+ alg = AlgConf.jJetSort( name = 'FjJjs23ETA49', inputs = 'jJetTobs', outputs = 'FjJjs23ETA49')
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addvariable('MinEta', 23*_eta_conversion)
alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetSort( name = 'CjJsETA21', inputs = 'JetTobArray', outputs = 'CjJsETA21')
+ alg = AlgConf.jJetSort( name = 'CjJsETA21', inputs = 'jJetTobs', outputs = 'CjJsETA21')
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addvariable('MinEta', 0*_eta_conversion)
@@ -226,7 +226,7 @@ class TopoAlgoDef:
jetabseta = 26*_eta_conversion
elif jet_type=='FjJ':
mineta = 31*_eta_conversion
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s' )
+ alg = AlgConf.jJetSort( name = jet_type+'s', inputs = 'jJetTobs', outputs = jet_type+'s' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addvariable('MinEta', mineta)
@@ -239,7 +239,7 @@ class TopoAlgoDef:
jetabseta = 31*_eta_conversion
elif jet_type=='CjJ':
jetabseta = 26*_eta_conversion
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s' )
+ alg = AlgConf.jJetSort( name = jet_type+'s', inputs = 'jJetTobs', outputs = jet_type+'s' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addvariable('MinEta', 0*_eta_conversion)