Skip to content

Commit

Permalink
Merge pull request #12915 from acimmino/Occupancy_12_01_2016
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmsbuild
cmsbuild committed Jan 16, 2016
2 parents 357bddb + 8d7cc05 commit 1fa8c20
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 30 deletions.
7 changes: 2 additions & 5 deletions DQM/RPCMonitorClient/interface/RPCOccupancyTest.h
View file
Expand Up @@ -31,7 +31,7 @@ class RPCOccupancyTest:public RPCClient {
private:

std::string globalFolder_, prefixDir_;
bool testMode_;
bool useNormalization_;
bool useRollInfo_;
std::vector<MonitorElement *> myOccupancyMe_;
std::vector<RPCDetId> myDetIds_;
Expand All @@ -43,15 +43,12 @@ class RPCOccupancyTest:public RPCClient {

MonitorElement * AsyMeWheel[5]; //Left Right Asymetry
MonitorElement * NormOccupWheel[5];

MonitorElement * AsyMeDWheel[5]; //Left Right Asymetry
MonitorElement * NormOccupDWheel[5];

MonitorElement * AsyMeDisk[10]; //Left Right Asymetry
MonitorElement * NormOccupDisk[10];

MonitorElement * AsyMeDDisk[10]; //Left Right Asymetry
MonitorElement * NormOccupDDisk[10];

MonitorElement * Barrel_OccBySt;
MonitorElement * EndCap_OccByRng;
MonitorElement * EndCap_OccByDisk ;
Expand Down
30 changes: 8 additions & 22 deletions DQM/RPCMonitorClient/src/RPCOccupancyTest.cc
View file
Expand Up @@ -15,7 +15,7 @@ RPCOccupancyTest::RPCOccupancyTest(const edm::ParameterSet& ps ){
prescaleFactor_ = ps.getUntrackedParameter<int>("DiagnosticPrescale", 1);
numberOfDisks_ = ps.getUntrackedParameter<int>("NumberOfEndcapDisks", 4);
numberOfRings_ = ps.getUntrackedParameter<int>("NumberOfEndcapRings", 2);
testMode_ = ps.getUntrackedParameter<bool>("testMode", false);
useNormalization_ = ps.getUntrackedParameter<bool>("testMode", true);
useRollInfo_ = ps.getUntrackedParameter<bool>("useRollInfo_", false);

std::string subsystemFolder = ps.getUntrackedParameter<std::string>("RPCFolder", "RPC");
Expand Down Expand Up @@ -93,20 +93,15 @@ void RPCOccupancyTest::myBooker(DQMStore::IBooker & ibooker){
rpcUtils.labelYAxisRoll(AsyMeWheel[w+2], 0, w, useRollInfo_);


if(testMode_){
if(useNormalization_){

histoName.str("");
histoName<<"OccupancyNormByEvents_Wheel"<<w;
NormOccupWheel[w+2] = ibooker.book2D(histoName.str().c_str(), histoName.str().c_str(), 12, 0.5, 12.5, 21, 0.5, 21.5);

rpcUtils.labelXAxisSector( NormOccupWheel[w+2]);
rpcUtils.labelYAxisRoll( NormOccupWheel[w+2], 0, w, useRollInfo_);


histoName.str("");
histoName<<"AsymmetryLeftRight_Distribution_Wheel"<<w;
AsyMeDWheel[w+2] = ibooker.book1D(histoName.str().c_str(), histoName.str().c_str(), 20, -0.1, 1.1);


histoName.str("");
histoName<<"OccupancyNormByEvents_Distribution_Wheel"<<w;

Expand All @@ -130,7 +125,7 @@ void RPCOccupancyTest::myBooker(DQMStore::IBooker & ibooker){



if(testMode_){
if(useNormalization_){

histoName.str("");
histoName<<"OccupancyNormByEvents_Disk"<<d;
Expand All @@ -139,10 +134,6 @@ void RPCOccupancyTest::myBooker(DQMStore::IBooker & ibooker){
rpcUtils.labelXAxisSegment(NormOccupDisk[d+offset]);
rpcUtils.labelYAxisRing( NormOccupDisk[d+offset],numberOfRings_, useRollInfo_);

histoName.str("");
histoName<<"AsymmetryLeftRight_Distribution_Disk"<<d;
AsyMeDDisk[d+offset] = ibooker.book1D(histoName.str().c_str(), histoName.str().c_str(), 20, -0.1, 1.1);

histoName.str("");
histoName<<"OccupancyNormByEvents_Distribution_Disk"<<d;
NormOccupDDisk[d+offset] = ibooker.book1D(histoName.str().c_str(), histoName.str().c_str(), 100, 0.0, 0.205);
Expand All @@ -157,15 +148,13 @@ void RPCOccupancyTest::fillGlobalME(RPCDetId & detId, MonitorElement * myMe){
if (!myMe) return;

MonitorElement * AsyMe=NULL; //Left Right Asymetry
MonitorElement * AsyMeD=NULL;
MonitorElement * NormOccup=NULL;
MonitorElement * NormOccupD=NULL;

if(detId.region() ==0){
AsyMe= AsyMeWheel[detId.ring()+2];
if(testMode_){
if(useNormalization_){
NormOccup=NormOccupWheel[detId.ring()+2];
AsyMeD= AsyMeDWheel[detId.ring()+2];
NormOccupD=NormOccupDWheel[detId.ring()+2];
}

Expand All @@ -175,16 +164,14 @@ if (!myMe) return;

if(detId.region()<0){
AsyMe= AsyMeDisk[-detId.station() + numberOfDisks_];
if(testMode_){
if(useNormalization_){
NormOccup=NormOccupDisk[-detId.station() + numberOfDisks_];
AsyMeD= AsyMeDDisk[-detId.station() + numberOfDisks_];
NormOccupD=NormOccupDDisk[-detId.station() + numberOfDisks_];
}
}else{
AsyMe= AsyMeDisk[detId.station() + numberOfDisks_-1];
if(testMode_){
if(useNormalization_){
NormOccup=NormOccupDisk[detId.station() + numberOfDisks_-1];
AsyMeD= AsyMeDDisk[detId.station() + numberOfDisks_-1];
NormOccupD=NormOccupDDisk[detId.station() + numberOfDisks_-1];
}
}
Expand Down Expand Up @@ -226,9 +213,8 @@ if (!myMe) return;
float normoccup = 1;
if(rpcevents_ != 0) normoccup = (totEnt/rpcevents_);

if(testMode_){
if(useNormalization_){
if(NormOccup) NormOccup->setBinContent(xBin,yBin, normoccup);
if(AsyMeD) AsyMeD->Fill(asym);
if(NormOccupD) NormOccupD->Fill(normoccup);
}

Expand Down
6 changes: 3 additions & 3 deletions DQM/RPCMonitorDigi/src/RPCBookDetUnitME.cc
View file
Expand Up @@ -98,11 +98,11 @@ void RPCMonitorDigi::bookSectorRingME(DQMStore::IBooker & ibooker, const std::st
os<<"Occupancy_Wheel_"<<wheel<<"_Sector_"<<sector;

if (sector==9 || sector==11)
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 90, 0.5, 90.5, 15, 0.5, 15.5);
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 91, 0.5, 91.5, 15, 0.5, 15.5);
else if (sector==4)
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 90, 0.5, 90.5, 21, 0.5, 21.5);
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 91, 0.5, 91.5, 21, 0.5, 21.5);
else
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 90, 0.5, 90.5, 17, 0.5, 17.5);
meMap[os.str()] = ibooker.book2D(os.str(), os.str(), 91, 0.5, 91.5, 17, 0.5, 17.5);

meMap[os.str()]->setAxisTitle("strip", 1);
rpcdqm::utils rpcUtils;
Expand Down

0 comments on commit 1fa8c20

Please sign in to comment.