Skip to content

Fix for PR #47067 #48247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 2 commits into from
Jun 9, 2025
Merged

Fix for PR #47067 #48247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027b6cb
missing data member initialization added and bad bit widths intercepted.
tschuh Jun 4, 2025
0fabb3e
little fix of test script, fixes of 0b TTBV constructor calls.
tschuh Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions DataFormats/L1TrackTrigger/interface/TTBV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,8 @@ class TTBV {

// check if value fits into binary BV
void checkU(unsigned long long int value) {
if (size_ == 0)
return;
if (size_ <= 0 || size_ > S_)
throwSize();
if (value < iMax())
return;
cms::Exception exception("RunTimeError.");
Expand All @@ -401,8 +401,6 @@ class TTBV {

// check if value fits into twos's complement BV
void checkT(int value) {
if (size_ == 0)
return;
static const std::array<double, S_ + 1> lut = powersOfTwo();
auto abs = [](int val) { return val < 0 ? std::abs(val) - 1 : val; };
if (abs(value) < std::round(lut[size_ - 1]))
Expand All @@ -415,8 +413,8 @@ class TTBV {

// check if value fits into twos complement / binary BV
void checkI(int value) {
if (size_ == 0)
return;
if (size_ <= 0 || size_ > S_)
throwSize();
if (twos_)
checkT(value);
else if (value < 0) {
Expand All @@ -427,6 +425,13 @@ class TTBV {
} else
checkU(value);
}

// nonsensical bitwith of smaller equal 0 or unsupported size, bigger 64, deteced
void throwSize() const {
cms::Exception exception("RunTimeError.");
exception << "TTBV constructor called with bad bit width (" << size_ << ").";
throw exception;
}
};

#endif
4 changes: 2 additions & 2 deletions L1Trigger/TrackFindingTracklet/interface/DataFormats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ namespace trklet {
// converts ntuple of variables to bits
template <typename... Ts>
void convertStub(Process p, const std::tuple<Ts...>& data, tt::Frame& bv) const {
TTBV ttBV(1, numUnusedBitsStubs_[+p]);
TTBV ttBV(1, 1 + numUnusedBitsStubs_[+p]);
attachStub(p, data, ttBV);
bv = ttBV.bs();
}
Expand All @@ -211,7 +211,7 @@ namespace trklet {
// converts ntuple of variables to bits
template <typename... Ts>
void convertTrack(Process p, const std::tuple<Ts...>& data, tt::Frame& bv) const {
TTBV ttBV(1, numUnusedBitsTracks_[+p]);
TTBV ttBV(1, 1 + numUnusedBitsTracks_[+p]);
attachTrack(p, data, ttBV);
bv = ttBV.bs();
}
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
process.load( 'L1Trigger.TrackTrigger.TrackTrigger_cff' )

from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto::phase2_realistic', '')
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')

# load code that associates stubs with mctruth
process.load( 'SimTracker.TrackTriggerAssociation.StubAssociator_cff' )
Expand Down Expand Up @@ -58,7 +58,7 @@
#from MCsamples.Scripts.getCMSlocaldata_cfi import *
#from MCsamples.RelVal_1260_D88.PU200_TTbar_14TeV_cfi import *
#inputMC = getCMSdataFromCards()
Samples = [""]
Samples = ["/store/mc/Phase2Spring24DIGIRECOMiniAOD/TT_TuneCP5_14TeV-powheg-pythia8/GEN-SIM-DIGI-RAW-MINIAOD/PU200_Trk1GeV_140X_mcRun4_realistic_v4-v2/130000/00c7f40e-b44e-4eea-a86b-def8f7d82b0e.root"]
options.register( 'inputMC', Samples, VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Files to be processed" )
# specify number of events to process.
options.register( 'Events',100,VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "Number of Events to analyze" )
Expand Down
1 change: 1 addition & 0 deletions L1Trigger/TrackTrigger/plugins/ProducerSetup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ namespace tt {
iConfig_.tbWidthsR_ = pSetHybrid.getParameter<std::vector<int>>("WidthsRTB");
const edm::ParameterSet& pSetFW = iConfig.getParameter<edm::ParameterSet>("Firmware");
iConfig_.enableTruncation_ = pSetFW.getParameter<bool>("EnableTruncation");
iConfig_.useHybrid_ = pSetFW.getParameter<bool>("UseHybrid");
iConfig_.widthDSPa_ = pSetFW.getParameter<int>("WidthDSPa");
iConfig_.widthDSPb_ = pSetFW.getParameter<int>("WidthDSPb");
iConfig_.widthDSPc_ = pSetFW.getParameter<int>("WidthDSPc");
Expand Down
1 change: 1 addition & 0 deletions L1Trigger/TrackTrigger/src/Setup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ namespace tt {
tbWidthsR_(iConfig.tbWidthsR_),
// Fimrware specific Parameter
enableTruncation_(iConfig.enableTruncation_),
useHybrid_(iConfig.useHybrid_),
widthDSPa_(iConfig.widthDSPa_),
widthDSPb_(iConfig.widthDSPb_),
widthDSPc_(iConfig.widthDSPc_),
Expand Down
21 changes: 11 additions & 10 deletions L1Trigger/TrackerDTC/src/Stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,17 +149,18 @@ namespace trackerDTC {
double phi = phi_ - (region - .5) * setup_->baseRegion() + setup_->hybridRangePhi() / 2.;
// convert stub variables into bit vectors
const bool twosR = type == tt::SensorModule::BarrelPS || type == tt::SensorModule::Barrel2S;
const TTBV hwR(r_, setup_->hybridBaseR(type), setup_->hybridWidthR(type), twosR);
const TTBV hwPhi(phi, setup_->hybridBasePhi(type), setup_->hybridWidthPhi(type));
const TTBV hwZ(z_, setup_->hybridBaseZ(type), setup_->hybridWidthZ(type), true);
const TTBV hwAlpha(row_, setup_->hybridBaseAlpha(type), setup_->hybridWidthAlpha(type), true);
const TTBV hwBend(bend_, setup_->hybridWidthBend(type), true);
const TTBV hwLayer(decodedLayerId, setup_->hybridWidthLayerId());
const TTBV hwGap(0, setup_->hybridNumUnusedBits(type));
const TTBV hwValid(1, 1);
const bool noAlpha = type != tt::SensorModule::Disk2S;
const std::string hwR = TTBV(r_, setup_->hybridBaseR(type), setup_->hybridWidthR(type), twosR).str();
const std::string hwPhi = TTBV(phi, setup_->hybridBasePhi(type), setup_->hybridWidthPhi(type)).str();
const std::string hwZ = TTBV(z_, setup_->hybridBaseZ(type), setup_->hybridWidthZ(type), true).str();
const std::string hwAlpha =
noAlpha ? "" : TTBV(row_, setup_->hybridBaseAlpha(type), setup_->hybridWidthAlpha(type), true).str();
const std::string hwBend = TTBV(bend_, setup_->hybridWidthBend(type), true).str();
const std::string hwLayer = TTBV(decodedLayerId, setup_->hybridWidthLayerId()).str();
const std::string hwGap = TTBV(0, setup_->hybridNumUnusedBits(type)).str();
const std::string hwValid = TTBV(1, 1).str();
// assemble final bitset
return tt::Frame(hwGap.str() + hwR.str() + hwZ.str() + hwPhi.str() + hwAlpha.str() + hwBend.str() + hwLayer.str() +
hwValid.str());
return tt::Frame(hwGap + hwR + hwZ + hwPhi + hwAlpha + hwBend + hwLayer + hwValid);
}

tt::Frame Stub::formatTMTT(int region) const {
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/TrackerTFP/interface/DataFormats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ namespace trackerTFP {
// converts ntuple of variables to bits
template <typename... Ts>
void convertStub(Process p, const std::tuple<Ts...>& data, tt::Frame& bv) const {
TTBV ttBV(1, numUnusedBitsStubs_[+p]);
TTBV ttBV(1, 1 + numUnusedBitsStubs_[+p]);
attachStub(p, data, ttBV);
bv = ttBV.bs();
}
Expand All @@ -330,7 +330,7 @@ namespace trackerTFP {
// converts ntuple of variables to bits
template <typename... Ts>
void convertTrack(Process p, const std::tuple<Ts...>& data, tt::Frame& bv) const {
TTBV ttBV(1, numUnusedBitsTracks_[+p]);
TTBV ttBV(1, 1 + numUnusedBitsTracks_[+p]);
attachTrack(p, data, ttBV);
bv = ttBV.bs();
}
Expand Down