From 20c2d0ae627cd003bd484222f1b5525ae3485953 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 10 Mar 2025 15:33:44 +0100
Subject: [PATCH 1/2] clean up recursion in headers
---
.../src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h | 6 ++----
.../src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx | 1 +
.../src/GlobalAlgs/Hypothesis/UCL/GenericTob.h | 11 +++--------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
index 81b67922005b..1287d8375586 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
@@ -5,9 +5,10 @@
#ifndef GLOBALSIM_ALGODATATYPES_H
#define GLOBALSIM_ALGODATATYPES_H
-#include "AlgoConstants.h"
+//need the << operator on these two
#include "GenericTob.h"
#include "eEmTob.h"
+
#include <bitset>
#include <ostream>
#include <vector>
@@ -17,10 +18,7 @@ namespace GlobalSim {
template<typename BITSET>
int bitSetToInt(BITSET bitset) {
-
-
if (!bitset[bitset.size()-1]) { return bitset.to_ulong();}
-
bitset.flip();
return -(bitset.to_ulong() + 1);
}
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
index 9ce12af97e28..a47fbae5dd3c 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx
@@ -4,6 +4,7 @@
#include "GenericTob.h"
+#include "AlgoDataTypes.h"
namespace GlobalSim {
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
index 124f873d5563..4131885fd000 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
@@ -5,16 +5,11 @@
#ifndef GLOBALSIM_GENERICTOB_H
#define GLOBALSIM_GENERICTOB_H
-
-#include "AlgoConstants.h"
-#include "AlgoDataTypes.h"
-#include "eEmTob.h"
-
+#include "eEmTob.h" //for eEmTobPtr
#include <bitset>
-#include <ostream>
-#include <vector>
-#include <memory>
+#include <iosfwd>
+class eEmTobPtr;
namespace GlobalSim {
--
GitLab
From de3e178045ddd413a9b660f9064bd9c3127173d6 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 10 Mar 2025 15:36:50 +0100
Subject: [PATCH 2/2] clean up fwd declare
---
.../GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
index 4131885fd000..208b3f9d43f2 100644
--- a/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
+++ b/Trigger/TrigT1/Global/GlobalSimulation/src/GlobalAlgs/Hypothesis/UCL/GenericTob.h
@@ -9,7 +9,6 @@
#include <bitset>
#include <iosfwd>
-class eEmTobPtr;
namespace GlobalSim {
--
GitLab