Skip to content

Commit

Permalink
attempt at merging PixelEndcapName(Upgrade)
Browse files Browse the repository at this point in the history
  • Loading branch information
@friccita
friccita committed Oct 30, 2014
1 parent 7c15767 commit 14a6661
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 42 deletions.
2 changes: 1 addition & 1 deletion DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
View file
Expand Up @@ -52,7 +52,7 @@ class SiPixelClusterModule {
typedef edmNew::DetSet<SiPixelCluster>::const_iterator ClusterIterator;

/// Book histograms
void book(const edm::ParameterSet& iConfig, DQMStore::IBooker & iBooker, int type=0, bool twoD=true, bool reducedSet=false, bool isUpgrade=false);
void book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type=0, bool twoD=true, bool reducedSet=false, bool isUpgrade=false);
/// Fill histograms
int fill(const edmNew::DetSetVector<SiPixelCluster> & input,
const TrackerGeometry* tracker,
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
View file
Expand Up @@ -69,7 +69,7 @@
virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;

virtual void buildStructure(edm::EventSetup const&);
virtual void bookMEs(DQMStore::IBooker &);
virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup& iSetup);

private:
edm::ParameterSet conf_;
Expand Down
46 changes: 30 additions & 16 deletions DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc
View file
Expand Up @@ -34,8 +34,10 @@
#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameWrapper.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
//
// Constructors
//
Expand Down Expand Up @@ -63,17 +65,23 @@ SiPixelClusterModule::~SiPixelClusterModule() {}
//
// Book histograms
//
void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBooker & iBooker, int type, bool twoD, bool reducedSet, bool isUpgrade) {
void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type, bool twoD, bool reducedSet, bool isUpgrade) {

edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<IdealGeometryRecord>().get(tTopoHandle);
const TrackerTopology *pTT = tTopoHandle.product();

bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
bool isHalfModule = false;
if(barrel){
if (!isUpgrade) {
/*if (!isUpgrade) {
isHalfModule = PixelBarrelName(DetId(id_)).isHalfModule();
} else if (isUpgrade) {
isHalfModule = PixelBarrelNameUpgrade(DetId(id_)).isHalfModule();
}
}*/
isHalfModule = PixelBarrelNameWrapper(iConfig,DetId(id_)).isHalfModule();

}
int nbinx = ncols_/2;
int nbiny = nrows_/2;
Expand Down Expand Up @@ -144,8 +152,9 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
}
if(type==1 && barrel){
uint32_t DBladder;
if (!isUpgrade) { DBladder = PixelBarrelName(DetId(id_)).ladderName(); }
else { DBladder = PixelBarrelNameUpgrade(DetId(id_)).ladderName(); }
//if (!isUpgrade) { DBladder = PixelBarrelName(DetId(id_)).ladderName(); }
//else { DBladder = PixelBarrelNameUpgrade(DetId(id_)).ladderName(); }
DBladder = PixelBarrelNameWrapper(iConfig,DetId(id_)).ladderName();
char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
hid = src.label() + "_" + sladder;
if(isHalfModule) hid += "H";
Expand Down Expand Up @@ -202,8 +211,9 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
if(type==2 && barrel){

uint32_t DBlayer;
if (!isUpgrade) { DBlayer = PixelBarrelName(DetId(id_)).layerName(); }
else { DBlayer = PixelBarrelNameUpgrade(DetId(id_)).layerName(); }
//if (!isUpgrade) { DBlayer = PixelBarrelName(DetId(id_)).layerName(); }
//else { DBlayer = PixelBarrelNameUpgrade(DetId(id_)).layerName(); }
DBlayer = PixelBarrelNameWrapper(iConfig,DetId(id_)).layerName();
char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
hid = src.label() + "_" + slayer;
// Number of clusters
Expand Down Expand Up @@ -264,8 +274,9 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
}
if(type==3 && barrel){
uint32_t DBmodule;
if (!isUpgrade) { DBmodule = PixelBarrelName(DetId(id_)).moduleName(); }
else { DBmodule = PixelBarrelNameUpgrade(DetId(id_)).moduleName(); }
//if (!isUpgrade) { DBmodule = PixelBarrelName(DetId(id_)).moduleName(); }
//else { DBmodule = PixelBarrelNameUpgrade(DetId(id_)).moduleName(); }
DBmodule = PixelBarrelNameWrapper(iConfig,DetId(id_)).moduleName();
char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
hid = src.label() + "_" + smodule;
// Number of clusters
Expand Down Expand Up @@ -327,8 +338,9 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo

if(type==4 && endcap){
uint32_t blade;
if (!isUpgrade) { blade = PixelEndcapName(DetId(id_)).bladeName(); }
else { blade = PixelEndcapNameUpgrade(DetId(id_)).bladeName(); }
//if (!isUpgrade) { blade = PixelEndcapName(DetId(id_)).bladeName(); }
//else { blade = PixelEndcapNameUpgrade(DetId(id_)).bladeName(); }
blade = PixelEndcapName(DetId(id_),pTT,isUpgrade).bladeName();

char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
hid = src.label() + "_" + sblade;
Expand Down Expand Up @@ -370,9 +382,9 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
}
if(type==5 && endcap){
uint32_t disk;
if (!isUpgrade) { disk = PixelEndcapName(DetId(id_)).diskName(); }
else { disk = PixelEndcapNameUpgrade(DetId(id_)).diskName(); }

//if (!isUpgrade) { disk = PixelEndcapName(DetId(id_)).diskName(); }
//else { disk = PixelEndcapNameUpgrade(DetId(id_)).diskName(); }
disk = PixelEndcapName(DetId(id_),pTT,isUpgrade).diskName();
char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
hid = src.label() + "_" + sdisk;
// Number of clusters
Expand Down Expand Up @@ -415,13 +427,15 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
if(type==6 && endcap){
uint32_t panel;
uint32_t module;
if (!isUpgrade) {
/*if (!isUpgrade) {
panel= PixelEndcapName(DetId(id_)).pannelName();
module= PixelEndcapName(DetId(id_)).plaquetteName();
} else {
panel= PixelEndcapNameUpgrade(DetId(id_)).pannelName();
module= PixelEndcapNameUpgrade(DetId(id_)).plaquetteName();
}
}*/
panel= PixelEndcapName(DetId(id_),pTT,isUpgrade).pannelName();
module= PixelEndcapName(DetId(id_),pTT,isUpgrade).plaquetteName();

char slab[80]; sprintf(slab, "Panel_%i_Ring_%i",panel, module);
hid = src.label() + "_" + slab;
Expand Down
55 changes: 31 additions & 24 deletions DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
View file
Expand Up @@ -35,6 +35,7 @@
#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameWrapper.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
//
#include <string>
#include <stdlib.h>
Expand Down Expand Up @@ -107,8 +108,8 @@ void SiPixelClusterSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup&
}
}

void SiPixelClusterSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &){
bookMEs(iBooker);
void SiPixelClusterSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, const edm::EventSetup& iSetup){
bookMEs(iBooker, iSetup);
// Book occupancy maps in global coordinates for all clusters:
iBooker.setCurrentFolder("Pixel/Clusters/OffTrack");
//bpix
Expand Down Expand Up @@ -196,6 +197,10 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
edm::ESHandle<TrackerGeometry> pDD;
iSetup.get<TrackerDigiGeometryRecord>().get( pDD );

edm::ESHandle<TrackerTopology> tTopoHandle;
iSetup.get<IdealGeometryRecord>().get(tTopoHandle);
const TrackerTopology *pTT = tTopoHandle.product();

LogVerbatim ("PixelDQM") << " *** Geometry node for TrackerGeom is "<<&(*pDD)<<std::endl;
LogVerbatim ("PixelDQM") << " *** I have " << pDD->dets().size() <<" detectors"<<std::endl;
LogVerbatim ("PixelDQM") << " *** I have " << pDD->detTypes().size() <<" types"<<std::endl;
Expand All @@ -221,14 +226,15 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
int layer = PixelBarrelNameWrapper(conf_, DetId(id)).layerName();
if (layer > noOfLayers) noOfLayers = layer;
thePixelStructure.insert(pair<uint32_t,SiPixelClusterModule*> (id,theModule));
}else if ( (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (!isUpgrade) ) {
}else if ( (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))/*&& (!isUpgrade)*/ ) {
LogDebug ("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id)).halfCylinder();
int disk = PixelEndcapName(DetId(id)).diskName();
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id),pTT,isUpgrade).halfCylinder();
//PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id)).halfCylinder();
int disk = PixelEndcapName(DetId(id),pTT,isUpgrade).diskName();
if (disk > noOfDisks) noOfDisks = disk;
int blade = PixelEndcapName(DetId(id)).bladeName();
int panel = PixelEndcapName(DetId(id)).pannelName();
int module = PixelEndcapName(DetId(id)).plaquetteName();
int blade = PixelEndcapName(DetId(id),pTT,isUpgrade).bladeName();
int panel = PixelEndcapName(DetId(id),pTT,isUpgrade).pannelName();
int module = PixelEndcapName(DetId(id),pTT,isUpgrade).plaquetteName();
/*PixelEndcapNameWrapper::HalfCylinder side = PixelEndcapNameWrapper(cfg_, DetId(id)).halfCylinder();
int disk = PixelEndcapNameWrapper(cfg_, DetId(id)).diskName();
if (disk > noOfDisks) noOfDisks = disk;
Expand All @@ -250,20 +256,20 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
mask = false;
if(isPIB && mask) continue;
thePixelStructure.insert(pair<uint32_t,SiPixelClusterModule*> (id,theModule));
} else if ( (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade) ) {
}/* else if ( (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade) ) {
LogDebug ("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(id)).halfCylinder();
int disk = PixelEndcapNameUpgrade(DetId(id)).diskName();
if (disk > noOfDisks) noOfDisks = disk;
int blade = PixelEndcapNameUpgrade(DetId(id)).bladeName();
int panel = PixelEndcapNameUpgrade(DetId(id)).pannelName();
int module = PixelEndcapNameUpgrade(DetId(id)).plaquetteName();
/*PixelEndcapNameWrapper::HalfCylinder side = PixelEndcapNameWrapper(cfg_, DetId(id)).halfCylinder();
int disk = PixelEndcapNameWrapper(cfg_, DetId(id)).diskName();
if (disk > noOfDisks) noOfDisks = disk;
int blade = PixelEndcapNameWrapper(cfg_, DetId(id)).bladeName();
int panel = PixelEndcapNameWrapper(cfg_, DetId(id)).pannelName();
int module = PixelEndcapNameWrapper(cfg_, DetId(id)).plaquetteName();*/
//PixelEndcapNameWrapper::HalfCylinder side = PixelEndcapNameWrapper(cfg_, DetId(id)).halfCylinder();
//int disk = PixelEndcapNameWrapper(cfg_, DetId(id)).diskName();
//if (disk > noOfDisks) noOfDisks = disk;
//int blade = PixelEndcapNameWrapper(cfg_, DetId(id)).bladeName();
//int panel = PixelEndcapNameWrapper(cfg_, DetId(id)).pannelName();
//int module = PixelEndcapNameWrapper(cfg_, DetId(id)).plaquetteName();
char sside[80]; sprintf(sside, "HalfCylinder_%i",side);
char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
Expand All @@ -280,6 +286,7 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
if(isPIB && mask) continue;
thePixelStructure.insert(pair<uint32_t,SiPixelClusterModule*> (id,theModule));
}//endif(Upgrade)
*/
}
}
}
Expand All @@ -288,7 +295,7 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
//------------------------------------------------------------------
// Book MEs
//------------------------------------------------------------------
void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker){
void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker, const edm::EventSetup& iSetup){

// Get DQM interface
iBooker.setCurrentFolder("Pixel");
Expand All @@ -305,7 +312,7 @@ void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker){
/// Create folder tree and book histograms
if(modOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,0,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,0,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,0,twoDimOn,reducedSet,isUpgrade);
} else {

if(!isPIB) throw cms::Exception("LogicError")
Expand All @@ -314,49 +321,49 @@ void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker){
}
if(ladOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,1,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,1,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,1,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
}
}
if(layOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,2,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,2,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,2,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH LAYER-FOLDER\n";
}
}
if(phiOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,3,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,3,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,3,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH PHI-FOLDER\n";
}
}
if(bladeOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,4,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,4,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,4,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
}
}
if(diskOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,5,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,5,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,5,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH DISK-FOLDER\n";
}
}
if(ringOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,6,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,6,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,6,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH RING-FOLDER\n";
}
}
if(smileyOn){
if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,7,isUpgrade)){
(*struct_iter).second->book( conf_,iBooker,7,twoDimOn,reducedSet,isUpgrade);
(*struct_iter).second->book( conf_,iSetup,iBooker,7,twoDimOn,reducedSet,isUpgrade);
} else {
LogDebug ("PixelDQM") << "PROBLEM WITH BARREL-FOLDER\n";
}
Expand Down

0 comments on commit 14a6661

Please sign in to comment.