diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.h
index 35b90cb4d51f00fd5fdb6340145e6acea4724770..0793960c3c65b460d9f5a786a839e2e233d150d0 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDoubletSB.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCDoubletSB_hh
@@ -15,9 +15,10 @@ const int NumberOfDoubletSBData = 2;
class TGCPatchPanelOut;
class TGCHitPattern;
-class TGCDoubletSB: public TGCSlaveBoard {
-public:
- TGCDoubletSB( const TGCArguments* );
+class TGCDoubletSB : public TGCSlaveBoard
+{
+ public:
+ TGCDoubletSB();
virtual ~TGCDoubletSB();
protected:
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.h
index 9801c278a40093081ac352dc5ddb40a108e9046c..67855d5955cf9be777b4c7c74bc8b19f45692828 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerSB.h
@@ -11,13 +11,13 @@ namespace LVL1TGCTrigger {
const int NumberOfInnerSBData = 8;
-class TGCInnerSB: public TGCSlaveBoard {
-
-public:
- TGCInnerSB( const TGCArguments* );
+class TGCInnerSB: public TGCSlaveBoard
+{
+ public:
+ TGCInnerSB();
virtual ~TGCInnerSB(){};
-protected:
+ protected:
virtual void doCoincidence();
virtual void createSlaveBoardOut();
};
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.h
index 37a06907a05076e318c5b4886b6506f00231f489..7c272f698b0dec6ae63f673059295fd792de976b 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCSlaveBoard.h
@@ -1,11 +1,10 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCSlaveBoard_hh
#define TGCSlaveBoard_hh
-#include "TrigT1TGC/TGCArguments.h"
#include "TrigT1TGC/TGCSlaveBoardOut.h"
#include "TrigT1TGC/TGCPatchPanel.h"
#include "TrigT1TGC/TGCPatchPanelOut.h"
@@ -30,7 +29,7 @@ class TGCSlaveBoard {
public:
- TGCSlaveBoard( const TGCArguments* );
+ TGCSlaveBoard();
virtual ~TGCSlaveBoard();
TGCSlaveBoard(const TGCSlaveBoard& right);
TGCSlaveBoard& operator=(const TGCSlaveBoard& right);
@@ -61,9 +60,7 @@ public:
void storeSlbIn();
const std::bitset<200>& GetSlbIn(void) const { return m_slbin; } // for readout
- const TGCArguments* tgcArgs() const { return m_tgcArgs; }
-
-protected:
+ protected:
void collectInput();
void doMaskOperation(){};
void doDecluster();
@@ -86,10 +83,8 @@ protected:
TGCPatchPanelOut* m_patchPanelOut;
std::bitset<200> m_slbin; // store SlaveBoard input for readout
- const TGCArguments* m_tgcArgs;
-
};
-} //end of namespace bracket
+} // end of namespace
-#endif // TGCSlaveBoard_hh
+#endif
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.h
index 8ef6276943319d296df8df32c149ec4b3a80bcc2..59a0a9b060ffde21afeae114930d228f7e33de5c 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripDoubletSB.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCStripDoubletSB_hh
@@ -11,7 +11,7 @@ namespace LVL1TGCTrigger {
class TGCStripDoubletSB : public TGCDoubletSB {
public:
- TGCStripDoubletSB(const TGCArguments* tgcargs):TGCDoubletSB(tgcargs){
+ TGCStripDoubletSB():TGCDoubletSB(){
m_maxDev=3;
m_nChAdj=0;
m_iChBase=1;
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.h
index 86b6fd333ab0c0d30763249d98789348e891a745..b2341f876d2b1dcb68f8a94efb8c86c2132f2c54 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCStripTripletSB.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCStripTripletSB_hh
@@ -11,13 +11,13 @@ namespace LVL1TGCTrigger {
const int NumberOfStripTripletSBData = 8;
-class TGCStripTripletSB: public TGCSlaveBoard {
-
-public:
- TGCStripTripletSB( TGCArguments* );
+class TGCStripTripletSB: public TGCSlaveBoard
+{
+ public:
+ TGCStripTripletSB();
virtual ~TGCStripTripletSB(){};
-protected:
+ protected:
virtual void doCoincidence();
virtual void createSlaveBoardOut();
};
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.h
index e7d15e3ad3dd9451df6645496b3c511f9d9cc65f..fe3cc38f85f81d70f5e19548d02b1a9fd92dd7f9 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireDoubletSB.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TGCWireDoubletSB_hh
@@ -10,7 +10,7 @@ namespace LVL1TGCTrigger {
class TGCWireDoubletSB : public TGCDoubletSB {
public:
- TGCWireDoubletSB(const TGCArguments* tgcargs):TGCDoubletSB(tgcargs){
+ TGCWireDoubletSB():TGCDoubletSB(){
m_maxDev=7;
m_nChAdj=4;
m_iChBase=9;
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.h
index d39871ac3538aa7e8f3851d1c2afe8027c0c2eee..68fb488be7233e65bc0d0f55169857a94b8b9ea0 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCWireTripletSB.h
@@ -13,16 +13,16 @@ const int LengthOfWTSBCoincidenceOut = 100;
const int NChAdjInWTSB = 2;
const int NumberOfWireTripletSBData = 3;
-class TGCWireTripletSB: public TGCSlaveBoard {
-
-public:
+class TGCWireTripletSB: public TGCSlaveBoard
+{
+ public:
TGCWireTripletSB(const TGCWireTripletSB& right);
TGCWireTripletSB& operator=(const TGCWireTripletSB& right);
- TGCWireTripletSB( TGCArguments* );
+ TGCWireTripletSB();
virtual ~TGCWireTripletSB(){};
-protected:
+ protected:
virtual void doCoincidence();
virtual void createSlaveBoardOut();
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
index de682e578bdf0085be3c511f3cd3cbdb7e3a90af..f5e1928c6300b672fb55c516e5880734fe372377 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDoubletSB.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1TGC/TGCDoubletSB.h"
@@ -12,8 +12,8 @@
namespace LVL1TGCTrigger {
-TGCDoubletSB::TGCDoubletSB(const TGCArguments* tgcargs)
- :TGCSlaveBoard(tgcargs),
+TGCDoubletSB::TGCDoubletSB()
+ : TGCSlaveBoard(),
m_priorSign(1),m_numberOfData(2),m_nChInBlock(32),
m_maxDev(0),m_posMaxDev(0),m_negMaxDev(0),m_nChAdj(0),m_iChBase(0),
m_MatrixOverlap(4),m_SType(WIREGROUP)
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
index 62e6ab126456f918c4acbdcece6addbca71b71d9..2798a7d65c6fab193d32dbcbe1979cbf0396b82b 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCInnerSB.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ref. SOS054V06,SOS053V04
@@ -10,7 +10,8 @@
namespace LVL1TGCTrigger {
-TGCInnerSB::TGCInnerSB(const TGCArguments* tgcargs):TGCSlaveBoard(tgcargs)
+TGCInnerSB::TGCInnerSB()
+ : TGCSlaveBoard()
{}
void TGCInnerSB::createSlaveBoardOut()
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
index 132821f694039f72b4aa2d1efdb0a62ffe7a7f57..55b2e0c4d0f52332449900d07e042ae38aeaee28 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSector.cxx
@@ -207,10 +207,10 @@ void TGCSector::setModule(const TGCConnectionPPToSL* connection)
m_numberOfSB[jsb] = connection->getSBToHPB()->getNumber(jsb);
m_SB[jsb] = new TGCSlaveBoard* [m_numberOfSB[jsb]];
for(int i=0; i<m_numberOfSB[jsb]; i+=1) {
- if (jsb==WTSB) { m_SB[jsb][i] = new TGCWireTripletSB(tgcArgs()); }
- else if(jsb==WDSB) { m_SB[jsb][i] = new TGCWireDoubletSB(tgcArgs()); }
- else if(jsb==STSB) { m_SB[jsb][i] = new TGCStripTripletSB(tgcArgs());}
- else if(jsb==SDSB) { m_SB[jsb][i] = new TGCStripDoubletSB(tgcArgs());}
+ if (jsb==WTSB) { m_SB[jsb][i] = new TGCWireTripletSB(); }
+ else if(jsb==WDSB) { m_SB[jsb][i] = new TGCWireDoubletSB(); }
+ else if(jsb==STSB) { m_SB[jsb][i] = new TGCStripTripletSB();}
+ else if(jsb==SDSB) { m_SB[jsb][i] = new TGCStripDoubletSB();}
m_SB[jsb][i]->setId(connection->getSBToHPB()->getId(jsb,i));
m_SB[jsb][i]->setType(jsb);
m_SB[jsb][i]->setRegion(m_regionType);
@@ -264,7 +264,7 @@ void TGCSector::setModule(const TGCConnectionPPToSL* connection)
for( jsb=WISB; jsb<NumberOfSlaveBoardType; jsb+=1){
m_numberOfSB[jsb] = 1;
m_SB[jsb] = new TGCSlaveBoard* [m_numberOfSB[jsb]];
- m_SB[jsb][0] = new TGCInnerSB(tgcArgs());
+ m_SB[jsb][0] = new TGCInnerSB();
m_SB[jsb][0]->setType(jsb);
m_SB[jsb][0]->setRegion(m_regionType);
m_SB[jsb][0]->setId(0);
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
index e29d1d06c8ff45272b6096045fa1bc211c75a305..690f07be0fcbd28685ecbddd7527bf89ba65c0cb 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSlaveBoard.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1TGC/TGCSlaveBoard.h"
@@ -10,13 +10,12 @@
namespace LVL1TGCTrigger {
-TGCSlaveBoard::TGCSlaveBoard( const TGCArguments* tgcargs )
- :m_lengthOfCoincidenceOut(0),m_coincidenceOut(0),
+TGCSlaveBoard::TGCSlaveBoard()
+ : m_lengthOfCoincidenceOut(0),m_coincidenceOut(0),
m_slaveBoardOut(0),
m_id(0), m_bid(-1),m_idHighPtBoard(0),
m_type(0), m_region(FORWARD),
- m_patchPanel(0), m_patchPanelOut(0),
- m_tgcArgs(tgcargs)
+ m_patchPanel(0), m_patchPanelOut(0)
{
}
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
index 7eb945aa4e056ebf532115a2fa40b877f511359c..a9b24b9b3dff1e65a031a25131f0979691f10a09 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCStripTripletSB.cxx
@@ -8,7 +8,8 @@
namespace LVL1TGCTrigger {
-TGCStripTripletSB::TGCStripTripletSB( TGCArguments* tgcargs ):TGCSlaveBoard(tgcargs)
+TGCStripTripletSB::TGCStripTripletSB()
+ : TGCSlaveBoard()
{}
void TGCStripTripletSB::createSlaveBoardOut()
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
index a355233eb3b4f2e105d1d0333152d459c7146e8d..03cc13c99dbcc31b78558ef03baf9d19c5706e78 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCWireTripletSB.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ref. SOS051V07,S0S052V06
@@ -9,7 +9,8 @@
namespace LVL1TGCTrigger {
-TGCWireTripletSB::TGCWireTripletSB( TGCArguments* tgcargs ):TGCSlaveBoard(tgcargs)
+TGCWireTripletSB::TGCWireTripletSB()
+ : TGCSlaveBoard()
{}
void TGCWireTripletSB::createSlaveBoardOut()