Skip to content

Commit

Permalink
code format
Browse files Browse the repository at this point in the history
  • Loading branch information
Sven Dildick committed May 10, 2020
1 parent aa52937 commit ce7fc64
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
4 changes: 2 additions & 2 deletions DQM/L1TMonitor/src/L1TCSCTF.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1022,8 +1022,8 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c) {

gblphidat gblPhi;
try {
gblPhi =
srLUTs_[fpga][EndCapLUT][sector]->globalPhiME(lclPhi.phi_local, lct->keyWireGroup(), cscId + 1, gangedME11a_);
gblPhi = srLUTs_[fpga][EndCapLUT][sector]->globalPhiME(
lclPhi.phi_local, lct->keyWireGroup(), cscId + 1, gangedME11a_);
} catch (cms::Exception&) {
bzero(&gblPhi, sizeof(gblPhi));
}
Expand Down
5 changes: 3 additions & 2 deletions EventFilter/CSCRawToDigi/src/CSCComparatorData.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ bool CSCComparatorData::debug = false;
std::atomic<bool> CSCComparatorData::debug{false};
#endif

CSCComparatorData::CSCComparatorData(const CSCTMBHeader* tmbHeader) : ncfebs_(tmbHeader->NCFEBs()), ntbins_(tmbHeader->NTBins()) {
CSCComparatorData::CSCComparatorData(const CSCTMBHeader* tmbHeader)
: ncfebs_(tmbHeader->NCFEBs()), ntbins_(tmbHeader->NTBins()) {
if (tmbHeader != nullptr)
theFirmwareVersion = tmbHeader->FirmwareVersion();
else
Expand Down Expand Up @@ -147,7 +148,7 @@ std::vector<CSCComparatorDigi> CSCComparatorData::comparatorDigis(uint32_t idlay

if (debug)
LogTrace("CSCComparatorData|CSCRawToDigi") << "fillComparatorOutputs: cfeb_corr = " << cfeb_corr
<< " distrip_corr = " << distrip_corr << " strip = " << strip;
<< " distrip_corr = " << distrip_corr << " strip = " << strip;

if (doStripSwapping && ((me1a && zplus) || (me1b && !zplus))) {
// Half-strips need to be flipped too.
Expand Down
3 changes: 2 additions & 1 deletion EventFilter/CSCRawToDigi/src/CSCTMBData.cc
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ int CSCTMBData::UnpackTMB(const uint16_t* buf) {
int currentPosition = theTMBHeader.sizeInWords();
int theFirmwareVersion = theTMBHeader.FirmwareVersion();

theComparatorData = CSCComparatorData(theTMBHeader.NCFEBs(), theTMBHeader.NTBins(), buf + e0bLine + 1, theFirmwareVersion);
theComparatorData =
CSCComparatorData(theTMBHeader.NCFEBs(), theTMBHeader.NTBins(), buf + e0bLine + 1, theFirmwareVersion);

if (!theComparatorData.check()) {
LogTrace("CSCTMBData|CSCRawToDigi") << "+++ CSCTMBData warning: Bad CLCT data";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,6 @@ CSCCLCTDigi CSCCathodeLCTProcessor::getBestCLCT(int bx) const {
return lct;
}


CSCCLCTDigi CSCCathodeLCTProcessor::getSecondCLCT(int bx) const {
CSCCLCTDigi lct = CLCTContainer_[bx][1];
lct.setBX(lct.bx() + alctClctOffset_);
Expand Down
11 changes: 5 additions & 6 deletions L1Trigger/L1TNtuples/src/L1AnalysisCSCTF.cc
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,7 @@ void L1Analysis::L1AnalysisCSCTF::SetLCTs(const edm::Handle<CSCCorrelatedLCTDigi
*/
try {
csctf_.lctstripNum.push_back(lct->strip());
lclPhi =
srLUTs_[FPGALct][endcap]->localPhi(lct->strip(), lct->pattern(), lct->quality(), lct->bend());
lclPhi = srLUTs_[FPGALct][endcap]->localPhi(lct->strip(), lct->pattern(), lct->quality(), lct->bend());

csctf_.lctlocalPhi.push_back(lclPhi.phi_local);
//csctf_.lctlocalPhi_bend.push_back(lclPhi.phi_bend_local);
Expand Down Expand Up @@ -324,8 +323,8 @@ void L1Analysis::L1AnalysisCSCTF::SetLCTs(const edm::Handle<CSCCorrelatedLCTDigi
gbletadat gblEta;

try {
gblEta =
srLUTs_[FPGALct][endcap]->globalEtaME(lclPhi.phi_bend_local, lclPhi.phi_local, lct->keyWireGroup(), CscIdLct);
gblEta = srLUTs_[FPGALct][endcap]->globalEtaME(
lclPhi.phi_bend_local, lclPhi.phi_local, lct->keyWireGroup(), CscIdLct);
//std::cout <<"gblEta: lclPhi.phi_bend_local = " << lclPhi.phi_bend_local << std::endl;
csctf_.lctglobalEta.push_back(gblEta.global_eta);
csctf_.lctCLCT_pattern.push_back(gblEta.global_bend);
Expand Down Expand Up @@ -367,8 +366,8 @@ void L1Analysis::L1AnalysisCSCTF::SetDTStubs(const edm::Handle<CSCTriggerContain
//iterate through DT Stubs
for (std::vector<csctf::TrackStub>::const_iterator stub = vstubs.begin(); stub != vstubs.end(); stub++) {
csctf_.dtBXN.push_back(stub->bx());
csctf_.dtFLAG.push_back(stub->strip()); //strip() is actually the "FLAG" bit
csctf_.dtCAL.push_back(stub->keyWireGroup()); //keyWireGroup() is actually the "CAL" bit
csctf_.dtFLAG.push_back(stub->strip()); //strip() is actually the "FLAG" bit
csctf_.dtCAL.push_back(stub->keyWireGroup()); //keyWireGroup() is actually the "CAL" bit

csctf_.dtSector.push_back(6 * (stub->endcap() - 1) + stub->sector());
csctf_.dtSubSector.push_back(stub->subsector());
Expand Down
6 changes: 2 additions & 4 deletions RecoLocalMuon/CSCValidation/src/CSCValidation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3145,8 +3145,7 @@ void CSCValidation::doTimeMonitoring(edm::Handle<CSCRecHit2DCollection> recHits,
if ((*digiIt).isValid()) {
n_alcts++;
histos->fill1DHist((*digiIt).bx(), "ALCT_bx", "ALCT.bx()", 11, -0.5, 10.5, "TimeMonitoring");
histos->fill1DHist(
(*digiIt).fullBX(), "ALCT_fullBX", "ALCT.fullBX()", 3601, -0.5, 3600.5, "TimeMonitoring");
histos->fill1DHist((*digiIt).fullBX(), "ALCT_fullBX", "ALCT.fullBX()", 3601, -0.5, 3600.5, "TimeMonitoring");
//if we don't already have digi information stored for this chamber, then we fill it
if (ALCT_KeyWG_map.find(idALCT.chamberId()) == ALCT_KeyWG_map.end()) {
ALCT_KeyWG_map[idALCT.chamberId()] = (*digiIt).keyWireGroup();
Expand All @@ -3169,8 +3168,7 @@ void CSCValidation::doTimeMonitoring(edm::Handle<CSCRecHit2DCollection> recHits,
if ((*digiIt).isValid()) {
n_clcts++;
histos->fill1DHist((*digiIt).bx(), "CLCT_getBX", "CLCT.getBX()", 11, -0.5, 10.5, "TimeMonitoring");
histos->fill1DHist(
(*digiIt).fullBX(), "CLCT_fullBX", "CLCT.fullBX()", 3601, -0.5, 3600.5, "TimeMonitoring");
histos->fill1DHist((*digiIt).fullBX(), "CLCT_fullBX", "CLCT.fullBX()", 3601, -0.5, 3600.5, "TimeMonitoring");
//if we don't already have digi information stored for this chamber, then we fill it
if (CLCT_getFullBx_map.find(idCLCT.chamberId()) == CLCT_getFullBx_map.end()) {
CLCT_getFullBx_map[idCLCT.chamberId()] = (*digiIt).fullBX();
Expand Down

0 comments on commit ce7fc64

Please sign in to comment.