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

Removed boost use in DQM/SiStripMonitorHardware #30220

Merged
merged 1 commit into from
Jun 13, 2020
Merged

Removed boost use in DQM/SiStripMonitorHardware #30220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion DQM/SiStripMonitorHardware/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<use name="CommonTools/UtilAlgos"/>
<use name="EventFilter/SiStripRawToDigi"/>
<use name="DQM/SiStripCommon"/>
<use name="boost"/>
<use name="CondFormats/DataRecord"/>
<use name="DPGAnalysis/SiStripTools"/>
<use name="CommonTools/TrackerMap"/>
Expand Down
4 changes: 2 additions & 2 deletions DQM/SiStripMonitorHardware/src/SiStripFEDEmulator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "DQM/SiStripMonitorHardware/interface/SiStripFEDEmulator.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "boost/bind.hpp"
#include <functional>

using edm::LogError;
using edm::LogInfo;
Expand Down Expand Up @@ -195,7 +195,7 @@ namespace sistrip {
transform(cmSubtrDetSetData.begin(),
cmSubtrDetSetData.end(),
back_inserter(cmSubtrRawDigis),
boost::bind(&SiStripRawDigi::adc, _1));
std::bind(&SiStripRawDigi::adc, std::placeholders::_1));
algorithms->suppressor->suppress(cmSubtrRawDigis, 0, zsDetSetData);

} //end of FEDEmulator::zeroSuppress method.
Expand Down
8 changes: 4 additions & 4 deletions DQM/SiStripMonitorHardware/src/SiStripSpyEventSummaryProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
#include "DataFormats/FEDRawData/interface/FEDRawData.h"
#include "EventFilter/SiStripRawToDigi/interface/SiStripFEDBufferComponents.h"
#include <cstdint>
#include <memory>
#include <string>
#include "boost/scoped_array.hpp"
#include <cstdint>
#include <vector>

using edm::LogError;
using edm::LogInfo;
Expand Down Expand Up @@ -102,7 +102,7 @@ namespace sistrip {
pSummary->bx(fedBxNumber);
//create a fake trigger FED buffer to take comissioning parameters from
const int maxTriggerFedBufferSize = 84;
boost::scoped_array<uint32_t> fakeTriggerFedData(new uint32_t[maxTriggerFedBufferSize]);
std::vector<uint32_t> fakeTriggerFedData(maxTriggerFedBufferSize);
for (uint8_t i = 0; i < maxTriggerFedBufferSize; ++i) {
fakeTriggerFedData[i] = 0;
}
Expand All @@ -115,7 +115,7 @@ namespace sistrip {
//set the run type
fakeTriggerFedData[10] = runType_;
//fill the summarry using trigger FED buffer with no data
pSummary->commissioningInfo(fakeTriggerFedData.get(), fedEventNumber);
pSummary->commissioningInfo(fakeTriggerFedData.data(), fedEventNumber);

//store in event
event.put(std::move(pSummary));
Expand Down