Skip to content
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

Jump to bottom

BMTF fixes for the AlgoSelector and the Unpacker #24652

Merged
merged 3 commits into from Sep 26, 2018
Merged

BMTF fixes for the AlgoSelector and the Unpacker #24652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9fba38
Fixed BMTFAlgoSelector's segFault Issue - introduced default config (…
panoskatsoulis Sep 25, 2018
e3b15bf
fixed floating 'isKalman' variable in one BMTFUnpacker Constructor
panoskatsoulis Sep 25, 2018
d5667be
Comments' cosmetics
panoskatsoulis Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 32 additions & 17 deletions DQM/L1TMonitor/plugins/L1TBMTFAlgoSelector.cc
View file
Open in desktop
Expand Up @@ -23,19 +23,47 @@ dqmBmtfAlgoSelector::L1TBMTFAlgoSelector::~L1TBMTFAlgoSelector() {
void dqmBmtfAlgoSelector::L1TBMTFAlgoSelector::produce(edm::Event & eve, const edm::EventSetup & eveSetup)
{

//Declare the Handlers
edm::Handle<FEDRawDataCollection> feds;
eve.getByToken(fedToken, feds);
edm::Handle<l1t::RegionalMuonCandBxCollection> bmtfKalman;
eve.getByToken(bmtfKalmanToken, bmtfKalman);
edm::Handle<l1t::RegionalMuonCandBxCollection> bmtfLegacy;
eve.getByToken(bmtfLegacyToken, bmtfLegacy);


//----> Make RegMuonCand Copies
auto *bmtfKalman_copy = new l1t::RegionalMuonCandBxCollection(*bmtfKalman);
auto *bmtfLegacy_copy = new l1t::RegionalMuonCandBxCollection(*bmtfLegacy);
edm::LogInfo("L1TDQM") << "copy RegionalMuonCandBxCollections created";
edm::LogInfo("L1TDQM") << "bmtfKalman_copy address: " << bmtfKalman_copy;
edm::LogInfo("L1TDQM") << "bmtfLegacy_copy address: " << bmtfLegacy_copy;

//Get the fw-ver

//-----> Get the fw-ver
int nonEmptyFed=0;
if (feds->FEDData(1376).size() > 0)
nonEmptyFed = 1376;
else if (feds->FEDData(1377).size() > 0)
nonEmptyFed = 1377;
else {
edm::LogError("L1TDQM") << "[L1TBMTFAlgoSelector] Both BMTF feds (1376, 1377) seem empty.";
// return;
edm::LogError("L1TDQM") << "[L1TBMTFAlgoSelector] Both BMTF feds (1376, 1377) seem empty."
<< "Using Default Configuration."
<< "Will be wrong if this is Kalman triggering and ZS is enabled";
//Define the default configuration
std::unique_ptr<l1t::RegionalMuonCandBxCollection> bmtfTriggering, bmtfSecondary;
bmtfTriggering.reset(bmtfLegacy_copy);
bmtfSecondary.reset(bmtfKalman_copy);
//Print in log the addresses
edm::LogInfo("L1TDQM") << "Triggering and Secondary pointers filled:";
edm::LogInfo("L1TDQM") << "bmtfTriggering address: " << bmtfTriggering.get();
edm::LogInfo("L1TDQM") << "bmtfSecondary address: " << bmtfSecondary.get();
//Produce the products
eve.put(std::move(bmtfTriggering),"BMTF");
eve.put(std::move(bmtfSecondary),"BMTF2");
return;
}

const FEDRawData& l1tRcd = feds->FEDData(nonEmptyFed);;
edm::LogInfo("L1TDQM") << "L1T Rcd taken from the FEDData.";
edm::LogInfo("L1TDQM") << "l1tRcd.size=" << l1tRcd.size() << " for fed:" << nonEmptyFed;
Expand Down Expand Up @@ -70,21 +98,8 @@ void dqmBmtfAlgoSelector::L1TBMTFAlgoSelector::produce(edm::Event & eve, const e
return;
}

std::cout << "algo-rev obtained: " << algo_ver << std::endl;

// Make the Decision which Algo Triggers
edm::Handle<l1t::RegionalMuonCandBxCollection> bmtfKalman;
eve.getByToken(bmtfKalmanToken, bmtfKalman);
edm::Handle<l1t::RegionalMuonCandBxCollection> bmtfLegacy;
eve.getByToken(bmtfLegacyToken, bmtfLegacy);

auto *bmtfKalman_copy = new l1t::RegionalMuonCandBxCollection(*bmtfKalman);
auto *bmtfLegacy_copy = new l1t::RegionalMuonCandBxCollection(*bmtfLegacy);

edm::LogInfo("L1TDQM") << "copy RegionalMuonCandBxCollections created";
edm::LogInfo("L1TDQM") << "bmtfKalman_copy address: " << bmtfKalman_copy;
edm::LogInfo("L1TDQM") << "bmtfLegacy_copy address: " << bmtfLegacy_copy;

//----->Make the Decision which Algo Triggers
std::unique_ptr<l1t::RegionalMuonCandBxCollection> bmtfTriggering, bmtfSecondary;
if ( algo_ver >= 2499805536) {//95000160(hex)
// kalman triggers
Expand Down
8 changes: 4 additions & 4 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.h
View file
Open in desktop
Expand Up @@ -9,15 +9,15 @@ namespace l1t{
class BMTFUnpackerOutput : public Unpacker
{
public:
//the default constructor assumes
//that unpacks BMTF and BMTF is triggering
//the constructors assume that unpacks
//BMTF and BMTF is triggering (except assigned differently)
BMTFUnpackerOutput() {
isKalman = false;
isTriggeringAlgo = true;
}
BMTFUnpackerOutput(const bool isTriggering_/*, const bool isKalman_*/) {
BMTFUnpackerOutput(const bool isTriggering_) {
isKalman = false;
isTriggeringAlgo = isTriggering_;
//isKalman = isKalman_;
}
~BMTFUnpackerOutput() override{};
bool unpack(const Block& block, UnpackerCollections *coll) override;
Expand Down