Skip to content

Commit

Permalink
Merge pull request #12514 from dmitrijus/raddam2_80x
Browse files Browse the repository at this point in the history 
Fix an invalid use of a 'static' keyword in DQM/HcalDetDiagPedestalMonitor
  • Loading branch information
@cmsbuild
cmsbuild committed Nov 21, 2015
2 parents c1e67c4 + ce2b7d1 commit bd8b62d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 29 deletions.
43 changes: 23 additions & 20 deletions DQM/HcalMonitorTasks/src/HcalDetDiagLaserMonitor.cc
View file
Expand Up @@ -376,6 +376,11 @@ class HcalDetDiagLaserMonitor : public HcalBaseDQMonitor {
std::map<unsigned int, int> KnownBadCells_;

HcalRaddamData Raddam_data[56];

// previously: statics in analyze
bool HBHEseq_,HOseq_,HFseq_;
int lastHBHEorbit_,lastHOorbit_,lastHForbit_,nChecksHBHE_,nChecksHO_,nChecksHF_,ievt_hbhe_,ievt_ho_,ievt_hf_;

};

HcalDetDiagLaserMonitor::HcalDetDiagLaserMonitor(const edm::ParameterSet& iConfig):
Expand Down Expand Up @@ -582,11 +587,9 @@ void HcalDetDiagLaserMonitor::analyze(const edm::Event& iEvent, const edm::Event
HcalBaseDQMonitor::analyze(iEvent,iSetup); // base class increments ievt_, etc. counters

int eta,phi,depth,nTS;
bool HBHEseq,HOseq,HFseq;
int lastHBHEorbit,lastHOorbit,lastHForbit,nChecksHBHE,nChecksHO,nChecksHF,ievt_hbhe,ievt_ho,ievt_hf;
if(ievt_==-1){
ievt_=0;HBHEseq=HOseq=HFseq=false; lastHBHEorbit=lastHOorbit=lastHForbit=-1;nChecksHBHE=nChecksHO=nChecksHF=0;
ievt_hbhe=0,ievt_ho=0,ievt_hf=0;
ievt_=0;HBHEseq_=HOseq_=HFseq_=false; lastHBHEorbit_=lastHOorbit_=lastHForbit_=-1;nChecksHBHE_=nChecksHO_=nChecksHF_=0;
ievt_hbhe_=0,ievt_ho_=0,ievt_hf_=0;
}

bool LaserEvent=false;
Expand All @@ -601,31 +604,31 @@ int lastHBHEorbit,lastHOorbit,lastHForbit,nChecksHBHE,nChecksHO,nChecksHF,ievt_
LocalRun=true;
}
if(!LocalRun && Online_){
if(HBHEseq && (orbit-lastHBHEorbit)>(11223*10) && ievt_hbhe>40){
HBHEseq=false;
if(HBHEseq_ && (orbit-lastHBHEorbit_)>(11223*10) && ievt_hbhe_>40){
HBHEseq_=false;
fillHistos(HcalBarrel);
fillProblems(HcalBarrel);
fillProblems(HcalEndcap);
nChecksHBHE++;
ievt_hbhe=0;
nChecksHBHE_++;
ievt_hbhe_=0;
for(int i=0;i<85;i++)for(int j=0;j<72;j++)for(int k=0;k<4;k++) hb_data[i][j][k].reset();
for(int i=0;i<85;i++)for(int j=0;j<72;j++)for(int k=0;k<4;k++) he_data[i][j][k].reset();
}
if(HOseq && (orbit-lastHOorbit)>(11223*10) && ievt_ho>40){
HOseq=false;
if(HOseq_ && (orbit-lastHOorbit_)>(11223*10) && ievt_ho_>40){
HOseq_=false;
fillHistos(HcalOuter);
fillProblems(HcalOuter);
nChecksHO++;
ievt_ho=0;
nChecksHO_++;
ievt_ho_=0;
for(int i=0;i<85;i++)for(int j=0;j<72;j++)for(int k=0;k<4;k++) ho_data[i][j][k].reset();
}
if(HFseq && (orbit-lastHForbit)>(11223*10) && ievt_hf>40){
HFseq=false;
if(HFseq_ && (orbit-lastHForbit_)>(11223*10) && ievt_hf_>40){
HFseq_=false;
fillHistos(HcalForward);
fillProblems(HcalForward);
nChecksHF++;
ievt_hf=0;
if(nChecksHF==1 || (nChecksHF>1 && ((nChecksHF-1)%12)==0)){
nChecksHF_++;
ievt_hf_=0;
if(nChecksHF_==1 || (nChecksHF_>1 && ((nChecksHF_-1)%12)==0)){
SaveReference();
}
for(int i=0;i<85;i++)for(int j=0;j<72;j++)for(int k=0;k<4;k++) hf_data[i][j][k].reset();
Expand All @@ -643,9 +646,9 @@ int lastHBHEorbit,lastHOorbit,lastHForbit,nChecksHBHE,nChecksHO,nChecksHF,ievt_
const FEDRawData& fedData = rawdata->FEDData(i) ;
if ( fedData.size() < 24 ) continue ;
int value = ((const HcalDCCHeader*)(fedData.data()))->getCalibType() ;
if(value==hc_HBHEHPD){ HBHEseq=true; HOseq=HFseq=false; lastHBHEorbit=orbit; ievt_hbhe++; }
if(value==hc_HOHPD){ HOseq=true; HBHEseq=HFseq=false; lastHOorbit=orbit; ievt_ho++; }
if(value==hc_HFPMT){ HFseq=true; HBHEseq=HOseq=false; lastHForbit=orbit; ievt_hf++; }
if(value==hc_HBHEHPD){ HBHEseq_=true; HOseq_=HFseq_=false; lastHBHEorbit_=orbit; ievt_hbhe_++; }
if(value==hc_HOHPD){ HOseq_=true; HBHEseq_=HFseq_=false; lastHOorbit_=orbit; ievt_ho_++; }
if(value==hc_HFPMT){ HFseq_=true; HBHEseq_=HOseq_=false; lastHForbit_=orbit; ievt_hf_++; }

if(value==hc_HBHEHPD || value==hc_HOHPD || value==hc_HFPMT){ LaserEvent=true; break;}
if(value==hc_RADDAM){ LaserEvent=true; LaserRaddam=true; break;}
Expand Down
19 changes: 10 additions & 9 deletions DQM/HcalMonitorTasks/src/HcalDetDiagPedestalMonitor.cc
View file
Expand Up @@ -240,6 +240,9 @@ class HcalDetDiagPedestalMonitor : public HcalBaseDQMonitor {

std::map<unsigned int, int> KnownBadCells_;

// previously: statics in analyze
bool PEDseq_;
int lastPEDorbit_,nChecksPED_;
};

HcalDetDiagPedestalMonitor::HcalDetDiagPedestalMonitor(const edm::ParameterSet& iConfig): HcalBaseDQMonitor(iConfig) {
Expand Down Expand Up @@ -282,7 +285,7 @@ HcalDetDiagPedestalMonitor::HcalDetDiagPedestalMonitor(const edm::ParameterSet&
// register for data access
tok_hbhe_ = consumes<HBHEDigiCollection>(inputLabelDigi_);
tok_ho_ = consumes<HODigiCollection>(inputLabelDigi_);
tok_hf_ = consumes<HFDigiCollection>(inputLabelDigi_);
tok_hf_ = consumes<HFDigiCollection>(inputLabelDigi_);
tok_raw_ = consumes<FEDRawDataCollection>(iConfig.getUntrackedParameter<edm::InputTag>("rawDataLabel"));
tok_tb_ = consumes<HcalTBTriggerData>(iConfig.getParameter<edm::InputTag>("hcalTBTriggerDataTag"));

Expand Down Expand Up @@ -461,9 +464,7 @@ void HcalDetDiagPedestalMonitor::analyze(const edm::Event& iEvent, const edm::Ev
if(createHTMLonly) return;
HcalBaseDQMonitor::analyze(iEvent, iSetup); // increments counters
int eta,phi,depth,nTS;
static bool PEDseq;
static int lastPEDorbit,nChecksPED;
if(ievt_==-1){ ievt_=0; PEDseq=false; lastPEDorbit=-1;nChecksPED=0; }
if(ievt_==-1){ ievt_=0; PEDseq_=false; lastPEDorbit_=-1;nChecksPED_=0; }
int orbit=iEvent.orbitNumber();
meRUN_->Fill(iEvent.id().run());

Expand All @@ -480,12 +481,12 @@ static int lastPEDorbit,nChecksPED;
if(LocalRun && !PedestalEvent) return;

if(!LocalRun && Online_){
if(PEDseq && (orbit-lastPEDorbit)>(11223*10) && ievt_>500){
PEDseq=false;
if(PEDseq_ && (orbit-lastPEDorbit_)>(11223*10) && ievt_>500){
PEDseq_=false;
fillHistos();
CheckStatus();
nChecksPED++;
if(nChecksPED==1 || (nChecksPED>1 && ((nChecksPED-1)%12)==0)){
nChecksPED_++;
if(nChecksPED_==1 || (nChecksPED_>1 && ((nChecksPED_-1)%12)==0)){
SaveReference();
}
for(int i=0;i<85;i++)for(int j=0;j<72;j++)for(int k=0;k<4;k++)for(int l=0;l<4;l++) hb_data[i][j][k][l].reset();
Expand All @@ -508,7 +509,7 @@ static int lastPEDorbit,nChecksPED;
if ( fedData.size() < 24 ) continue ;
int value = ((const HcalDCCHeader*)(fedData.data()))->getCalibType() ;
if ( calibType < 0 ) calibType = value ;
if(value==hc_Pedestal){ PEDseq=true; lastPEDorbit=orbit; break;}
if(value==hc_Pedestal){ PEDseq_=true; lastPEDorbit_=orbit; break;}
}
}
if(!LocalRun && calibType!=hc_Pedestal) return;
Expand Down

0 comments on commit bd8b62d

Please sign in to comment.