update dataformat class names

cms-sw · Nov 1, 2021 · 66eb6e8 · 66eb6e8
1 parent 99a1611
commit 66eb6e8
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 72 deletions.
diff --git a/...MuonReco/interface/MuonShowerCSCCluster.h → ...MuonReco/interface/MuonCSCRecHitCluster.h b/...MuonReco/interface/MuonShowerCSCCluster.h → ...MuonReco/interface/MuonCSCRecHitCluster.h
@@ -1,26 +1,26 @@
-#ifndef DataFormats_MuonShowerCSCCluster_h
-#define DataFormats_MuonShowerCSCCluster_h
+#ifndef DataFormats_MuonCSCRecHitCluster_h
+#define DataFormats_MuonCSCRecHitCluster_h
 
 #include <vector>
 #include "DataFormats/Common/interface/SortedCollection.h"
 
 #include <DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h>
-#include "DataFormats/MuonReco/interface/MuonShowerCluster.h"
+#include "DataFormats/MuonReco/interface/MuonRecHitCluster.h"
 
 namespace reco {
 
-  class MuonShowerCSCCluster : public MuonShowerCluster {
+  class MuonCSCRecHitCluster : public MuonRecHitCluster {
   public:
     typedef edm::Ref<CSCRecHit2DCollection>  rechitRef;
     typedef std::vector<rechitRef>  rechits;
 
     //default constructor
-    MuonShowerCSCCluster(){}
+    MuonCSCRecHitCluster(){}
 
-    MuonShowerCSCCluster(const float x, const float y,const float z, const int size, const float time, const int nME11_12, rechits rh);
+    MuonCSCRecHitCluster(const float x, const float y,const float z, const int size, const float time, const int nME11_12, rechits rh);
 
     //destructor
-    ~MuonShowerCSCCluster() ;
+    ~MuonCSCRecHitCluster() ;
 
     int nME11_12() const {return nME11_12_;}
     float time()   const {return time_;}
@@ -33,10 +33,10 @@ namespace reco {
     int nME11_12_;     
 
   };
-  inline void MuonShowerCSCCluster::addDaughter( const rechitRef & cand ) { 
+  inline void MuonCSCRecHitCluster::addDaughter( const rechitRef & cand ) { 
     rechits_.push_back( cand ); 
   }
 
-   typedef std::vector<MuonShowerCSCCluster> MuonShowerCSCClusterCollection;
+   typedef std::vector<MuonCSCRecHitCluster> MuonCSCRecHitClusterCollection;
 }
 #endif
diff --git a/.../MuonReco/interface/MuonShowerDTCluster.h → .../MuonReco/interface/MuonDTRecHitCluster.h b/.../MuonReco/interface/MuonShowerDTCluster.h → .../MuonReco/interface/MuonDTRecHitCluster.h
@@ -1,26 +1,26 @@
-#ifndef DataFormats_MuonShowerDTCluster_h
-#define DataFormats_MuonShowerDTCluster_h
+#ifndef DataFormats_MuonDTRecHitCluster_h
+#define DataFormats_MuonDTRecHitCluster_h
 
 #include <vector>
 #include "DataFormats/Common/interface/SortedCollection.h"
 
 #include <DataFormats/DTRecHit/interface/DTRecHitCollection.h>
-#include "DataFormats/MuonReco/interface/MuonShowerCluster.h"
+#include "DataFormats/MuonReco/interface/MuonRecHitCluster.h"
 
 namespace reco {
 
-  class MuonShowerDTCluster : public MuonShowerCluster {
+  class MuonDTRecHitCluster : public MuonRecHitCluster {
   public:
     typedef edm::Ref<DTRecHitCollection>  rechitRef;
     typedef std::vector<rechitRef>  rechits;
 
     //default constructor
-    MuonShowerDTCluster(){}
+    MuonDTRecHitCluster(){}
 
-    MuonShowerDTCluster(const float x, const float y,const float z, const int size, const int nMB1, rechits rh);
+    MuonDTRecHitCluster(const float x, const float y,const float z, const int size, const int nMB1, rechits rh);
 
     //destructor
-    ~MuonShowerDTCluster() ;
+    ~MuonDTRecHitCluster() ;
 
     int nMB1() const {return nMB1_;}
     void addDaughter(const rechitRef &);
@@ -31,10 +31,10 @@ namespace reco {
     int nMB1_;     
 
   };
-  inline void MuonShowerDTCluster::addDaughter( const rechitRef & cand ) { 
+  inline void MuonDTRecHitCluster::addDaughter( const rechitRef & cand ) { 
     rechits_.push_back( cand ); 
   }
 
-   typedef std::vector<MuonShowerDTCluster> MuonShowerDTClusterCollection;
+   typedef std::vector<MuonDTRecHitCluster> MuonDTRecHitClusterCollection;
 }
 #endif
diff --git a/...ts/MuonReco/interface/MuonShowerCluster.h → ...ts/MuonReco/interface/MuonRecHitCluster.h b/...ts/MuonReco/interface/MuonShowerCluster.h → ...ts/MuonReco/interface/MuonRecHitCluster.h
@@ -1,5 +1,5 @@
-#ifndef DataFormats_MuonShowerCluster_h
-#define DataFormats_MuonShowerCluster_h
+#ifndef DataFormats_MuonRecHitCluster_h
+#define DataFormats_MuonRecHitCluster_h
 
 #include <vector>
 #include "DataFormats/Common/interface/SortedCollection.h"
@@ -8,17 +8,17 @@
 
 namespace reco {
 
-  class MuonShowerCluster  {
+  class MuonRecHitCluster  {
   public:
 
     typedef math::XYZVector Vector;
     //default constructor
-    MuonShowerCluster():x_(0),y_(0),z_(0),size_(0){}
+    MuonRecHitCluster():x_(0),y_(0),z_(0),size_(0){}
 
-    MuonShowerCluster(const float x, const float y, const float z, const int size);
+    MuonRecHitCluster(const float x, const float y, const float z, const int size);
 
     //destructor
-    ~MuonShowerCluster() ;
+    ~MuonRecHitCluster() ;
 
     double eta()   const {return Vector(x_,y_,z_).eta();}
     double phi()   const {return Vector(x_,y_,z_).phi();}
@@ -36,6 +36,6 @@ namespace reco {
 
   };
 
-   typedef std::vector<MuonShowerCluster> MuonShowerClusterCollection;
+   typedef std::vector<MuonRecHitCluster> MuonRecHitClusterCollection;
 }
 #endif
diff --git a/...mats/MuonReco/src/MuonShowerCSCCluster.cc → ...mats/MuonReco/src/MuonCSCRecHitCluster.cc b/...mats/MuonReco/src/MuonShowerCSCCluster.cc → ...mats/MuonReco/src/MuonCSCRecHitCluster.cc
@@ -1,13 +1,13 @@
-#include "DataFormats/MuonReco/interface/MuonShowerCSCCluster.h"
+#include "DataFormats/MuonReco/interface/MuonCSCRecHitCluster.h"
 
 /*
  * Create LeafCandidate with (eta,phi) only as CSC rechits has no energy/momentum measurement
  * Pt is set to 1.0 as a place holder, mass is set at 0.
  * Vertex associated with the CSC rechit is set to the origin.
  *
  */
-reco::MuonShowerCSCCluster::MuonShowerCSCCluster(const float x,const float y,const float z,const int size, const float time,const int nME11_12, rechits rh)
-: MuonShowerCluster(x,y,z,size){
+reco::MuonCSCRecHitCluster::MuonCSCRecHitCluster(const float x,const float y,const float z,const int size, const float time,const int nME11_12, rechits rh)
+: MuonRecHitCluster(x,y,z,size){
 
   time_     = time;
   nME11_12_ = nME11_12;
@@ -17,6 +17,6 @@ reco::MuonShowerCSCCluster::MuonShowerCSCCluster(const float x,const float y,con
 
 }
 
-reco::MuonShowerCSCCluster::~MuonShowerCSCCluster() {
+reco::MuonCSCRecHitCluster::~MuonCSCRecHitCluster() {
 
 }
diff --git a/DataFormats/MuonReco/src/MuonDTRecHitCluster.cc b/DataFormats/MuonReco/src/MuonDTRecHitCluster.cc
@@ -0,0 +1,15 @@
+#include "DataFormats/MuonReco/interface/MuonDTRecHitCluster.h"
+
+reco::MuonDTRecHitCluster::MuonDTRecHitCluster(const float x,const float y,const float z,const int size,const int nMB1, rechits rh)
+: MuonRecHitCluster(x,y,z,size){
+
+  nMB1_ = nMB1;
+  for(unsigned i=0; i< rh.size();i++){
+    addDaughter(rh[i]);
+  }   
+
+}
+
+reco::MuonDTRecHitCluster::~MuonDTRecHitCluster() {
+
+}
diff --git a/DataFormats/MuonReco/src/MuonRecHitCluster.cc b/DataFormats/MuonReco/src/MuonRecHitCluster.cc
@@ -0,0 +1,13 @@
+#include "DataFormats/MuonReco/interface/MuonRecHitCluster.h"
+
+reco::MuonRecHitCluster::MuonRecHitCluster(const float x,const float y, const float z,const int size){
+    x_  = x;
+    y_  = y;
+    z_  = z;
+    size_ = size;
+
+}
+
+reco::MuonRecHitCluster::~MuonRecHitCluster() {
+
+}
diff --git a/DataFormats/MuonReco/src/MuonShowerCluster.cc b/DataFormats/MuonReco/src/MuonShowerCluster.cc
diff --git a/DataFormats/MuonReco/src/MuonShowerDTCluster.cc b/DataFormats/MuonReco/src/MuonShowerDTCluster.cc
diff --git a/DataFormats/MuonReco/src/classes.h b/DataFormats/MuonReco/src/classes.h
@@ -20,9 +20,9 @@
 #include "DataFormats/MuonReco/interface/MuonQuality.h"
 #include "DataFormats/MuonReco/interface/MuonCosmicCompatibility.h"
 #include "DataFormats/MuonReco/interface/MuonShower.h"
-#include "DataFormats/MuonReco/interface/MuonShowerCluster.h"
-#include "DataFormats/MuonReco/interface/MuonShowerCSCCluster.h"
-#include "DataFormats/MuonReco/interface/MuonShowerDTCluster.h"
+#include "DataFormats/MuonReco/interface/MuonRecHitCluster.h"
+#include "DataFormats/MuonReco/interface/MuonCSCRecHitCluster.h"
+#include "DataFormats/MuonReco/interface/MuonDTRecHitCluster.h"
 #include "DataFormats/MuonReco/interface/MuonToMuonMap.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/Common/interface/AssociationMap.h"

diff --git a/DataFormats/MuonReco/src/classes_def.xml b/DataFormats/MuonReco/src/classes_def.xml
@@ -164,23 +164,23 @@ initial version number of a class which has never been stored before.
   </class>
   <class name="edm::Wrapper<edm::ValueMap<reco::MuonShower> >"/>
 
-  <class name="reco::MuonShowerCluster" ClassVersion="3">
-    <version ClassVersion="3" checksum="3059705349"/>
+  <class name="reco::MuonRecHitCluster" ClassVersion="3">
+    <version ClassVersion="3" checksum="523874514"/>
   </class>
-  <class name="std::vector<reco::MuonShowerCluster>"/>
-  <class name="edm::Wrapper<std::vector<reco::MuonShowerCluster>>"/>
+  <class name="std::vector<reco::MuonRecHitCluster>"/>
+  <class name="edm::Wrapper<std::vector<reco::MuonRecHitCluster>>"/>
 
-  <class name="reco::MuonShowerCSCCluster" ClassVersion="3">
-    <version ClassVersion="3" checksum="2249034585"/>
+  <class name="reco::MuonCSCRecHitCluster" ClassVersion="3">
+    <version ClassVersion="3" checksum="3358963912"/>
   </class>
-  <class name="std::vector<reco::MuonShowerCSCCluster>"/>
-  <class name="edm::Wrapper<std::vector<reco::MuonShowerCSCCluster>>"/>
+  <class name="std::vector<reco::MuonCSCRecHitCluster>"/>
+  <class name="edm::Wrapper<std::vector<reco::MuonCSCRecHitCluster>>"/>
 
-  <class name="reco::MuonShowerDTCluster" ClassVersion="3">
-    <version ClassVersion="3" checksum="704495656"/>
+  <class name="reco::MuonDTRecHitCluster" ClassVersion="3">
+    <version ClassVersion="3" checksum="2361277099"/>
   </class>
-  <class name="std::vector<reco::MuonShowerDTCluster>"/>
-  <class name="edm::Wrapper<std::vector<reco::MuonShowerDTCluster>>"/>
+  <class name="std::vector<reco::MuonDTRecHitCluster>"/>
+  <class name="edm::Wrapper<std::vector<reco::MuonDTRecHitCluster>>"/>