diff --git a/[refs] b/[refs] index fcc9b3e010cc9..a3e08d838df10 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 9f18f301896367d4856b4ee96430f58b9c190386 +"refs/heads/CMSSW_7_1_X": 2bc27f50c170a199e51921b3f0527af2ec0cda73 diff --git a/trunk/DQM/HcalMonitorClient/src/HcalSummaryClient.cc b/trunk/DQM/HcalMonitorClient/src/HcalSummaryClient.cc index 9270c2ad07fc9..941194166e5c0 100644 --- a/trunk/DQM/HcalMonitorClient/src/HcalSummaryClient.cc +++ b/trunk/DQM/HcalMonitorClient/src/HcalSummaryClient.cc @@ -287,8 +287,8 @@ void HcalSummaryClient::setup(void) if(dqmStore_->get(rootFolder_+"/EventInfo/HB HE HF Depth 1 Summary Map")) { depthME.push_back(dqmStore_->get(rootFolder_+"/EventInfo/HB HE HF Depth 1 Summary Map")); - (depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); - (depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); + //(depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); + //(depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); int etabins=depthME[depthME.size()-1]->getNbinsX(); for (int ieta=0;ietaget(rootFolder_+"/EventInfo/HB HE HF Depth 2 Summary Map")) { depthME.push_back(dqmStore_->get(rootFolder_+"/EventInfo/HB HE HF Depth 2 Summary Map")); - (depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); - (depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); + //(depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); + //(depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); int etabins=depthME[depthME.size()-1]->getNbinsX(); for (int ieta=0;ietaget(rootFolder_+"/EventInfo/HE Depth 3 Summary Map")) { depthME.push_back(dqmStore_->get(rootFolder_+"/EventInfo/HE Depth 3 Summary Map")); - (depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); - (depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); + //(depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); + //(depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); int etabins=depthME[depthME.size()-1]->getNbinsX(); for (int ieta=0;ietaget(rootFolder_+"/EventInfo/HO Depth 4 Summary Map")) { depthME.push_back(dqmStore_->get(rootFolder_+"/EventInfo/HO Depth 4 Summary Map")); - (depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); - (depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); + //(depthME[depthME.size()-1]->getTH2F())->SetMaximum(1); + //(depthME[depthME.size()-1]->getTH2F())->SetMinimum(-1); int etabins=depthME[depthME.size()-1]->getNbinsX(); for (int ieta=0;ieta Could not get reportSummaryMap!"<getTH2F()->SetMaximum(1); - reportMap->getTH2F()->SetMinimum(-1); + //reportMap->getTH2F()->SetMaximum(1); + //reportMap->getTH2F()->SetMinimum(-1); for (int i=1;i<=5;++i) reportMap->setBinContent(i,1,-1); diff --git a/trunk/DQM/HcalMonitorClient/src/HcalTrigPrimClient.cc b/trunk/DQM/HcalMonitorClient/src/HcalTrigPrimClient.cc index 548911c43ce3c..07ae63037b592 100644 --- a/trunk/DQM/HcalMonitorClient/src/HcalTrigPrimClient.cc +++ b/trunk/DQM/HcalMonitorClient/src/HcalTrigPrimClient.cc @@ -12,6 +12,8 @@ HcalTrigPrimClient::HcalTrigPrimClient(){ histo2d["TrigPrimMonitor/Error Flag for ZS run"] = 0; histo2d["TrigPrimMonitor/EtCorr HBHE"] = 0; histo2d["TrigPrimMonitor/EtCorr HF"] = 0; + histo2d["TrigPrimMonitor/FGCorr HBHE"] = 0; + histo2d["TrigPrimMonitor/FGCorr HF"] = 0; // TP Occupancy histo2d["TrigPrimMonitor/TP Map/TP Occupancy"] = 0; @@ -26,6 +28,10 @@ HcalTrigPrimClient::HcalTrigPrimClient(){ histo2d["TrigPrimMonitor/TP Map/Missing Data"] = 0; histo2d["TrigPrimMonitor/TP Map/Missing Emul"] = 0; + // TP Occupancy for ZS + histo2d["TrigPrimMonitor/TP Map for ZS/Mismatched Et ZS"] = 0; + histo2d["TrigPrimMonitor/TP Map for ZS/Missing Data ZS"] = 0; + histo2d["TrigPrimMonitor/TP Map for ZS/Missing Emul ZS"] = 0; // Energy Plots histo1d["TrigPrimMonitor/Energy Plots/HBHE/Energy HBHE - All Data"] = 0; histo1d["TrigPrimMonitor/Energy Plots/HBHE/Energy HBHE - All Emul"] = 0; @@ -42,6 +48,11 @@ HcalTrigPrimClient::HcalTrigPrimClient(){ histo1d["TrigPrimMonitor/Energy Plots/HF/Energy HF - Emul Only"] = 0; histo1d["TrigPrimMonitor/Energy Plots/HF/Energy HF - Missing Emul"] = 0; histo1d["TrigPrimMonitor/Energy Plots/HF/Energy HF - Missing Data"] = 0; + + histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HBHE - Missing Emul - ZS"] = 0; + histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HBHE - Missing Data - ZS"] = 0; + histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HF - Missing Emul - ZS"] = 0; + histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HF - Missing Data - ZS"] = 0; } void HcalTrigPrimClient::init(const ParameterSet& ps, DQMStore* dbe, string clientName) @@ -289,6 +300,12 @@ void HcalTrigPrimClient::htmlOutput(int runNo, string htmlDir, string htmlName) htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/EtCorr HBHE"],"data","emul", 10, htmlFile,htmlDir); htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/EtCorr HF"],"data","emul", 10, htmlFile,htmlDir); htmlFile << "" << std::endl; + + htmlFile << "" << std::endl; + htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/FGCorr HBHE"],"data","emul", 10, htmlFile,htmlDir); + htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/FGCorr HF"],"data","emul", 10, htmlFile,htmlDir); + htmlFile << "" << std::endl; + //---------------------------------------- //------------- TP Occupancy -------------- @@ -323,6 +340,17 @@ htmlFile << "" << std::endl; htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/TP Map/Missing Emul"],"ieta","iphi", 10, htmlFile,htmlDir); htmlFile << "" << std::endl; + ///------------- TP Occupancy ZS-------------- + htmlFile << "   

TP Map for ZS

" << std::endl; + + htmlFile << "" << std::endl; + htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/TP Map for ZS/Mismatched Et ZS"],"ieta","iphi", 10, htmlFile,htmlDir); + htmlFile << "" << std::endl; + + htmlFile << "" << std::endl; + htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/TP Map for ZS/Missing Data ZS"],"ieta","iphi", 10, htmlFile,htmlDir); + htmlAnyHisto(runNo,histo2d["TrigPrimMonitor/TP Map for ZS/Missing Emul ZS"],"ieta","iphi", 10, htmlFile,htmlDir); + htmlFile << "" << std::endl; //---------------------------------------- //------------- Energy (HBHE) -------------- @@ -370,6 +398,21 @@ htmlFile << "" << std::endl; htmlAnyHisto(runNo,histo1d["TrigPrimMonitor/Energy Plots/HF/Energy HF - Mismatched FG"],"ieta","iphi", 10, htmlFile,htmlDir,true); htmlFile << "" << std::endl; + //---------------------------------------- + // + //------------- Energy for ZS-------------- + htmlFile << "   

Energy Plots for ZS

" << std::endl; + + htmlFile << "" << std::endl; + htmlAnyHisto(runNo,histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HBHE - Missing Data - ZS"],"ieta","iphi", 10, htmlFile,htmlDir,true); + htmlAnyHisto(runNo,histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HBHE - Missing Emul - ZS"],"ieta","iphi", 10, htmlFile,htmlDir,true); + htmlFile << "" << std::endl; + + htmlFile << "" << std::endl; + htmlAnyHisto(runNo,histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HF - Missing Data - ZS"],"ieta","iphi", 10, htmlFile,htmlDir,true); + htmlAnyHisto(runNo,histo1d["TrigPrimMonitor/Energy Plots for ZS/Energy HF - Missing Emul - ZS"],"ieta","iphi", 10, htmlFile,htmlDir,true); + htmlFile << "" << std::endl; + //---------------------------------------- htmlFile << "" << std::endl; diff --git a/trunk/DQM/HcalMonitorTasks/interface/HcalTrigPrimMonitor.h b/trunk/DQM/HcalMonitorTasks/interface/HcalTrigPrimMonitor.h index 4430b565057b6..1039d5fdf6181 100644 --- a/trunk/DQM/HcalMonitorTasks/interface/HcalTrigPrimMonitor.h +++ b/trunk/DQM/HcalMonitorTasks/interface/HcalTrigPrimMonitor.h @@ -12,8 +12,8 @@ /** \class HcalTrigPrimMonitor * - * $Date: 2009/08/24 11:22:14 $ - * $Revision: 1.18 $ + * $Date: 2009/10/12 15:10:05 $ + * $Revision: 1.19 $ * \author W. Fisher - FNAL */ @@ -71,6 +71,7 @@ class HcalTrigPrimMonitor: public HcalBaseMonitor { MonitorElement* ErrorFlagSummary_; MonitorElement* ErrorFlagSummaryZS_; MonitorElement* EtCorr_[2]; + MonitorElement* FGCorr_[2]; // TP Occupancy MonitorElement* TPOccupancy_; @@ -86,6 +87,11 @@ class HcalTrigPrimMonitor: public HcalBaseMonitor { MonitorElement* MissingData_; MonitorElement* MissingEmul_; + // TP Map for ZS run + MonitorElement* MismatchedEtZS_; + MonitorElement* MissingDataZS_; + MonitorElement* MissingEmulZS_; + // Energy Plots // 0 - HBHE // 1 - HF @@ -96,6 +102,9 @@ class HcalTrigPrimMonitor: public HcalBaseMonitor { MonitorElement* EnergyPlotsEmulOnly_[2]; MonitorElement* EnergyPlotsMissingData_[2]; MonitorElement* EnergyPlotsMissingEmul_[2]; + // For ZS run + MonitorElement* EnergyPlotsMissingDataZS_[2]; + MonitorElement* EnergyPlotsMissingEmulZS_[2]; }; #endif diff --git a/trunk/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc b/trunk/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc index 06f65274a3e3d..6be8e48222de6 100644 --- a/trunk/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc +++ b/trunk/DQM/HcalMonitorTasks/src/HcalTrigPrimMonitor.cc @@ -78,7 +78,14 @@ void HcalTrigPrimMonitor::setup(const edm::ParameterSet& ps, DQMStore* dbe){ EtCorr_[0] = m_dbe->book2D(type,type,50,0,256,50,0,256); type = "EtCorr HF"; - EtCorr_[1] = m_dbe->book2D(type,type,50,0,100,50,0,100); + EtCorr_[1] = m_dbe->book2D(type,type,50,0,256,50,0,256); + + type = "FGCorr HBHE"; + FGCorr_[0] = m_dbe->book2D(type,type,2,0,2,2,0,2); + + type = "FGCorr HF"; + FGCorr_[1] = m_dbe->book2D(type,type,2,0,2,2,0,2); + //--------------------------------------------- //-------------- TP Occupancy ---------------- @@ -106,6 +113,17 @@ void HcalTrigPrimMonitor::setup(const edm::ParameterSet& ps, DQMStore* dbe){ MissingEmul_ = m_dbe->book2D(type,type,etaBins_,etaMin_,etaMax_,phiBins_,phiMin_,phiMax_); //--------------------------------------------- + //-------------- TP Occupancy for ZS---------------- + m_dbe->setCurrentFolder(baseFolder_ + "/TP Map for ZS"); + + type = "Mismatched Et ZS"; + MismatchedEtZS_ = m_dbe->book2D(type,type,etaBins_,etaMin_,etaMax_,phiBins_,phiMin_,phiMax_); + type = "Missing Data ZS"; + MissingDataZS_ = m_dbe->book2D(type,type,etaBins_,etaMin_,etaMax_,phiBins_,phiMin_,phiMax_); + type = "Missing Emul ZS"; + MissingEmulZS_ = m_dbe->book2D(type,type,etaBins_,etaMin_,etaMax_,phiBins_,phiMin_,phiMax_); + //--------------------------------------------- + //------------ Energy Plots ------------------ // HBHE m_dbe->setCurrentFolder(baseFolder_ + "/Energy Plots/HBHE"); @@ -142,6 +160,19 @@ void HcalTrigPrimMonitor::setup(const edm::ParameterSet& ps, DQMStore* dbe){ EnergyPlotsMissingData_[1] = m_dbe->book1D(type, type, 256, 0, 256); type = "Energy HF - Missing Emul"; EnergyPlotsMissingEmul_[1] = m_dbe->book1D(type, type, 256, 0, 256); + + // ZS + m_dbe->setCurrentFolder(baseFolder_ + "/Energy Plots for ZS"); + + type = "Energy HBHE - Missing Data - ZS"; + EnergyPlotsMissingDataZS_[0] = m_dbe->book1D(type, type, 256, 0, 256); + type = "Energy HBHE - Missing Emul - ZS"; + EnergyPlotsMissingEmulZS_[0] = m_dbe->book1D(type, type, 256, 0, 256); + type = "Energy HF - Missing Data - ZS"; + EnergyPlotsMissingDataZS_[1] = m_dbe->book1D(type, type, 256, 0, 256); + type = "Energy HF - Missing Emul - ZS"; + EnergyPlotsMissingEmulZS_[1] = m_dbe->book1D(type, type, 256, 0, 256); + } return; @@ -167,7 +198,7 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, HcalBaseMonitor::processEvent(); - buildFrontEndErrMap(rawraw, emap); + //buildFrontEndErrMap(rawraw, emap); ErrorFlagPerEvent_[0] = 0; ErrorFlagPerEvent_[1] = 0; ErrorFlagPerEventZS_[0] = 0; @@ -198,14 +229,18 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, EnergyPlotsMissingEmul_[IsHF]->Fill(dataEt); } // Check ZS Alarm Threshold - if (dataTPmax > ZSAlarmThreshold_) ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMissingEmul); + if (dataTPmax > ZSAlarmThreshold_) { + ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMissingEmul); + MissingEmulZS_->Fill(ieta, iphi); + EnergyPlotsMissingEmulZS_[IsHF]->Fill(dataTPmax); + } continue; } - if (FrontEndErrors.find( data->id().rawId() ) != FrontEndErrors.end()) { + //if (FrontEndErrors.find( data->id().rawId() ) != FrontEndErrors.end()) { //Front End Format Error - continue; - } + // continue; + //} for (int i=0; i < data->size(); ++i){ @@ -233,27 +268,33 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, } //TODO: Message log Unknown errflag for debug + //if (errflag != kZeroTP) FGCorr_[IsHF]->Fill(dataFG, emulFG); // Fill histogram for non-zero TPs switch (errflag){ case kMatched: MatchedTP_->Fill(ieta, iphi); EtCorr_[IsHF]->Fill(dataEt, emulEt); + FGCorr_[IsHF]->Fill(dataFG, emulFG); break; case kMismatchedEt: MismatchedEt_->Fill(ieta, iphi); EtCorr_[IsHF]->Fill(dataEt, emulEt); + FGCorr_[IsHF]->Fill(dataFG, emulFG); break; case kMismatchedFG: MismatchedFG_->Fill(ieta, iphi); EtCorr_[IsHF]->Fill(dataEt, emulEt); + FGCorr_[IsHF]->Fill(dataFG, emulFG); EnergyPlotsMismatchedFG_[IsHF]->Fill(dataEt); break; case kDataOnly: DataOnly_->Fill(ieta, iphi); EnergyPlotsDataOnly_[IsHF]->Fill(dataEt); + break; case kEmulOnly: EmulOnly_->Fill(ieta, iphi); EnergyPlotsEmulOnly_[IsHF]->Fill(emulEt); + break; default: break; } @@ -276,17 +317,23 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, int diff = abs(data->sample(i).compressedEt() - emul->sample(i).compressedEt()); if (diff > maxdiff) maxdiff = diff; } - if (maxdiff > ZSAlarmThreshold_) ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMismatchedEt); + if (maxdiff > ZSAlarmThreshold_) { + ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMismatchedEt); + MismatchedEtZS_->Fill(ieta, iphi); + } } else { int dataEtSOI = data->SOI_compressedEt(); - int mindiff = 0; + int mindiff = 1024; for (int i=data->presamples()-1; i<=data->presamples()+1 && isize(); ++i){ if (i<0) continue; int diff = abs(emul->sample(i).compressedEt() - dataEtSOI); if (diff < mindiff) mindiff = diff; } - if (mindiff > ZSAlarmThreshold_) ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMismatchedEt); + if (mindiff > ZSAlarmThreshold_) { + ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMismatchedEt); + MismatchedEtZS_->Fill(ieta, iphi); + } } } @@ -309,12 +356,17 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, if (emulEt > emulTPmax) emulTPmax = emulEt; EnergyPlotsMissingData_[IsHF]->Fill(emulEt); } - if (emulTPmax > ZSAlarmThreshold_) ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMissingData); + if (emulTPmax > ZSAlarmThreshold_) { + ErrorFlagPerEventZS_[IsHF] |= (0x1 << kMissingData); + MissingDataZS_->Fill(ieta, iphi); + EnergyPlotsMissingDataZS_[IsHF]->Fill(emulTPmax); + } } } //loop emul TP digis // Fill Summary (Per Event) for (unsigned int IsHF=0; IsHF<=1; ++IsHF){ + // Non ZS run if (ErrorFlagPerEvent_[IsHF] == 0) { // 0 - Good = No Error Flag per event // 1 - Bad @@ -322,6 +374,8 @@ void HcalTrigPrimMonitor::processEvent(const HBHERecHitCollection& hbHits, ErrorFlagSummary_->Fill(kMatched, IsHF); } else Summary_->Fill(1, IsHF); + + // ZS run if (ErrorFlagPerEventZS_[IsHF] == 0) { SummaryZS_->Fill(0, IsHF); ErrorFlagSummaryZS_->Fill(kMatched, IsHF);