diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh index 394c970d723ec363e055b3db00bedae75527af67..3c30b51be34e89218e3634e807666453a1ee967b 100644 --- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh +++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCBIDOut.hh @@ -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;}; diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh index f98a170a895aa8f016e645d8c4fc36f8a5bbed9d..066099efe525af2c9d4ff44cc6047643d36e476f 100644 --- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh +++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCHighPtBoardOut.hh @@ -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) { diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh index ba0c872af10f6a35c4e6508c33110a6eea2ec195..3d06ddc70d3bee5ca6610eb84ca7551d33c660c6 100644 --- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh +++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCInnerTrackletSlot.hh @@ -11,7 +11,7 @@ namespace LVL1TGCTrigger { /** Constructor */ TGCInnerTrackletSlot(); /** Destructor */ - ~TGCInnerTrackletSlot() {}; + ~TGCInnerTrackletSlot() = default; void setSideId(const int sideId); int getSideId() const; diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh index 61734c01294a9b38be2a5a1ce1200560b40dcf3f..aed0a3887eedccadf0b1f7144f59fc73115a5205 100644 --- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh +++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceOut.hh @@ -12,7 +12,7 @@ class TGCRPhiCoincidenceOut { public: TGCRPhiCoincidenceOut(); - ~TGCRPhiCoincidenceOut(){}; + ~TGCRPhiCoincidenceOut() = default; int getPhi() const { return phi;}; int getR() const { return r;}; diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx index c4b5c059bee9c2f727795465413d10aac3f15795..4908e7b045dbc0cf90b37bf966411d50aeb3124c 100644 --- a/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx +++ b/Trigger/TrigT1/TrigT1TGC/src/TGCHighPtBoardOut.cxx @@ -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() {