Skip to content

Commit d991695

Browse files
mmusichmmusich
committed
add labels to SiPixelFakeLorentzAngleESSource and SiPixelLorentzAngleReader
1 parent 4095d81 commit d991695

File tree

5 files changed

+59
-24
lines changed

5 files changed

+59
-24
lines changed

‎CalibTracker/SiPixelESProducers/interface/SiPixelFakeLorentzAngleESSource.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ class SiPixelFakeLorentzAngleESSource : public edm::ESProducer, public edm::Even
4949
int HVgroup(int panel, int module);
5050

5151
// data members
52-
edm::FileInPath fp_;
53-
edm::FileInPath t_topo_fp_;
52+
const edm::FileInPath fp_;
53+
const edm::FileInPath t_topo_fp_;
54+
const std::string myLabel_;
5455
typedef std::vector<edm::ParameterSet> Parameters;
5556
Parameters BPixParameters_;
5657
Parameters FPixParameters_;

‎CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@
3434
SiPixelFakeLorentzAngleESSource::SiPixelFakeLorentzAngleESSource(const edm::ParameterSet& conf_)
3535
: fp_(conf_.getParameter<edm::FileInPath>("file")),
3636
t_topo_fp_(conf_.getParameter<edm::FileInPath>("topologyInput")),
37+
myLabel_(conf_.getParameter<std::string>("label")),
3738
BPixParameters_(conf_.getParameter<Parameters>("BPixParameters")),
3839
FPixParameters_(conf_.getParameter<Parameters>("FPixParameters")),
3940
ModuleParameters_(conf_.getParameter<Parameters>("ModuleParameters")),
4041
bPixLorentzAnglePerTesla_((float)conf_.getUntrackedParameter<double>("bPixLorentzAnglePerTesla", -9999.)),
4142
fPixLorentzAnglePerTesla_((float)conf_.getUntrackedParameter<double>("fPixLorentzAnglePerTesla", -9999.)) {
4243
edm::LogInfo("SiPixelFakeLorentzAngleESSource::SiPixelFakeLorentzAngleESSource");
4344
// the following line is needed to tell the framework what data is being produced
44-
setWhatProduced(this);
45+
setWhatProduced(this, myLabel_);
4546
findingRecord<SiPixelLorentzAngleRcd>();
4647
}
4748

@@ -239,11 +240,15 @@ void SiPixelFakeLorentzAngleESSource::fillDescriptions(edm::ConfigurationDescrip
239240
desc.setComment("ESSource to supply per-module SiPixelLorentzAngle payloads in the EventSetup");
240241

241242
desc.add<edm::FileInPath>(
242-
"file", edm::FileInPath("SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt"));
243+
"file", edm::FileInPath("SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt"))
244+
->setComment("Tracker skimmed geometry");
243245
desc.add<edm::FileInPath>("topologyInput",
244-
edm::FileInPath("Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml"));
245-
desc.addUntracked<double>("bPixLorentzAnglePerTesla", -9999.);
246-
desc.addUntracked<double>("fPixLorentzAnglePerTesla", -9999.);
246+
edm::FileInPath("Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml"))
247+
->setComment("Tracker Topology");
248+
249+
desc.add<std::string>("label", "")->setComment("label to which write the data");
250+
desc.addUntracked<double>("bPixLorentzAnglePerTesla", -9999.)->setComment("LA value for all BPix");
251+
desc.addUntracked<double>("fPixLorentzAnglePerTesla", -9999.)->setComment("LA value for all FPix");
247252

248253
edm::ParameterSetDescription desc_BPixParameters;
249254
desc_BPixParameters.addOptional<int>("layer");
@@ -252,7 +257,8 @@ void SiPixelFakeLorentzAngleESSource::fillDescriptions(edm::ConfigurationDescrip
252257
desc_BPixParameters.addOptional<int>("side");
253258
desc_BPixParameters.add<double>("angle");
254259
std::vector<edm::ParameterSet> default_BPixParametersToAdd;
255-
desc.addVPSet("BPixParameters", desc_BPixParameters, default_BPixParametersToAdd);
260+
desc.addVPSet("BPixParameters", desc_BPixParameters, default_BPixParametersToAdd)
261+
->setComment("LA values for given BPix regions");
256262

257263
edm::ParameterSetDescription desc_FPixParameters;
258264
desc_FPixParameters.addOptional<int>("side");
@@ -263,13 +269,15 @@ void SiPixelFakeLorentzAngleESSource::fillDescriptions(edm::ConfigurationDescrip
263269
desc_FPixParameters.addOptional<int>("HVgroup");
264270
desc_FPixParameters.add<double>("angle");
265271
std::vector<edm::ParameterSet> default_FPixParametersToAdd;
266-
desc.addVPSet("FPixParameters", desc_FPixParameters, default_FPixParametersToAdd);
272+
desc.addVPSet("FPixParameters", desc_FPixParameters, default_FPixParametersToAdd)
273+
->setComment("LA values for given FPix regions");
267274

268275
edm::ParameterSetDescription desc_ModuleParameters;
269276
desc_ModuleParameters.add<unsigned int>("rawid");
270277
desc_ModuleParameters.add<double>("angle");
271278
std::vector<edm::ParameterSet> default_ModuleParametersToAdd;
272-
desc.addVPSet("ModuleParameters", desc_ModuleParameters, default_ModuleParametersToAdd);
279+
desc.addVPSet("ModuleParameters", desc_ModuleParameters, default_ModuleParametersToAdd)
280+
->setComment("LA values for given modules");
273281

274282
descriptions.addWithDefaultLabel(desc);
275283
}

‎CalibTracker/SiPixelESProducers/test/testSiPixelFakeLorentzAngleESSource_cfg.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070

7171
if(options.isPhase2):
7272
print(" ========> Testing Phase-2")
73+
process.SiPixelFakeLorentzAngleESSource.label = cms.string("forPhase2")
7374
process.SiPixelFakeLorentzAngleESSource.bPixLorentzAnglePerTesla = cms.untracked.double(0.106)
7475
process.SiPixelFakeLorentzAngleESSource.fPixLorentzAnglePerTesla = cms.untracked.double(0.106)
7576
process.SiPixelFakeLorentzAngleESSource.file = 'SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/PixelSkimmedGeometryT14.txt'
@@ -174,9 +175,13 @@
174175
cms.PSet( rawid=cms.uint32(344860676), angle=cms.double(FPix_300V_RNG2_PNL2) )
175176
)
176177

178+
##
179+
## SiPixelLorentzAngleReader (from Event Setup)
180+
##
177181
process.LorentzAngleReader = cms.EDAnalyzer("SiPixelLorentzAngleReader",
178-
printDebug = cms.untracked.bool(True),
179-
useSimRcd = cms.bool(False)
180-
)
182+
printDebug = cms.untracked.uint32(10),
183+
useSimRcd = cms.bool(False),
184+
recoLabel = cms.string("forPhase2" if options.isPhase2 else "") # test the label
185+
)
181186

182187
process.p = cms.Path(process.LorentzAngleReader)

‎CondTools/SiPixel/plugins/SiPixelLorentzAngleReader.cc‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#include "FWCore/Framework/interface/EventSetup.h"
1717
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
1818
#include "FWCore/MessageLogger/interface/MessageLogger.h"
19+
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1920
#include "FWCore/ParameterSet/interface/ParameterSet.h"
21+
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
2022
#include "FWCore/ServiceRegistry/interface/Service.h"
2123
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
2224
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -35,24 +37,26 @@ class SiPixelLorentzAngleReader : public edm::one::EDAnalyzer<edm::one::SharedRe
3537
explicit SiPixelLorentzAngleReader(const edm::ParameterSet&);
3638
~SiPixelLorentzAngleReader() override;
3739

40+
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
3841
void analyze(const edm::Event&, const edm::EventSetup&) override;
3942

4043
private:
4144
const edm::ESGetToken<SiPixelLorentzAngle, SiPixelLorentzAngleRcd> siPixelLAToken_;
4245
const edm::ESGetToken<SiPixelLorentzAngle, SiPixelLorentzAngleSimRcd> siPixelSimLAToken_;
43-
const bool printdebug_;
46+
const std::string siPixelLALabel_;
47+
const std::string siPixelSimLALabel_;
48+
const uint32_t printdebug_;
4449
const bool useSimRcd_;
45-
4650
TH1F* LorentzAngleBarrel_;
4751
TH1F* LorentzAngleForward_;
4852
};
4953

5054
using namespace cms;
5155

5256
SiPixelLorentzAngleReader::SiPixelLorentzAngleReader(const edm::ParameterSet& iConfig)
53-
: siPixelLAToken_(esConsumes()),
54-
siPixelSimLAToken_(esConsumes()),
55-
printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", false)),
57+
: siPixelLAToken_(esConsumes(edm::ESInputTag("", iConfig.getParameter<std::string>("recoLabel")))),
58+
siPixelSimLAToken_(esConsumes((edm::ESInputTag("", iConfig.getParameter<std::string>("simLabel"))))),
59+
printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 10)),
5660
useSimRcd_(iConfig.getParameter<bool>("useSimRcd")) {
5761
usesResource(TFileService::kSharedResource);
5862
}
@@ -74,8 +78,10 @@ void SiPixelLorentzAngleReader::analyze(const edm::Event& e, const edm::EventSet
7478
LorentzAngleForward_ = fs->make<TH1F>("LorentzAngleForwardPixel", "LorentzAngleForwardPixel", 150, 0, 0.15);
7579
std::map<unsigned int, float> detid_la = SiPixelLorentzAngle_->getLorentzAngles();
7680
std::map<unsigned int, float>::const_iterator it;
81+
unsigned int count = 0;
7782
for (it = detid_la.begin(); it != detid_la.end(); it++) {
78-
if (printdebug_) {
83+
count++;
84+
if (count <= printdebug_) {
7985
edm::LogPrint("SiPixelLorentzAngleReader") << "detid " << it->first << " \t"
8086
<< " Lorentz angle " << it->second << std::endl;
8187
}
@@ -86,6 +92,18 @@ void SiPixelLorentzAngleReader::analyze(const edm::Event& e, const edm::EventSet
8692
LorentzAngleForward_->Fill(it->second);
8793
}
8894
}
95+
edm::LogPrint("SiPixelLorentzAngleReader")
96+
<< "SiPixelLorentzAngleReader::" << __FUNCTION__ << "(...) :examined " << count << " DetIds" << std::endl;
97+
}
98+
99+
void SiPixelLorentzAngleReader::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
100+
edm::ParameterSetDescription desc;
101+
desc.setComment("EDAnalyzer to read per-module SiPixelLorentzAngle payloads in the EventSetup");
102+
desc.add<std::string>("recoLabel", "")->setComment("label for the reconstruction tags");
103+
desc.add<std::string>("simLabel", "")->setComment("label for the simulation tags");
104+
desc.addUntracked<unsigned int>("printDebug", 10);
105+
desc.add<bool>("useSimRcd", false);
106+
descriptions.addWithDefaultLabel(desc);
89107
}
90108

91109
#include "FWCore/Framework/interface/MakerMacros.h"

‎CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@
6767
process.es_prefer_QualityReader = cms.ESPrefer("PoolDBESSource","QualityReader")
6868

6969
process.LorentzAngleReader = cms.EDAnalyzer("SiPixelLorentzAngleReader",
70-
printDebug = cms.untracked.bool(False),
71-
useSimRcd = cms.bool(False)
70+
printDebug = cms.untracked.uint32(10),
71+
useSimRcd = cms.bool(False),
72+
recoLabel = cms.string(""),
73+
simLabel = cms.string("")
7274
)
7375

7476
process.LorentzAngleSimReader = cms.EDAnalyzer("SiPixelLorentzAngleReader",
75-
printDebug = cms.untracked.bool(False),
76-
useSimRcd = cms.bool(True)
77-
77+
printDebug = cms.untracked.uint32(10),
78+
useSimRcd = cms.bool(True),
79+
recoLabel = cms.string(""),
80+
simLabel = cms.string("")
7881
)
7982

8083

0 commit comments

Comments
 (0)