Skip to content

Commit

Permalink
Merge pull request #6731 from friccita/from-CMSSW_7_3_X_2014-11-30-0200
Browse files Browse the repository at this point in the history 
From cmssw 7 3 x 2014 11 30 0200
  • Loading branch information
@cmsbuild
cmsbuild committed Dec 5, 2014
2 parents f415111 + 26441f0 commit 0467e31
Show file tree
Hide file tree
Showing 20 changed files with 760 additions and 1,187 deletions.
15 changes: 4 additions & 11 deletions DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
View file
Expand Up @@ -52,20 +52,13 @@ 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,
MonitorElement* layer1,
MonitorElement* layer2,
MonitorElement* layer3,
MonitorElement* layer4,
MonitorElement* disk1pz,
MonitorElement* disk2pz,
MonitorElement* disk3pz,
MonitorElement* disk1mz,
MonitorElement* disk2mz,
MonitorElement* disk3mz,
std::vector<MonitorElement*>& layers,
std::vector<MonitorElement*>& diskspz,
std::vector<MonitorElement*>& disksmz,
bool modon=true,
bool ladon=false,
bool layon=false,
Expand Down
18 changes: 7 additions & 11 deletions 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);

std::string topFolderName_;

Expand Down Expand Up @@ -97,16 +97,12 @@
int bigEventSize;
bool isUpgrade;

MonitorElement* meClPosLayer1;
MonitorElement* meClPosLayer2;
MonitorElement* meClPosLayer3;
MonitorElement* meClPosLayer4;
MonitorElement* meClPosDisk1pz;
MonitorElement* meClPosDisk2pz;
MonitorElement* meClPosDisk3pz;
MonitorElement* meClPosDisk1mz;
MonitorElement* meClPosDisk2mz;
MonitorElement* meClPosDisk3mz;
std::vector<MonitorElement*> meClPosLayer;
std::vector<MonitorElement*> meClPosDiskpz;
std::vector<MonitorElement*> meClPosDiskmz;

int noOfLayers;
int noOfDisks;

//define Token(-s)
edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > srcToken_;
Expand Down
101 changes: 27 additions & 74 deletions DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc
View file
Expand Up @@ -36,6 +36,7 @@
#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.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 +64,17 @@ 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) {
isHalfModule = PixelBarrelName(DetId(id_)).isHalfModule();
} else if (isUpgrade) {
isHalfModule = PixelBarrelNameUpgrade(DetId(id_)).isHalfModule();
}
isHalfModule = PixelBarrelName(DetId(id_),pTT,isUpgrade).isHalfModule();
}
int nbinx = ncols_/2;
int nbiny = nrows_/2;
Expand Down Expand Up @@ -144,8 +145,7 @@ 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(); }
DBladder = PixelBarrelName(DetId(id_),pTT,isUpgrade).ladderName();
char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
hid = src.label() + "_" + sladder;
if(isHalfModule) hid += "H";
Expand Down Expand Up @@ -202,8 +202,7 @@ 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(); }
DBlayer = PixelBarrelName(DetId(id_),pTT,isUpgrade).layerName();
char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
hid = src.label() + "_" + slayer;
// Number of clusters
Expand Down Expand Up @@ -264,8 +263,7 @@ 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(); }
DBmodule = PixelBarrelName(DetId(id_),pTT,isUpgrade).moduleName();
char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
hid = src.label() + "_" + smodule;
// Number of clusters
Expand Down Expand Up @@ -327,8 +325,7 @@ 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(); }
blade = PixelEndcapName(DetId(id_),pTT,isUpgrade).bladeName();

char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
hid = src.label() + "_" + sblade;
Expand Down Expand Up @@ -370,8 +367,7 @@ 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(); }
disk = PixelEndcapName(DetId(id_),pTT,isUpgrade).diskName();

char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
hid = src.label() + "_" + sdisk;
Expand Down Expand Up @@ -415,13 +411,8 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
if(type==6 && endcap){
uint32_t panel;
uint32_t module;
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 Expand Up @@ -478,7 +469,7 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, DQMStore::IBoo
//
// Fill histograms
//
int SiPixelClusterModule::fill(const edmNew::DetSetVector<SiPixelCluster>& input, const TrackerGeometry* tracker,MonitorElement* layer1,MonitorElement* layer2,MonitorElement* layer3,MonitorElement* layer4,MonitorElement* disk1pz,MonitorElement* disk2pz,MonitorElement* disk3pz,MonitorElement* disk1mz,MonitorElement* disk2mz,MonitorElement* disk3mz,bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon, bool twoD, bool reducedSet, bool smileyon, bool isUpgrade) {
int SiPixelClusterModule::fill(const edmNew::DetSetVector<SiPixelCluster>& input, const TrackerGeometry* tracker,std::vector<MonitorElement*>& layers,std::vector<MonitorElement*>& diskspz,std::vector<MonitorElement*>& disksmz,bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon, bool twoD, bool reducedSet, bool smileyon, bool isUpgrade) {

bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
Expand Down Expand Up @@ -513,59 +504,21 @@ int SiPixelClusterModule::fill(const edmNew::DetSetVector<SiPixelCluster>& input
GlobalPoint clustgp = theGeomDet->surface().toGlobal( clustlp );

if(barrel){
uint32_t DBlayer;
if (!isUpgrade) { DBlayer = PixelBarrelName(DetId(id_)).layerName(); }
else { DBlayer = PixelBarrelNameUpgrade(DetId(id_)).layerName(); }
switch(DBlayer){
case 1: {
if(layer1) layer1->Fill(clustgp.z(),clustgp.phi());
break;
} case 2: {
if(layer2) layer2->Fill(clustgp.z(),clustgp.phi());
break;
} case 3: {
if(layer3) layer3->Fill(clustgp.z(),clustgp.phi());
break;
} case 4: {
if (isUpgrade) {
if(layer4) layer4->Fill(clustgp.z(),clustgp.phi());
break;
}
}
}
for (std::vector<MonitorElement*>::iterator i = layers.begin(); i != layers.end(); i++)
{
(*i)->Fill(clustgp.z(),clustgp.phi());
}
}else if(endcap){
uint32_t DBdisk;
if (!isUpgrade) { DBdisk = PixelEndcapName(DetId(id_)).diskName(); }
else if (isUpgrade) { DBdisk = PixelEndcapNameUpgrade(DetId(id_)).diskName(); }
if(clustgp.z()>0){
switch(DBdisk){
case 1: {
if(disk1pz) disk1pz->Fill(clustgp.x(),clustgp.y());
break;
} case 2: {
if(disk2pz) disk2pz->Fill(clustgp.x(),clustgp.y());
break;
} case 3: {
if (isUpgrade) {
if(disk3pz) disk3pz->Fill(clustgp.x(),clustgp.y());
break;
}
}}
for (std::vector<MonitorElement*>::iterator i = diskspz.begin(); i != diskspz.end(); i++)
{
(*i)->Fill(clustgp.x(),clustgp.y());
}
}else{
switch(DBdisk){
case 1: {
if(disk1mz) disk1mz->Fill(clustgp.x(),clustgp.y());
break;
} case 2: {
if(disk2mz) disk2mz->Fill(clustgp.x(),clustgp.y());
break;
} case 3: {
if (isUpgrade) {
if(disk3mz) disk3mz->Fill(clustgp.x(),clustgp.y());
break;
}
}
}
for (std::vector<MonitorElement*>::iterator i = disksmz.begin(); i != disksmz.end(); i++)
{
(*i)->Fill(clustgp.x(),clustgp.y());
}
}
}
if(!reducedSet)
Expand Down

0 comments on commit 0467e31

Please sign in to comment.