Merge pull request #21918 from bsunanda/Phase2-hgx96

Phase2-hgx96 Correct DetId types for HGCal
cms-sw · Jan 25, 2018 · e61430c · e61430c
2 parents 7d64c7b + 5e44861
commit e61430c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/SimCalorimetry/HGCalSimProducers/src/HGCDigitizer.cc b/SimCalorimetry/HGCalSimProducers/src/HGCDigitizer.cc
@@ -1,6 +1,4 @@
 #include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCEEDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCHEDetId.h"
 #include "SimDataFormats/CaloTest/interface/HGCalTestNumbering.h"
 #include "SimCalorimetry/HGCalSimProducers/interface/HGCDigitizer.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
@@ -9,8 +9,6 @@
 // user include files
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCEEDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCHEDetId.h"
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
 #include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"
 
@@ -648,7 +646,7 @@ void HGCalTBAnalyzer::analyze(const edm::Event& iEvent,
 		  << theDigiContainers->size() << " element(s)" << std::endl;
 #endif
 	for (auto it : *theDigiContainers) {
-	  HGCEEDetId detId     = (it.id());
+	  HGCalDetId detId     = (it.id());
 	  const HGCSample&  hgcSample = it.sample(sampleIndex_);
 	  uint16_t   adc       = hgcSample.data();
 	  analyzeDigi(0, detId, adc);
@@ -664,7 +662,7 @@ void HGCalTBAnalyzer::analyze(const edm::Event& iEvent,
 		  << theDigiContainers->size() << " element(s)" << std::endl;
 #endif
 	for (auto it : *theDigiContainers) {
-	  HGCHEDetId detId     = (it.id());
+	  HGCalDetId detId     = (it.id());
 	  const HGCSample&  hgcSample = it.sample(sampleIndex_);
 	  uint16_t   adc       = hgcSample.data();
 	  analyzeDigi(1, detId, adc);

diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc
@@ -9,8 +9,6 @@
 // user include files
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCEEDetId.h"
-#include "DataFormats/ForwardDetId/interface/HGCHEDetId.h"
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
 #include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"