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

DQM: Remove ClientConfig package #28380

Merged
merged 12 commits into from
Feb 10, 2020
Merged

DQM: Remove ClientConfig package #28380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6a8e043
Stub out SiStripCommissioningClients SummaryPlotXmlParser
schneiml Oct 29, 2019
2f9fd60
Stub out xml stuff in SiPixelMonitorClient.
schneiml Oct 29, 2019
df7ed05
Stub out xml stuff in SiStripMonitorClient.
schneiml Oct 29, 2019
b585d48
Implement SiPixel config reading.
schneiml Nov 4, 2019
2de4a60
Implement SiStripConfigParser.
schneiml Nov 5, 2019
8cf92e5
Remove DQMServices/ClientConfig.
schneiml Nov 12, 2019
609f675
Code-format.
schneiml Dec 10, 2019
2517c51
Add assertions to stubbed out code paths.
schneiml Nov 12, 2019
55a5dac
Remove mentions of ClientConfig in BuildFiles.
schneiml Nov 29, 2019
6fee490
Inline genericClientPSetHelper in Validation/RPCRecHits
schneiml Dec 10, 2019
b1c0af6
Changes by @rgerosa to SiStripCommissioningClients
schneiml Feb 5, 2020
68beb45
Code-format && code-checks.
schneiml Feb 5, 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
1 change: 0 additions & 1 deletion DQM/SiPixelMonitorClient/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="DQMServices/Core"/>
<use name="DQMServices/Components"/>
<use name="DQMServices/ClientConfig"/>
<use name="CommonTools/TrackerMap"/>
<use name="DQM/SiPixelCommon"/>
<use name="DQM/SiStripCommon"/>
Expand Down
10 changes: 6 additions & 4 deletions DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@
* \author Petra Merkel
*/

#include "DQMServices/ClientConfig/interface/DQMParserBase.h"
#include <fstream>
#include <map>
#include <string>
#include <vector>

class SiPixelConfigParser : public DQMParserBase {
#include <boost/property_tree/xml_parser.hpp>
#include <boost/property_tree/ptree.hpp>

class SiPixelConfigParser {
public:
// Constructor
SiPixelConfigParser();

// Destructor
~SiPixelConfigParser() override;
void getDocument(std::string filename);

// get List of MEs for TrackerMap
bool getMENamesForTrackerMap(std::string &tkmap_name, std::vector<std::string> &me_names);
Expand All @@ -40,6 +41,7 @@ class SiPixelConfigParser : public DQMParserBase {
bool getCalibType(int &u_freq);

private:
boost::property_tree::ptree config_;
};

#endif
6 changes: 1 addition & 5 deletions DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,16 @@
* \author Suchandra Dutta
*/

#include "DQMServices/ClientConfig/interface/DQMParserBase.h"
#include <fstream>
#include <map>
#include <string>
#include <vector>

class SiPixelLayoutParser : public DQMParserBase {
class SiPixelLayoutParser {
public:
// Constructor
SiPixelLayoutParser();

// Destructor
~SiPixelLayoutParser() override;

// Get list of Layouts for ME groups
bool getAllLayouts(std::map<std::string, std::vector<std::string>> &me_names);

Expand Down
Loading