Merge pull request #35738 from rovere/RemoveObsoleteDigiCollections

Remove obsolete Digi collections
cms-sw · Oct 27, 2021 · fa163d7 · fa163d7
2 parents 24176c0 + b818efc
commit fa163d7
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 123 deletions.
diff --git a/Configuration/ProcessModifiers/python/convertHGCalDigisReco_cff.py b/Configuration/ProcessModifiers/python/convertHGCalDigisReco_cff.py
diff --git a/DataFormats/HGCDigi/interface/HGCDigiCollections.h b/DataFormats/HGCDigi/interface/HGCDigiCollections.h
@@ -5,18 +5,8 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
 #include "DataFormats/HGCDigi/interface/HGCDataFrame.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HGCDigi/interface/HGCSample.h"
 
-typedef HGCDataFrame<HGCalDetId, HGCSample> HGCEEDataFrame;
-typedef edm::SortedCollection<HGCEEDataFrame> HGCEEDigiCollection;
-
-typedef HGCDataFrame<HGCalDetId, HGCSample> HGCHEDataFrame;
-typedef edm::SortedCollection<HGCHEDataFrame> HGCHEDigiCollection;
-
-typedef HGCDataFrame<HcalDetId, HGCSample> HGCBHDataFrame;
-typedef edm::SortedCollection<HGCBHDataFrame> HGCBHDigiCollection;
-
 typedef HGCDataFrame<DetId, HGCSample> HGCalDataFrame;
 typedef edm::SortedCollection<HGCalDataFrame> HGCalDigiCollection;
 

diff --git a/DataFormats/HGCDigi/src/classes_def.xml b/DataFormats/HGCDigi/src/classes_def.xml
@@ -17,18 +17,6 @@
    <class name="edm::SortedCollection<HGCDataFrame<DetId,HGCSample>, edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > >"/>
    <class name="edm::Wrapper<edm::SortedCollection<HGCDataFrame<DetId,HGCSample>,edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > > >" />
 
-   <!-- HEX specific -->
-   <class name="HGCDataFrame<HGCalDetId,HGCSample>"/>
-   <class name="std::vector<HGCDataFrame<HGCalDetId,HGCSample> >"/>
-   <class name="edm::SortedCollection<HGCDataFrame<HGCalDetId,HGCSample>, edm::StrictWeakOrdering<HGCDataFrame<HGCalDetId,HGCSample> > >"/>
-   <class name="edm::Wrapper<edm::SortedCollection<HGCDataFrame<HGCalDetId,HGCSample>,edm::StrictWeakOrdering<HGCDataFrame<HGCalDetId,HGCSample> > > >" />
-
-   <!-- BH specific -->
-   <class name="HGCDataFrame<HcalDetId,HGCSample>"/>
-   <class name="std::vector<HGCDataFrame<HcalDetId,HGCSample> >"/>
-   <class name="edm::SortedCollection<HGCDataFrame<HcalDetId,HGCSample>, edm::StrictWeakOrdering<HGCDataFrame<HcalDetId,HGCSample> > >"/>
-   <class name="edm::Wrapper<edm::SortedCollection<HGCDataFrame<HcalDetId,HGCSample>,edm::StrictWeakOrdering<HGCDataFrame<HcalDetId,HGCSample> > > >" />
-
    <class name="PHGCSimAccumulator"/>
    <class name="PHGCSimAccumulator::DetIdSize"/>
    <class name="PHGCSimAccumulator::SimHitCollection"/>

diff --git a/EventFilter/HGCalRawToDigi/plugins/HGCDigiConverter.cc b/EventFilter/HGCalRawToDigi/plugins/HGCDigiConverter.cc
diff --git a/EventFilter/HGCalRawToDigi/python/HGCalRawToDigi_cfi.py b/EventFilter/HGCalRawToDigi/python/HGCalRawToDigi_cfi.py
@@ -7,11 +7,6 @@
 
 hfnoseDigis = EventFilter.HGCalRawToDigi.HFNoseRawToDigiFake_cfi.HFNoseRawToDigiFake.clone()
 
-from Configuration.ProcessModifiers.convertHGCalDigisReco_cff import convertHGCalDigisReco
-import EventFilter.HGCalRawToDigi.HGCDigiConverter_cfi
-_hgcalDigisConverted = EventFilter.HGCalRawToDigi.HGCDigiConverter_cfi.HGCDigiConverter.clone()
-convertHGCalDigisReco.toReplaceWith(hgcalDigis,_hgcalDigisConverted)
-
 from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
 premix_stage2.toModify(hgcalDigis,
     eeDigis = 'mixData:HGCDigisEE',

diff --git a/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc b/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc
@@ -41,8 +41,6 @@ void HGCalVFEProcessorSums::run(const HGCalDigiCollection& digiColl,
 
   // Remove disconnected modules and invalid cells
   for (const auto& digiData : digiColl) {
-    if (DetId(digiData.id()).det() == DetId::Hcal && HcalDetId(digiData.id()).subdetId() != HcalEndcap)
-      continue;
     if (!geometry()->validCell(digiData.id()))
       continue;
     uint32_t module = geometry()->getModuleFromCell(digiData.id());

diff --git a/SimCalorimetry/HGCalSimProducers/src/HGCFEElectronics.cc b/SimCalorimetry/HGCalSimProducers/src/HGCFEElectronics.cc
@@ -474,6 +474,4 @@ void HGCFEElectronics<DFr>::runShaperWithToT(DFr& dataFrame,
 
 // cause the compiler to generate the appropriate code
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
-template class HGCFEElectronics<HGCEEDataFrame>;
-template class HGCFEElectronics<HGCBHDataFrame>;
 template class HGCFEElectronics<HGCalDataFrame>;