Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Phase2-hgx96 Correct DetId types for HGCal #21918

Merged
merged 1 commit into from Jan 25, 2018
Merged

Phase2-hgx96 Correct DetId types for HGCal #21918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions SimCalorimetry/HGCalSimProducers/src/HGCDigitizer.cc
View file
Open in desktop
@@ -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"
Expand Down
6 changes: 2 additions & 4 deletions SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
View file
Open in desktop
Expand Up @@ -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"

Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions SimG4CMS/HGCalTestBeam/plugins/HGCalTimingAnalyzer.cc
View file
Open in desktop
Expand Up @@ -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"

Expand Down