From a0b6a2773ea4ddf06033b23982b0881c41fe956f Mon Sep 17 00:00:00 2001
From: Paula Martinez Suarez <paula.martinez.suarez@cern.ch>
Date: Wed, 8 Sep 2021 21:46:04 +0200
Subject: [PATCH] Update algo name
---
...BsIncl.h => InvariantMassThreeTOBsIncl1.h} | 12 +++----
....h => InvariantMassThreeTOBsIncl1Charge.h} | 12 +++----
...cl.cxx => InvariantMassThreeTOBsIncl1.cxx} | 24 ++++++-------
... => InvariantMassThreeTOBsIncl1Charge.cxx} | 36 +++++++++----------
.../python/L1/Config/TopoAlgoDef.py | 2 +-
.../LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py | 2 +-
6 files changed, 44 insertions(+), 44 deletions(-)
rename Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/{InvariantMassThreeTOBsIncl.h => InvariantMassThreeTOBsIncl1.h} (78%)
rename Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/{InvariantMassThreeTOBsInclCharge.h => InvariantMassThreeTOBsIncl1Charge.h} (76%)
rename Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/{InvariantMassThreeTOBsIncl.cxx => InvariantMassThreeTOBsIncl1.cxx} (89%)
rename Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/{InvariantMassThreeTOBsInclCharge.cxx => InvariantMassThreeTOBsIncl1Charge.cxx} (87%)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1.h
similarity index 78%
rename from Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h
rename to Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1.h
index f2836d898d8d..31b95956db28 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1.h
@@ -1,22 +1,22 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// InvariantMassThreeTOBsIncl.h
+// InvariantMassThreeTOBsIncl1.h
// TopoCore
// Created by Carlos Moreno based on InvariantMassInclusive1 by Joerg Stelzer on 11/16/12.
-#ifndef __TopoCore__InvariantMassThreeTOBsIncl__
-#define __TopoCore__InvariantMassThreeTOBsIncl__
+#ifndef L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCL1_H
+#define L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCL1_H
#include <iostream>
#include "L1TopoInterfaces/DecisionAlg.h"
namespace TCS {
- class InvariantMassThreeTOBsIncl : public DecisionAlg {
+ class InvariantMassThreeTOBsIncl1 : public DecisionAlg {
public:
- InvariantMassThreeTOBsIncl(const std::string & name);
- virtual ~InvariantMassThreeTOBsIncl();
+ InvariantMassThreeTOBsIncl1(const std::string & name);
+ virtual ~InvariantMassThreeTOBsIncl1();
virtual StatusCode initialize() override final;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsInclCharge.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1Charge.h
similarity index 76%
rename from Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsInclCharge.h
rename to Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1Charge.h
index 982e30de033e..8486b7ac09fb 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsInclCharge.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl1Charge.h
@@ -1,22 +1,22 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// InvariantMassThreeTOBsInclCharge.h
+// InvariantMassThreeTOBsIncl1Charge.h
// TopoCore
// Created by Paula Martinez based on InvariantMassInclusive1 by Joerg Stelzer on 11/16/12.
-#ifndef L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCLCHARGE_H
-#define L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCLCHARGE_H
+#ifndef L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCL1CHARGE_H
+#define L1TOPOALGORITHMS_INVARIANTMASSTHREETOBSINCL1CHARGE_H
#include <iostream>
#include "L1TopoInterfaces/DecisionAlg.h"
namespace TCS {
- class InvariantMassThreeTOBsInclCharge : public DecisionAlg {
+ class InvariantMassThreeTOBsIncl1Charge : public DecisionAlg {
public:
- InvariantMassThreeTOBsInclCharge(const std::string & name);
- virtual ~InvariantMassThreeTOBsInclCharge();
+ InvariantMassThreeTOBsIncl1Charge(const std::string & name);
+ virtual ~InvariantMassThreeTOBsIncl1Charge();
virtual StatusCode initialize() override final;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1.cxx
similarity index 89%
rename from Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx
rename to Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1.cxx
index 9c1280e5378f..2167676143de 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
- * InvariantMassThreeTOBsIncl.cxx
+ * InvariantMassThreeTOBsIncl1.cxx
* Created by Carlos Moreno based on InvariantMassInclusive1 by V Sorin
*
* For questions contact atlas-trig-l1topo-algcom@cern.ch.
@@ -24,14 +24,14 @@
#include <sstream>
#include <vector>
-#include "L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h"
+#include "L1TopoAlgorithms/InvariantMassThreeTOBsIncl1.h"
#include "L1TopoCommon/Exception.h"
#include "L1TopoInterfaces/Decision.h"
-REGISTER_ALG_TCS(InvariantMassThreeTOBsIncl)
+REGISTER_ALG_TCS(InvariantMassThreeTOBsIncl1)
-TCS::InvariantMassThreeTOBsIncl::InvariantMassThreeTOBsIncl(const std::string & name) : DecisionAlg(name)
+TCS::InvariantMassThreeTOBsIncl1::InvariantMassThreeTOBsIncl1(const std::string & name) : DecisionAlg(name)
{
defineParameter("InputWidth", 3);
defineParameter("MaxTob", 0);
@@ -59,11 +59,11 @@ TCS::InvariantMassThreeTOBsIncl::InvariantMassThreeTOBsIncl(const std::string &
setNumberOutputBits(6);
}
-TCS::InvariantMassThreeTOBsIncl::~InvariantMassThreeTOBsIncl(){}
+TCS::InvariantMassThreeTOBsIncl1::~InvariantMassThreeTOBsIncl1(){}
TCS::StatusCode
-TCS::InvariantMassThreeTOBsIncl::initialize() {
+TCS::InvariantMassThreeTOBsIncl1::initialize() {
if(parameter("MaxTob").value() > 0) {
p_NumberLeading1 = parameter("MaxTob").value();
} else {
@@ -90,8 +90,8 @@ TCS::InvariantMassThreeTOBsIncl::initialize() {
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- std::string hname_accept = "hInvariantMassThreeTOBsIncl_accept_bit"+std::to_string((int)i);
- std::string hname_reject = "hInvariantMassThreeTOBsIncl_reject_bit"+std::to_string((int)i);
+ std::string hname_accept = "hInvariantMassThreeTOBsIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassThreeTOBsIncl1_reject_bit"+std::to_string((int)i);
// mass
bookHist(m_histAccept, hname_accept, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
bookHist(m_histReject, hname_reject, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
@@ -105,7 +105,7 @@ TCS::InvariantMassThreeTOBsIncl::initialize() {
TCS::StatusCode
-TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
+TCS::InvariantMassThreeTOBsIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -167,7 +167,7 @@ TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const std::vector<TCS::TOBAr
}
} else {
- TCS_EXCEPTION("InvariantMassThreeTOBsIncl alg must have 1 input list, but got " << input.size());
+ TCS_EXCEPTION("InvariantMassThreeTOBsIncl1 alg must have 1 input list, but got " << input.size());
}
@@ -176,7 +176,7 @@ TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const std::vector<TCS::TOBAr
}
TCS::StatusCode
-TCS::InvariantMassThreeTOBsIncl::process( const std::vector<TCS::TOBArray const *> & input,
+TCS::InvariantMassThreeTOBsIncl1::process( const std::vector<TCS::TOBArray const *> & input,
const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -239,7 +239,7 @@ TCS::InvariantMassThreeTOBsIncl::process( const std::vector<TCS::TOBArray const
}
} else {
- TCS_EXCEPTION("InvariantMassThreeTOBsIncl alg must have either 1 input list, but got " << input.size());
+ TCS_EXCEPTION("InvariantMassThreeTOBsIncl1 alg must have either 1 input list, but got " << input.size());
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsInclCharge.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1Charge.cxx
similarity index 87%
rename from Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsInclCharge.cxx
rename to Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1Charge.cxx
index 0a35a2c926d5..477676f7df41 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsInclCharge.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl1Charge.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
- * InvariantMassThreeTOBsInclCharge.cxx
+ * InvariantMassThreeTOBsIncl1Charge.cxx
* Created by Paula Martinez based on InvariantMassInclusive1 by V Sorin
*
* For questions contact atlas-trig-l1topo-algcom@cern.ch.
@@ -22,15 +22,15 @@
#include <sstream>
#include <vector>
-#include "L1TopoAlgorithms/InvariantMassThreeTOBsInclCharge.h"
+#include "L1TopoAlgorithms/InvariantMassThreeTOBsIncl1Charge.h"
#include "L1TopoCommon/Exception.h"
#include "L1TopoInterfaces/Decision.h"
-REGISTER_ALG_TCS(InvariantMassThreeTOBsInclCharge)
+REGISTER_ALG_TCS(InvariantMassThreeTOBsIncl1Charge)
-TCS::InvariantMassThreeTOBsInclCharge::InvariantMassThreeTOBsInclCharge(const std::string & name) : DecisionAlg(name)
+TCS::InvariantMassThreeTOBsIncl1Charge::InvariantMassThreeTOBsIncl1Charge(const std::string & name) : DecisionAlg(name)
{
defineParameter("InputWidth", 3);
defineParameter("MaxTob", 0);
@@ -58,11 +58,11 @@ TCS::InvariantMassThreeTOBsInclCharge::InvariantMassThreeTOBsInclCharge(const st
setNumberOutputBits(6);
}
-TCS::InvariantMassThreeTOBsInclCharge::~InvariantMassThreeTOBsInclCharge(){}
+TCS::InvariantMassThreeTOBsIncl1Charge::~InvariantMassThreeTOBsIncl1Charge(){}
TCS::StatusCode
-TCS::InvariantMassThreeTOBsInclCharge::initialize() {
+TCS::InvariantMassThreeTOBsIncl1Charge::initialize() {
if(parameter("MaxTob").value() > 0) {
p_NumberLeading1 = parameter("MaxTob").value();
} else {
@@ -89,14 +89,14 @@ TCS::InvariantMassThreeTOBsInclCharge::initialize() {
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- std::string hname_accept = "hInvariantMassThreeTOBsInclCharge_accept_bit"+std::to_string(static_cast<int>(i));
- std::string hname_reject = "hInvariantMassThreeTOBsInclCharge_reject_bit"+std::to_string(static_cast<int>(i));
- std::string hname_acceptEta1Eta2 = "hInvariantMassThreeTOBsInclCharge_acceptEta1Eta2_bit"+std::to_string(static_cast<int>(i));
- std::string hname_rejectEta1Eta2 = "hInvariantMassThreeTOBsInclCharge_rejectEta1Eta2_bit"+std::to_string(static_cast<int>(i));
- std::string hname_acceptEta2Eta3 = "hInvariantMassThreeTOBsInclCharge_acceptEta2Eta3_bit"+std::to_string(static_cast<int>(i));
- std::string hname_rejectEta2Eta3 = "hInvariantMassThreeTOBsInclCharge_rejectEta2Eta3_bit"+std::to_string(static_cast<int>(i));
- std::string hname_acceptEta3Eta1 = "hInvariantMassThreeTOBsInclCharge_acceptEta3Eta1_bit"+std::to_string(static_cast<int>(i));
- std::string hname_rejectEta3Eta1 = "hInvariantMassThreeTOBsInclCharge_rejectEta3Eta1_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_accept = "hInvariantMassThreeTOBsIncl1Charge_accept_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_reject = "hInvariantMassThreeTOBsIncl1Charge_reject_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_acceptEta1Eta2 = "hInvariantMassThreeTOBsIncl1Charge_acceptEta1Eta2_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_rejectEta1Eta2 = "hInvariantMassThreeTOBsIncl1Charge_rejectEta1Eta2_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_acceptEta2Eta3 = "hInvariantMassThreeTOBsIncl1Charge_acceptEta2Eta3_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_rejectEta2Eta3 = "hInvariantMassThreeTOBsIncl1Charge_rejectEta2Eta3_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_acceptEta3Eta1 = "hInvariantMassThreeTOBsIncl1Charge_acceptEta3Eta1_bit"+std::to_string(static_cast<int>(i));
+ std::string hname_rejectEta3Eta1 = "hInvariantMassThreeTOBsIncl1Charge_rejectEta3Eta1_bit"+std::to_string(static_cast<int>(i));
// mass
bookHist(m_histAccept, hname_accept, "INVM", 100, std::sqrt(p_InvMassMin[i]), std::sqrt(p_InvMassMax[i]));
bookHist(m_histReject, hname_reject, "INVM", 100, std::sqrt(p_InvMassMin[i]), std::sqrt(p_InvMassMax[i]));
@@ -117,7 +117,7 @@ TCS::InvariantMassThreeTOBsInclCharge::initialize() {
TCS::StatusCode
-TCS::InvariantMassThreeTOBsInclCharge::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
+TCS::InvariantMassThreeTOBsIncl1Charge::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -191,7 +191,7 @@ TCS::InvariantMassThreeTOBsInclCharge::processBitCorrect( const std::vector<TCS:
}
} else {
- TCS_EXCEPTION("InvariantMassThreeTOBsInclCharge alg must have 1 input list, but got " << input.size());
+ TCS_EXCEPTION("InvariantMassThreeTOBsIncl1Charge alg must have 1 input list, but got " << input.size());
}
@@ -200,7 +200,7 @@ TCS::InvariantMassThreeTOBsInclCharge::processBitCorrect( const std::vector<TCS:
}
TCS::StatusCode
-TCS::InvariantMassThreeTOBsInclCharge::process( const std::vector<TCS::TOBArray const *> & input,
+TCS::InvariantMassThreeTOBsIncl1Charge::process( const std::vector<TCS::TOBArray const *> & input,
const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -274,7 +274,7 @@ TCS::InvariantMassThreeTOBsInclCharge::process( const std::vector<TCS::TOBArray
}
} else {
- TCS_EXCEPTION("InvariantMassThreeTOBsInclCharge alg must have either 1 input list, but got " << input.size());
+ TCS_EXCEPTION("InvariantMassThreeTOBsIncl1Charge alg must have either 1 input list, but got " << input.size());
}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index 4f17b22af6be..07ef9637c9f5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -1133,7 +1133,7 @@ class TopoAlgoDef:
toponame = "0INVM10-3MU4ab"
log.debug("Define %s", toponame)
inputList = 'MUab'
- alg = AlgConf.InvariantMassThreeTOBsIncl( name = toponame, inputs = inputList, outputs = toponame )
+ alg = AlgConf.InvariantMassThreeTOBsIncl1( name = toponame, inputs = inputList, outputs = toponame )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
index 6e9e91166343..2e63df0429f0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
@@ -1033,7 +1033,7 @@ class TopoAlgoDef(object):
toponame = "0INVM10-3MU4ab" # noqa: F821
log.info("Define %s" % toponame)
inputList = 'MUab'
- alg = AlgConf.InvariantMassThreeTOBsIncl( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
+ alg = AlgConf.InvariantMassThreeTOBsIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
--
GitLab