Remove shape class in clusters

cms-sw · Jun 29, 2020 · b1c523f · b1c523f
1 parent 7421979
commit b1c523f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/DataFormats/L1THGCal/interface/HGCalClusterT.h b/DataFormats/L1THGCal/interface/HGCalClusterT.h
@@ -6,7 +6,6 @@
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/L1Trigger/interface/L1Candidate.h"
 #include "DataFormats/L1THGCal/interface/HGCalTriggerCell.h"
-#include "DataFormats/L1THGCal/interface/ClusterShapes.h"
 #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/ForwardDetId/interface/HGCalTriggerDetId.h"
@@ -102,9 +101,6 @@ namespace l1t {
     const GlobalPoint& centre() const { return centre_; }
     const GlobalPoint& centreProj() const { return centreProj_; }
 
-    // FIXME: will need to fix places where the shapes are directly accessed
-    // Right now keep shapes() getter as non-const
-    ClusterShapes& shapes() { return shapes_; }
     double hOverE() const {
       double pt_em = 0.;
       double pt_had = 0.;
@@ -228,8 +224,6 @@ namespace l1t {
     float triggerCells67percent_ = 0.;
     float triggerCells90percent_ = 0.;
 
-    ClusterShapes shapes_;
-
     void updateP4AndPosition(const edm::Ptr<C>& c, bool updateCentre = true, float fraction = 1.) {
       double cMipt = c->mipPt() * fraction;
       double cPt = c->pt() * fraction;

diff --git a/DataFormats/L1THGCal/src/classes_def.xml b/DataFormats/L1THGCal/src/classes_def.xml
@@ -30,7 +30,8 @@
 
   <class name="l1t::HGCalClusterT<l1t::HGCalTriggerCell>" />
   <class name="l1t::HGCalClusterT<l1t::HGCalTriggerSums>" />
-  <class name="l1t::HGCalCluster" ClassVersion="17">
+  <class name="l1t::HGCalCluster" ClassVersion="18">
+   <version ClassVersion="18" checksum="3346067797"/>
    <version ClassVersion="17" checksum="2841504063"/>
    <version ClassVersion="16" checksum="1572558185"/>
   <version ClassVersion="15" checksum="2522149132"/>
@@ -46,7 +47,8 @@
 
   <class name="l1t::HGCalClusterT<l1t::HGCalCluster>" />
 
-  <class name="l1t::HGCalMulticluster" ClassVersion="18">
+  <class name="l1t::HGCalMulticluster" ClassVersion="19">
+   <version ClassVersion="19" checksum="2270821353"/>
    <version ClassVersion="18" checksum="3914904215"/>
    <version ClassVersion="17" checksum="460658789"/>
   <version ClassVersion="16" checksum="1276395758"/>