Skip to content

Clean BuildFiles in OnlineDB/CSCCondDB #31912

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 3 commits into from
Nov 3, 2020
Merged

Clean BuildFiles in OnlineDB/CSCCondDB #31912

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
020627a
split library and plugins in OnlineDB/CSCCondDB package
guitargeek Oct 22, 2020
cf66a40
move the CSCCondDB plugins in the plugin directory
guitargeek Oct 22, 2020
5d7f500
remove unused SaturationFit.h header to fix header consistency
guitargeek Oct 28, 2020
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
4 changes: 3 additions & 1 deletion OnlineDB/CSCCondDB/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@
<use name="OnlineDB/Oracle"/>
<lib name="occi"/>
<lib name="Minuit2"/>
<flags EDM_PLUGIN="1"/>
<export>
<lib name="1"/>
</export>
27 changes: 0 additions & 27 deletions OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions OnlineDB/CSCCondDB/interface/CSCMap1Read.h
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions OnlineDB/CSCCondDB/interface/SaturationFit.h
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions OnlineDB/CSCCondDB/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<library file="*.cc" name="OnlineDBCSCCondDBPlugins">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="OnlineDB/CSCCondDB"/>
</library>
22 changes: 20 additions & 2 deletions .../src/CSCChamberTimeCorrectionsReadTest.cc → ...gins/CSCChamberTimeCorrectionsReadTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
#include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h"
#include <string>
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "OnlineDB/CSCCondDB/interface/CSCCableRead.h"

class CSCChamberTimeCorrectionsReadTest : public edm::EDAnalyzer {
public:
explicit CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet&);
~CSCChamberTimeCorrectionsReadTest() override;

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

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(CSCChamberTimeCorrectionsReadTest);

CSCChamberTimeCorrectionsReadTest::CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet &) {}
CSCChamberTimeCorrectionsReadTest::~CSCChamberTimeCorrectionsReadTest() {}
Expand Down
26 changes: 24 additions & 2 deletions OnlineDB/CSCCondDB/src/CSCMap1Read.cc → OnlineDB/CSCCondDB/plugins/CSCMap1Read.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
#include "OnlineDB/CSCCondDB/interface/CSCMap1Read.h"
#include <string>
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "OnlineDB/CSCCondDB/interface/CSCMap1.h"

//
// class declaration
//

class CSCMap1Read : public edm::EDAnalyzer {
public:
explicit CSCMap1Read(const edm::ParameterSet&);
~CSCMap1Read() override;

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

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(CSCMap1Read);

CSCMap1Read::CSCMap1Read(const edm::ParameterSet &) {}
CSCMap1Read::~CSCMap1Read() {}
Expand Down
5 changes: 0 additions & 5 deletions OnlineDB/CSCCondDB/src/SealModule.cc → OnlineDB/CSCCondDB/plugins/plugins.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/SourceFactory.h"
#include "OnlineDB/CSCCondDB/interface/CSCChamberMapValues.h"
#include "OnlineDB/CSCCondDB/interface/CSCChamberIndexValues.h"
#include "OnlineDB/CSCCondDB/interface/CSCCrateMapValues.h"
#include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsValues.h"
#include "OnlineDB/CSCCondDB/interface/CSCDDUMapValues.h"
#include "OnlineDB/CSCCondDB/interface/CSCMap1Read.h"
#include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h"

DEFINE_FWK_MODULE(CSCMap1Read);
DEFINE_FWK_MODULE(CSCChamberTimeCorrectionsReadTest);
DEFINE_FWK_EVENTSETUP_SOURCE(CSCChamberMapValues);
DEFINE_FWK_EVENTSETUP_SOURCE(CSCChamberIndexValues);
DEFINE_FWK_EVENTSETUP_SOURCE(CSCCrateMapValues);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<use name="CondCore/PopCon"/>
<use name="CondFormats/CSCObjects"/>
<use name="OnlineDB/Oracle"/>
<use name="OnlineDB/CSCCondDB"/>
<lib name="occi"/>
<library name="OnlineDBCSCCondDB_TestPlugins" file="../src/CSCMap1.cc,../src/CSCCableRead.cc,stubs/*.cc">
<library name="OnlineDBCSCCondDB_TestPlugins" file="stubs/*.cc">
<flags EDM_PLUGIN="1"/>
</library>