Skip to content

Commit

Permalink
Changes for certification
Browse files Browse the repository at this point in the history
  • Loading branch information
Anna Cimmino committed Feb 24, 2011
1 parent dfff119 commit 7cb8044
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 61 deletions.
4 changes: 2 additions & 2 deletions DQM/RPCMonitorClient/interface/RPCDeadChannelTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ class RPCDeadChannelTest:public RPCClient{
void clientOperation(edm::EventSetup const& c);
void bookHisto(std::vector<MonitorElement *> , std::vector<RPCDetId>);

protected:
// protected:

void CalculateDeadChannelPercentage(RPCDetId & , MonitorElement * , edm::EventSetup const& );
// void CalculateDeadChannelPercentage(RPCDetId & , MonitorElement * , edm::EventSetup const& );

private:
int prescaleFactor_;
Expand Down
12 changes: 6 additions & 6 deletions DQM/RPCMonitorClient/src/RPCChamberQuality.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void RPCChamberQuality::beginRun(const edm::Run& r, const edm::EventSetup& c){
if (0!=me) dbe_->removeElement(me->getName());
me = dbe_->book1D(histoName.str().c_str(), histoName.str().c_str(), 7, 0.5, 7.5);

for (int x = 1; x <8 ; x++) me->setBinLabel(x, xLabels_[x-1]);
for (int x = 1; x <8 ; x++) {me->setBinLabel(x, xLabels_[x-1]);}
}


Expand All @@ -75,7 +75,7 @@ void RPCChamberQuality::beginRun(const edm::Run& r, const edm::EventSetup& c){
me->setBinLabel(2, "B", 2);
me->setBinLabel(3, "E-", 2);

for (int x = 1; x <8 ; x++) me->setBinLabel(x, xLabels_[x-1]);
for (int x = 1; x <8 ; x++){ me->setBinLabel(x, xLabels_[x-1]);}

for(int w=-2; w<3;w++){//Loop on wheels

Expand Down Expand Up @@ -139,12 +139,15 @@ void RPCChamberQuality::fillMonitorElements() {

meName.str("");
meName<<prefixDir_<<"/RPCEvents";
int rpcEvents=0;
int rpcEvents= minEvents;
RpcEvents = dbe_->get(meName.str());

if(RpcEvents) rpcEvents= (int)RpcEvents->getEntries();

if(rpcEvents >= minEvents){

lumiCounter_++;
init_ = true;

MonitorElement * summary[3];

Expand Down Expand Up @@ -202,9 +205,6 @@ void RPCChamberQuality::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg,
if(init_ && (lumiCounter_%prescaleFactor_ != 0) ) return;

this->fillMonitorElements();

lumiCounter_++;
init_ = true;

}

Expand Down
108 changes: 60 additions & 48 deletions DQM/RPCMonitorClient/src/RPCDeadChannelTest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,9 @@ RPCDeadChannelTest::RPCDeadChannelTest(const edm::ParameterSet& ps ){

RPCDeadChannelTest::~RPCDeadChannelTest(){dbe_ = 0;}

void RPCDeadChannelTest::beginJob(DQMStore * dbe ){
dbe_=dbe;
}
void RPCDeadChannelTest::beginJob(DQMStore * dbe ){dbe_=dbe;}

void RPCDeadChannelTest::endRun(const edm::Run& r, const edm::EventSetup& iSetup){

edm::LogVerbatim ("deadChannel") << "[RPCDeadChannelTest]: End run";
}

Expand Down Expand Up @@ -65,7 +62,6 @@ void RPCDeadChannelTest::bookHisto(std::vector<MonitorElement *> meVector, std::
}



rpcUtils.labelXAxisSector( DEADWheel[i+2]);
rpcUtils.labelYAxisRoll( DEADWheel[i+2], 0, i);
}//end wheels
Expand Down Expand Up @@ -124,10 +120,61 @@ void RPCDeadChannelTest::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg,
void RPCDeadChannelTest::clientOperation( edm::EventSetup const& iSetup){

edm::LogVerbatim ("deadChannel") <<"[RPCDeadChannelTest]:Client Operation";
MonitorElement * DEAD;

//Loop on chambers
for (unsigned int i = 0 ; i<myOccupancyMe_.size();i++){
this->CalculateDeadChannelPercentage(myDetIds_[i],myOccupancyMe_[i],iSetup);

MonitorElement * myMe = myOccupancyMe_[i];
if(!myMe) continue;

RPCDetId detId = myDetIds_[i];

DEAD = NULL;

float deadFraction = 0.0;

const QReport * theOccupancyQReport = myMe->getQReport("DeadChannel_0");
if(theOccupancyQReport) {
float qtresult = theOccupancyQReport->getQTresult();
//std::vector<dqm::me_util::Channel> badChannels = theOccupancyQReport->getBadChannels();
deadFraction = 1.0 - qtresult;
}else {
int xBins = myMe->getNbinsX();
float emptyBins = 0.0;
for (int x = 1; x<= xBins ; x++){if(myMe->getBinContent(x) == 0) {emptyBins++ ;}}
if (xBins != 0) deadFraction = emptyBins/xBins;
}


if (detId.region()==0) { DEAD = DEADWheel[detId.ring() + 2] ;
}else{
if(-detId.station()+ numberOfDisks_ >= 0 ){
if(detId.region()<0){
DEAD = DEADDisk[-detId.station() + numberOfDisks_];
}else{
DEAD = DEADDisk[detId.station() + numberOfDisks_-1];
}
}
}

if (DEAD){
int xBin,yBin;
if(detId.region()==0){//Barrel
xBin= detId.sector();
rpcdqm::utils rollNumber;
yBin = rollNumber.detId2RollNr(detId);
}else{//Endcap
//get segment number
RPCGeomServ RPCServ(detId);
xBin = RPCServ.segment();
(numberOfRings_ == 3 ? yBin= detId.ring()*3-detId.roll()+1 : yBin= (detId.ring()-1)*3-detId.roll()+1);
}
DEAD->setBinContent(xBin,yBin, deadFraction);

}


}//End loop on rolls in given chambers

}
Expand All @@ -139,52 +186,17 @@ void RPCDeadChannelTest::endJob(){}
//
//User Defined methods
//
void RPCDeadChannelTest::CalculateDeadChannelPercentage(RPCDetId & detId, MonitorElement * myMe, edm::EventSetup const& iSetup){

// edm::ESHandle<RPCGeometry> rpcgeo;
// iSetup.get<MuonGeometryRecord>().get(rpcgeo);
// void RPCDeadChannelTest::CalculateDeadChannelPercentage(RPCDetId & detId, MonitorElement * myMe, edm::EventSetup const& iSetup){

// const RPCRoll * rpcRoll = rpcgeo->roll(detId);
// // edm::ESHandle<RPCGeometry> rpcgeo;
// // iSetup.get<MuonGeometryRecord>().get(rpcgeo);

// unsigned int nstrips =rpcRoll->nstrips();
// // const RPCRoll * rpcRoll = rpcgeo->roll(detId);

MonitorElement * DEAD = NULL;
float deadFraction = 0.0;
// // unsigned int nstrips =rpcRoll->nstrips();

const QReport * theOccupancyQReport = myMe->getQReport("DeadChannel_0");
if(theOccupancyQReport) {
float qtresult = theOccupancyQReport->getQTresult();
//std::vector<dqm::me_util::Channel> badChannels = theOccupancyQReport->getBadChannels();
deadFraction = 1.0 - qtresult;
}

if (detId.region()==0) { DEAD = DEADWheel[detId.ring() + 2] ;
}else{
if(-detId.station()+ numberOfDisks_ >= 0 ){
if(detId.region()<0){
DEAD = DEADDisk[-detId.station() + numberOfDisks_];
}else{
DEAD = DEADDisk[detId.station() + numberOfDisks_-1];
}
}
}

if (DEAD){
int xBin,yBin;
if(detId.region()==0){//Barrel
xBin= detId.sector();
rpcdqm::utils rollNumber;
yBin = rollNumber.detId2RollNr(detId);
}else{//Endcap
//get segment number
RPCGeomServ RPCServ(detId);
xBin = RPCServ.segment();
(numberOfRings_ == 3 ? yBin= detId.ring()*3-detId.roll()+1 : yBin= (detId.ring()-1)*3-detId.roll()+1);
}
DEAD->setBinContent(xBin,yBin, deadFraction);

}
}

// }



11 changes: 6 additions & 5 deletions DQM/RPCMonitorClient/src/RPCEventSummary.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RPCEventSummary::RPCEventSummary(const edm::ParameterSet& ps ){

NumberOfFeds_ =FEDRange_.second - FEDRange_.first +1;

offlineDQM_ = ps.getUntrackedParameter<bool> ("OfflineDQM",true);
offlineDQM_ = ps.getUntrackedParameter<bool> ("OfflineDQM", true);


}
Expand Down Expand Up @@ -184,12 +184,10 @@ void RPCEventSummary::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, ed

if(offlineDQM_) return;

if(init_ && (lumiCounter_%prescaleFactor_ != 0)) return;
if(init_ && lumiCounter_%prescaleFactor_ != 0) return;

this->clientOperation();

init_ = true;
lumiCounter_++;
}

void RPCEventSummary::endRun(const edm::Run& r, const edm::EventSetup& c){
Expand All @@ -208,7 +206,10 @@ void RPCEventSummary::clientOperation(){


if(rpcevents < minimumEvents_) return;


init_ = true;
lumiCounter_++;

std::stringstream meName;
MonitorElement * myMe;

Expand Down

0 comments on commit 7cb8044

Please sign in to comment.