Skip to content
Snippets Groups Projects
Commit acd2c187 authored by Scott Snyder's avatar Scott Snyder Committed by scott snyder
Browse files

TrigT1TGC: Fix gcc9 warnings.

In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment.  gcc9 now warns
about this by default.
Adjust to avoid the warning.

Remove some unused code.
parent 955f8e83
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,7 @@ public:
TGCBIDOut();
TGCBIDOut(const TGCASDOut* ASDOut);
virtual ~TGCBIDOut(){};
virtual ~TGCBIDOut() = default;
void setBid(int bidIn){ bid=bidIn;};
int getBid() const { return bid;};
......
......@@ -28,22 +28,19 @@ class TGCHighPtBoardOut {
public:
TGCHighPtBoardOut(TGCHighPtBoard* hpt, int bidIn);
TGCHighPtBoardOut();
virtual ~TGCHighPtBoardOut();
virtual ~TGCHighPtBoardOut() = default;
int getPt(int chip, int iData) const;
int getPos(int chip, int iData) const;
int getDev(int chip, int iData) const;
bool getHit(int chip, int iData) const;
int getSel(int chip, int iData) const;
TGCHitPattern* getbPos(TGCHBChip chip, TGCHPBBlock block);
void setPt(int chip, int iData, int ptIn);
void setPos(int chip, int iData, int posIn);
void setDev(int chip, int iData, int devIn);
void setHit(int chip, int iData, bool hitIn);
void setSel(int chip, int iData, int selIn);
void setbDev(TGCHBChip chip, TGCHPBBlock block, int sign, int dr);
void setbPos(TGCHBChip chip, TGCHPBBlock block, int pos);
int getBid() const;
void setBid(int bidIn){ bid=bidIn;};
......@@ -60,25 +57,11 @@ private:
int pt[NumberOfChip][MaxNumberOfHPBData]; //[chip][block]
int pos[NumberOfChip][MaxNumberOfHPBData];
int dev[NumberOfChip][MaxNumberOfHPBData];
TGCHitPattern* bpos[NumberOfChip][MaxNumberOfHPBData];
TGCHitPattern* bdev[NumberOfChip][MaxNumberOfHPBData];
bool hit[NumberOfChip][MaxNumberOfHPBData];
// enable when the track is selected in trackselector.
int select[NumberOfChip][MaxNumberOfHPBData];
};
inline
TGCHitPattern* TGCHighPtBoardOut::getbPos(TGCHBChip chip, TGCHPBBlock block)
{
return bpos[chip][block];
}
inline
void TGCHighPtBoardOut::setbPos(TGCHBChip chip, TGCHPBBlock block, int pos)
{
bpos[chip][block]->dec2bin(pos);
}
inline
void TGCHighPtBoardOut::setDev(int chip, int iData, int devIn)
{
......
......@@ -11,7 +11,7 @@ namespace LVL1TGCTrigger {
/** Constructor */
TGCInnerTrackletSlot();
/** Destructor */
~TGCInnerTrackletSlot() {};
~TGCInnerTrackletSlot() = default;
void setSideId(const int sideId);
int getSideId() const;
......
......@@ -12,7 +12,7 @@ class TGCRPhiCoincidenceOut {
public:
TGCRPhiCoincidenceOut();
~TGCRPhiCoincidenceOut(){};
~TGCRPhiCoincidenceOut() = default;
int getPhi() const { return phi;};
int getR() const { return r;};
......
......@@ -9,67 +9,12 @@ namespace LVL1TGCTrigger {
TGCHighPtBoardOut::TGCHighPtBoardOut(TGCHighPtBoard* hpt, int bidIn):
origin(hpt), bid(bidIn)
{
TGCHBChip chip;
TGCHPBBlock block;
for(chip = ChipA; chip < TotalNumTGCHBChip; chip++){
for(block = HPBBlockA; block < TotalNumTGCHPBBlock; block++){
bpos[chip][block] = 0;
bdev[chip][block] = 0;
}
}
}
TGCHighPtBoardOut::TGCHighPtBoardOut():
origin(0), bid(-1)
{
TGCHBChip chip;
TGCHPBBlock block;
for(chip = ChipA; chip < TotalNumTGCHBChip; chip++){
for(block = HPBBlockA; block < TotalNumTGCHPBBlock; block++){
bpos[chip][block] = 0;
bdev[chip][block] = 0;
}
}
}
TGCHighPtBoardOut::~TGCHighPtBoardOut()
{
TGCHBChip chip;
TGCHPBBlock block;
origin=0;
for(chip = ChipA; chip < TotalNumTGCHBChip; chip++){
for(block = HPBBlockA; block < TotalNumTGCHPBBlock; block++){
if(bpos[chip][block]){
delete bpos[chip][block];
bpos[chip][block] = 0;
}
if(bdev[chip][block]){
delete bdev[chip][block];
bdev[chip][block] = 0;
}
}
}
}
void TGCHighPtBoardOut::setbDev(TGCHBChip chip, TGCHPBBlock block, int sign, int dr)
{
TGCHitPattern tmp(3);
tmp.dec2bin(dr);
tmp.printb();
std::cout << ":" << dr << " TGCSlaveBoardOut::setbDev" << std::endl;
if(0 <= sign*dr){
bdev[chip][block]->setChannel(0, true);
}else{
bdev[chip][block]->setChannel(0, false);
}
bdev[chip][block]->push_back(&tmp);
bdev[chip][block]->printb();
std::cout << std::endl;
}
void TGCHighPtBoardOut::clear()
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment