Update to Hcal Validation #16286
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" | ||
| #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" | ||
| #include "Geometry/CaloTopology/interface/HcalTopology.h" | ||
| #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" | ||
|
|
||
| #include <vector> | ||
| #include <utility> | ||
|
|
@@ -83,6 +84,12 @@ class HcalRecHitsAnalyzer : public DQMEDAnalyzer { | |
|
|
||
| int nChannels_[5]; // 0:any, 1:HB, 2:HE | ||
|
|
||
| int iphi_bins; | ||
|
There was a problem hiding this comment. @kencall -please end member data with a _ (seems to be the convention this code has, which is a good one) |
||
| float iphi_min, iphi_max; | ||
|
|
||
| int ieta_bins; | ||
| float ieta_min, ieta_max; | ||
|
|
||
| //RecHit Collection input tags | ||
| edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_; | ||
| edm::EDGetTokenT<HORecHitCollection> tok_ho_; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,28 +60,54 @@ HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf) { | |
|
|
||
| es.get<CaloGeometryRecord > ().get(geometry); | ||
|
|
||
| const CaloGeometry* geo = geometry.product(); | ||
|
There was a problem hiding this comment. @kencall - this is the only place I see "geometry" used? There was a problem hiding this comment. Hi David, geometry is also used in the analyze method. I've changed HcalRecHitsDQMClient so that it is no longer a member variable. |
||
| const HcalGeometry* gHB = (HcalGeometry*)(geo->getSubdetectorGeometry(DetId::Hcal,HcalBarrel)); | ||
| const HcalGeometry* gHE = (HcalGeometry*)(geo->getSubdetectorGeometry(DetId::Hcal,HcalEndcap)); | ||
| const HcalGeometry* gHO = (HcalGeometry*)(geo->getSubdetectorGeometry(DetId::Hcal,HcalOuter)); | ||
| const HcalGeometry* gHF = (HcalGeometry*)(geo->getSubdetectorGeometry(DetId::Hcal,HcalForward)); | ||
|
|
||
| nChannels_[1] = gHB->getHxSize(1); | ||
| nChannels_[2] = gHE->getHxSize(2); | ||
| nChannels_[3] = gHO->getHxSize(3); | ||
| nChannels_[4] = gHF->getHxSize(4); | ||
|
|
||
| nChannels_[0] = nChannels_[1] + nChannels_[2] + nChannels_[3] + nChannels_[4]; | ||
|
|
||
| //std::cout << "Channels HB:" << nChannels_[1] << " HE:" << nChannels_[2] << " HO:" << nChannels_[3] << " HF:" << nChannels_[4] << std::endl; | ||
|
|
||
| //We hardcode the HF depths because in the dual readout configuration, rechits are not defined for depths 3&4 | ||
| maxDepthHF_ = (maxDepthHF_ > 2 ? 2 : maxDepthHF_); //We retain the dynamic possibility that HF might have 0 or 1 depths | ||
|
|
||
| maxDepthAll_ = ( maxDepthHB_ + maxDepthHO_ > maxDepthHE_ ? maxDepthHB_ + maxDepthHO_ : maxDepthHE_ ); | ||
| maxDepthAll_ = ( maxDepthAll_ > maxDepthHF_ ? maxDepthAll_ : maxDepthHF_ ); | ||
|
|
||
| //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included. | ||
|
|
||
| int NphiMax = hcons->getNPhi(0); | ||
|
|
||
| NphiMax = (hcons->getNPhi(1) > NphiMax ? hcons->getNPhi(1) : NphiMax); | ||
| NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax); | ||
| NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax); | ||
|
|
||
| //Center the iphi bins on the integers | ||
| iphi_min = 0.5; | ||
| iphi_max = NphiMax + 0.5; | ||
| iphi_bins = (int) (iphi_max - iphi_min); | ||
|
|
||
| //Retain classic behavior, all plots have same ieta range. | ||
|
|
||
| int iEtaMax = (hcons->getEtaRange(0).second > hcons->getEtaRange(1).second ? hcons->getEtaRange(0).second : hcons->getEtaRange(1).second); | ||
| iEtaMax = (iEtaMax > hcons->getEtaRange(2).second ? iEtaMax : hcons->getEtaRange(2).second); | ||
| iEtaMax = (iEtaMax > hcons->getEtaRange(3).second ? iEtaMax : hcons->getEtaRange(3).second); | ||
|
|
||
| //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included | ||
| ieta_min = -iEtaMax - 1.5; | ||
| ieta_max = iEtaMax + 1.5; | ||
| ieta_bins = (int) (ieta_max - ieta_min); | ||
|
|
||
| } | ||
|
|
||
| void HcalRecHitsAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & /* iRun*/, edm::EventSetup const & /* iSetup */) | ||
|
|
||
| { | ||
|
|
||
|
|
@@ -92,25 +118,31 @@ HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf) { | |
| // General counters (drawn) | ||
|
|
||
| //Produce both a total per subdetector, and number of rechits per subdetector depth | ||
| // The bins are 1 unit wide, and the range is determined by the number of channels per subdetector | ||
|
|
||
| for(int depth = 0; depth <= maxDepthHB_; depth++){ | ||
| if(depth == 0){ sprintf (histo, "N_HB" );} | ||
| else{ sprintf (histo, "N_HB_depth%d",depth );} | ||
| int NBins = (int) (nChannels_[1] * 1.1); | ||
| Nhb.push_back( ibooker.book1D(histo, histo, NBins, 0., (float)NBins) ); | ||
| } | ||
| for(int depth = 0; depth <= maxDepthHE_; depth++){ | ||
| if(depth == 0){ sprintf (histo, "N_HE" );} | ||
| else{ sprintf (histo, "N_HE_depth%d",depth );} | ||
| int NBins = (int) (nChannels_[2] * 1.1); | ||
| Nhe.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) ); | ||
| } | ||
| for(int depth = 0; depth <= maxDepthHO_; depth++){ | ||
| if(depth == 0){ sprintf (histo, "N_HO" );} | ||
| else{ sprintf (histo, "N_HO_depth%d",depth );} | ||
| int NBins = (int) (nChannels_[3] * 1.1); | ||
| Nho.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) ); | ||
| } | ||
| for(int depth = 0; depth <= maxDepthHF_; depth++){ | ||
| if(depth == 0){ sprintf (histo, "N_HF" );} | ||
| else{ sprintf (histo, "N_HF_depth%d",depth );} | ||
| int NBins = (int) (nChannels_[4] * 1.1); | ||
| Nhf.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) ); | ||
| } | ||
|
|
||
| // ZS | ||
|
|
@@ -129,58 +161,58 @@ HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf) { | |
|
|
||
| for (int depth = 1; depth <= maxDepthHB_; depth++) { | ||
| sprintf (histo, "emean_vs_ieta_HB%d",depth ); | ||
| emean_vs_ieta_HB.push_back( ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2010, -10., 2000., " ") ); | ||
| } | ||
| for (int depth = 1; depth <= maxDepthHE_; depth++) { | ||
| sprintf (histo, "emean_vs_ieta_HE%d",depth ); | ||
| emean_vs_ieta_HE.push_back( ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2010, -10., 2000., " ") ); | ||
| } | ||
| for (int depth = 1; depth <= maxDepthHF_; depth++) { | ||
| sprintf (histo, "emean_vs_ieta_HF%d",depth ); | ||
| emean_vs_ieta_HF.push_back( ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2010, -10., 2000., " ") ); | ||
| } | ||
| sprintf (histo, "emean_vs_ieta_HO" ); | ||
| emean_vs_ieta_HO = ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2010, -10., 2000., " " ); | ||
|
|
||
| //The only occupancy histos drawn are occupancy vs. ieta | ||
| //but the maps are needed because this is where the latter are filled from | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHB_; depth++) { | ||
| sprintf (histo, "occupancy_map_HB%d",depth ); | ||
| occupancy_map_HB.push_back( ibooker.book2D(histo, histo, ieta_bins, ieta_min, ieta_max, iphi_bins, iphi_min, iphi_max) ); | ||
| } | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHE_; depth++) { | ||
| sprintf (histo, "occupancy_map_HE%d",depth ); | ||
| occupancy_map_HE.push_back( ibooker.book2D(histo, histo, ieta_bins, ieta_min, ieta_max, iphi_bins, iphi_min, iphi_max) ); | ||
| } | ||
|
|
||
| sprintf (histo, "occupancy_map_HO" ); | ||
| occupancy_map_HO = ibooker.book2D(histo, histo, ieta_bins, ieta_min, ieta_max, iphi_bins, iphi_min, iphi_max); | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHF_; depth++) { | ||
| sprintf (histo, "occupancy_map_HF%d",depth ); | ||
| occupancy_map_HF.push_back( ibooker.book2D(histo, histo, ieta_bins, ieta_min, ieta_max, iphi_bins, iphi_min, iphi_max) ); | ||
| } | ||
|
|
||
| //These are drawn | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHB_; depth++) { | ||
| sprintf (histo, "occupancy_vs_ieta_HB%d",depth ); | ||
| occupancy_vs_ieta_HB.push_back( ibooker.book1D(histo, histo, ieta_bins, ieta_min, ieta_max) ); | ||
| } | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHE_; depth++) { | ||
| sprintf (histo, "occupancy_vs_ieta_HE%d",depth ); | ||
| occupancy_vs_ieta_HE.push_back( ibooker.book1D(histo, histo, ieta_bins, ieta_min, ieta_max) ); | ||
| } | ||
|
|
||
| sprintf (histo, "occupancy_vs_ieta_HO" ); | ||
| occupancy_vs_ieta_HO = ibooker.book1D(histo, histo, ieta_bins, ieta_min, ieta_max); | ||
|
|
||
| for (int depth = 1; depth <= maxDepthHF_; depth++) { | ||
| sprintf (histo, "occupancy_vs_ieta_HF%d",depth ); | ||
| occupancy_vs_ieta_HF.push_back( ibooker.book1D(histo, histo, ieta_bins, ieta_min, ieta_max) ); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -225,13 +257,13 @@ HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf) { | |
| //Histograms drawn for single pion scan | ||
| if(subdet_ != 0 && imc != 0) { // just not for noise | ||
| sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths"); | ||
| meEnConeEtaProfile = ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2100, -100., 2000., " "); | ||
|
|
||
| sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E"); | ||
| meEnConeEtaProfile_E = ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2100, -100., 2000., " "); | ||
|
|
||
| sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH"); | ||
| meEnConeEtaProfile_EH = ibooker.bookProfile(histo, histo, ieta_bins, ieta_min, ieta_max, 2100, -100., 2000., " "); | ||
| } | ||
|
|
||
| // ************** HB ********************************** | ||
|
|
@@ -469,15 +501,11 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c | |
| // Filling HCAL maps ---------------------------------------------------- | ||
| // double maxE = -99999.; | ||
|
|
||
| // element 0: any depth. element 1,2,..: depth 1,2 | ||
| std::vector<int> nhb_v(maxDepthHB_+1,0); | ||
| std::vector<int> nhe_v(maxDepthHE_+1,0); | ||
| std::vector<int> nho_v(maxDepthHO_+1,0); | ||
| std::vector<int> nhf_v(maxDepthHF_+1,0); | ||
|
|
||
| for (unsigned int i = 0; i < cen.size(); i++) { | ||
|
|
||
|
|
@@ -534,6 +562,10 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c | |
| emean_vs_ieta_HE[depth-1]->Fill(double(ieta), en); | ||
| occupancy_map_HE[depth-1]->Fill(double(ieta),double(iphi)); | ||
| } | ||
| if ( sub == 3){ | ||
| emean_vs_ieta_HO->Fill(double(ieta), en); | ||
| occupancy_map_HO->Fill(double(ieta),double(iphi)); | ||
| } | ||
| if ( sub == 4){ | ||
| emean_vs_ieta_HF[depth-1]->Fill(double(ieta), en); | ||
| occupancy_map_HF[depth-1]->Fill(double(ieta),double(iphi)); | ||
|
|
@@ -737,8 +769,7 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){ | |
| int sub = cell.subdet(); | ||
| int depth = cell.depth(); | ||
| int inteta = cell.ieta(); | ||
| int intphi = cell.iphi(); | ||
| double en = j->energy(); | ||
| double t = j->time(); | ||
| int stwd = j->flags(); | ||
|
|
@@ -785,8 +816,7 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){ | |
| int sub = cell.subdet(); | ||
| int depth = cell.depth(); | ||
| int inteta = cell.ieta(); | ||
| int intphi = cell.iphi(); | ||
| double en = j->energy(); | ||
| double t = j->time(); | ||
| int stwd = j->flags(); | ||
|
|
@@ -830,8 +860,7 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){ | |
| int sub = cell.subdet(); | ||
| int depth = cell.depth(); | ||
| int inteta = cell.ieta(); | ||
| int intphi = cell.iphi(); | ||
| double t = j->time(); | ||
| double en = j->energy(); | ||
| int stwd = j->flags(); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kencall - why is this include needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are HcalGeometry objects in HcalRecHitsAnalyzer::dqmBeginRun