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

[DAQ] Changes suggested by new llvm18 clang-format #45903

Merged
merged 1 commit into from
Sep 6, 2024
Merged

[DAQ] Changes suggested by new llvm18 clang-format #45903

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
6 changes: 3 additions & 3 deletions EventFilter/ESDigiToRaw/interface/ESDataFormatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ESDataFormatter {
int kchip_ec = 0;
Meta_Data() = default;
Meta_Data(int r, int o, int b, int l, int k_bc, int k_ec)
: run_number(r), orbit_number(o), bx(b), lv1(l), kchip_bc(k_bc), kchip_ec(k_ec){};
: run_number(r), orbit_number(o), bx(b), lv1(l), kchip_bc(k_bc), kchip_ec(k_ec) {}
};

typedef std::vector<ESDataFrame> DetDigis;
Expand All @@ -39,8 +39,8 @@ class ESDataFormatter {
: pset_(ps),
trgtype_(0),
debug_(pset_.getUntrackedParameter<bool>("debugMode", false)),
printInHex_(pset_.getUntrackedParameter<bool>("printInHex", false)){};
virtual ~ESDataFormatter(){};
printInHex_(pset_.getUntrackedParameter<bool>("printInHex", false)) {}
virtual ~ESDataFormatter() {}

virtual void DigiToRaw(int fedId, Digis& digis, FEDRawData& fedRawData, const Meta_Data& meta_data) const = 0;

Expand Down
2 changes: 1 addition & 1 deletion EventFilter/EcalDigiToRaw/src/BlockFormatter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void BlockFormatter::DigiToRaw(FEDRawDataCollection* productRawData) {
}

} // endif rawdatasize == 0
} // loop on id
} // loop on id
}

void BlockFormatter::print(FEDRawData& rawdata) {
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/L1ScoutingRawToDigi/plugins/ScBMTFRawToDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ScBMTFRawToDigi::ScBMTFRawToDigi(const edm::ParameterSet& iConfig) {
rawToken_ = consumes<SDSRawDataCollection>(srcInputTag_);
}

ScBMTFRawToDigi::~ScBMTFRawToDigi(){};
ScBMTFRawToDigi::~ScBMTFRawToDigi() {}

void ScBMTFRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ScCaloRawToDigi::ScCaloRawToDigi(const edm::ParameterSet& iConfig) {
produces<BxSumsOrbitCollection>("EtSum").setBranchAlias("BxSumsOrbitCollection");
}

ScCaloRawToDigi::~ScCaloRawToDigi(){};
ScCaloRawToDigi::~ScCaloRawToDigi() {}

void ScCaloRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ScGMTRawToDigi::ScGMTRawToDigi(const edm::ParameterSet& iConfig) {
rawToken = consumes<SDSRawDataCollection>(srcInputTag);
}

ScGMTRawToDigi::~ScGMTRawToDigi(){};
ScGMTRawToDigi::~ScGMTRawToDigi() {}

void ScGMTRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
using namespace edm;
Expand Down
4 changes: 2 additions & 2 deletions EventFilter/RawDataCollector/interface/RawDataFEDSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ class FEDRawDataCollection;
class RawDataFEDSelector {
public:
/// Constructor
RawDataFEDSelector(){};
RawDataFEDSelector() {}

/// Destructor
virtual ~RawDataFEDSelector(){};
virtual ~RawDataFEDSelector() {}

inline void setRange(const std::pair<int, int>& range) { fedRange = range; };
inline void setRange(const std::vector<int>& list) { fedList = list; };
Expand Down
8 changes: 4 additions & 4 deletions EventFilter/Utilities/interface/DAQSourceModelsFRD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class FEDRawDataCollection;
class DataModeFRD : public DataMode {
public:
DataModeFRD(DAQSource* daqSource) : DataMode(daqSource) {}
~DataModeFRD() override{};
~DataModeFRD() override {}
std::vector<std::shared_ptr<const edm::DaqProvenanceHelper>>& makeDaqProvenanceHelpers() override;
void readEvent(edm::EventPrincipal& eventPrincipal) override;

Expand Down Expand Up @@ -57,7 +57,7 @@ class DataModeFRD : public DataMode {
bool fitToBuffer() const override { return false; }
bool dataBlockInitialized() const override { return true; }

void setDataBlockInitialized(bool) override{};
void setDataBlockInitialized(bool) override {}

void setTCDSSearchRange(uint16_t MINTCDSuTCAFEDID, uint16_t MAXTCDSuTCAFEDID) override {
MINTCDSuTCAFEDID_ = MINTCDSuTCAFEDID;
Expand Down Expand Up @@ -94,7 +94,7 @@ class DataModeFRD : public DataMode {
class DataModeFRDStriped : public DataMode {
public:
DataModeFRDStriped(DAQSource* daqSource) : DataMode(daqSource) {}
~DataModeFRDStriped() override{};
~DataModeFRDStriped() override {}
std::vector<std::shared_ptr<const edm::DaqProvenanceHelper>>& makeDaqProvenanceHelpers() override;
void readEvent(edm::EventPrincipal& eventPrincipal) override;

Expand Down Expand Up @@ -166,7 +166,7 @@ class DataModeFRDStriped : public DataMode {

bool dataBlockInitialized() const override { return dataBlockInitialized_; }

void setDataBlockInitialized(bool val) override { dataBlockInitialized_ = val; };
void setDataBlockInitialized(bool val) override { dataBlockInitialized_ = val; }

void setTCDSSearchRange(uint16_t MINTCDSuTCAFEDID, uint16_t MAXTCDSuTCAFEDID) override {
MINTCDSuTCAFEDID_ = MINTCDSuTCAFEDID;
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/interface/DAQSourceModelsScoutingRun3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class DataModeScoutingRun3 : public DataMode {
public:
DataModeScoutingRun3(DAQSource* daqSource) : DataMode(daqSource) {}
~DataModeScoutingRun3() override{};
~DataModeScoutingRun3() override {}
std::vector<std::shared_ptr<const edm::DaqProvenanceHelper>>& makeDaqProvenanceHelpers() override;
void readEvent(edm::EventPrincipal& eventPrincipal) override;

Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/interface/JsonSerializable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace jsoncollector {
class JsonSerializable {
public:
virtual ~JsonSerializable(){};
virtual ~JsonSerializable() {}
virtual void serialize(Json::Value& root) const = 0;
virtual void deserialize(Json::Value& root) = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/plugins/FRDStreamSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class FRDStreamSource : public edm::ProducerSourceFromFiles {
public:
// construction/destruction
FRDStreamSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc);
~FRDStreamSource() override{};
~FRDStreamSource() override {}

private:
// member functions
Expand Down
4 changes: 2 additions & 2 deletions IORawData/CSCCommissioning/src/CSCFileDumper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class CSCFileDumper : public edm::one::EDAnalyzer<> {
CSCFileDumper(edm::ParameterSet const& pset);
~CSCFileDumper(void) override;

void beginJob() override{};
void beginJob() override {}
void analyze(const edm::Event& e, const edm::EventSetup& c) override;
void endJob() override{};
void endJob() override {}

private:
std::vector<unsigned int> cscFEDids;
Expand Down
2 changes: 1 addition & 1 deletion L1TriggerScouting/Utilities/plugins/DumpScObjects.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class DumpScObjects : public edm::stream::EDAnalyzer<> {
public:
// constructor and destructor
explicit DumpScObjects(const edm::ParameterSet&);
~DumpScObjects() override{};
~DumpScObjects() override {}

// method for analyzing the events
void analyze(const edm::Event&, const edm::EventSetup&) override;
Expand Down