added switch in Approx2Approx and fixes as per PR request

Author: Ivan

DataFormats/SiStripCluster/interface/SiStripApproximateCluster.h

@@ -15,15 +15,12 @@ class SiStripApproximateCluster {
   explicit SiStripApproximateCluster(float barycenter, uint8_t width, float avgCharge) {
     barycenter_ = barycenter;
     width_ = width;
-    //if(width_>0x3F) width_=0x3F;
     avgCharge_ = avgCharge;
   }
 
   explicit SiStripApproximateCluster(const SiStripCluster& cluster) {
-    //barycenter_=std::round(cluster.barycenter());
     barycenter_ = cluster.barycenter();
     width_ = cluster.size();
-    //if(width_>0x3F) width_=0x3F;
     avgCharge_ = cluster.charge() / cluster.size();
   }
 

DataFormats/SiStripCluster/src/classes_def.xml

@@ -23,7 +23,10 @@
  <class name="edm::Wrapper<edmNew::DetSetVector<edm::Ref<edmNew::DetSetVector<SiStripCluster>,SiStripCluster,edmNew::DetSetVector<SiStripCluster>::FindForDetSetVector> > >" />
 
 
-<class name="SiStripApproximateCluster"/>
+ <class name="SiStripApproximateCluster" ClassVersion="3">
+  <version ClassVersion="3" checksum="2041370183"/>
+ </class>
+
  <class name="edmNew::DetSetVector<SiStripApproximateCluster>"/>
  <class name="edm::Wrapper<edmNew::DetSetVector<SiStripApproximateCluster>>"/>
 

RecoLocalTracker/SiStripClusterizer/BuildFile.xml

@@ -1,8 +1,10 @@
 <use name="DataFormats/Common"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
 <use name="DataFormats/SiStripDigi"/>
 <use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/Common"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
@@ -13,4 +15,4 @@
 <use name="root"/>
 <export>
   <lib name="1"/>
-</export>
+</export>

RecoLocalTracker/SiStripClusterizer/plugins/SiStripApprox2ApproxClusters.cc

@@ -4,9 +4,9 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/SiStripCluster/interface/SiStripApproximateCluster.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
@@ -24,58 +24,65 @@ class SiStripApprox2ApproxClusters : public edm::stream::EDProducer<> {
 
 private:
   edm::InputTag inputApproxClusters;
-  std::string approxVersion;
+  uint8_t approxVersion;
+  std::string approxVersionS;
   edm::EDGetTokenT<edmNew::DetSetVector<SiStripApproximateCluster>> clusterToken;
 };
 
 SiStripApprox2ApproxClusters::SiStripApprox2ApproxClusters(const edm::ParameterSet& conf) {
   inputApproxClusters = conf.getParameter<edm::InputTag>("inputApproxClusters");
-  approxVersion = conf.getParameter<std::string>("approxVersion");
-
+  approxVersionS = conf.getParameter<std::string>("approxVersion");
+  
+  approxVersion=-1;
+
+  if(approxVersionS=="ORIGINAL") approxVersion=0;
+  else if(approxVersionS=="FULL_WIDTH") approxVersion=1;
+  else if(approxVersionS=="BARY_RES_0.1") approxVersion=2;
+  else if(approxVersionS=="BARY_CHARGE_RES_0.1") approxVersion=3;
+  
   clusterToken = consumes<edmNew::DetSetVector<SiStripApproximateCluster>>(inputApproxClusters);
   produces<edmNew::DetSetVector<SiStripApproximateCluster>>();
 }
 
 void SiStripApprox2ApproxClusters::produce(edm::Event& event, edm::EventSetup const&) {
   auto result = std::make_unique<edmNew::DetSetVector<SiStripApproximateCluster>>();
-  const auto& clusters = event.get(clusterToken);
+  const auto& clusterCollection = event.get(clusterToken);
 
-  for (const auto& detClusters : *clusterCollection) {
+  for (const auto& detClusters : clusterCollection) {
     edmNew::DetSetVector<SiStripApproximateCluster>::FastFiller ff{*result, detClusters.id()};
 
     for (const auto& cluster : detClusters) {
       float barycenter = cluster.barycenter();
       uint8_t width = cluster.width();
       float avgCharge = cluster.avgCharge();
-
-      if (approxVersion == "ORIGINAL") {
-        barycenter = std::round(barycenter);
-        if (width > 0x3F)
-          width = 0x3F;
-        avgCharge = std::round(avgCharge);
-
-      } else if (approxVersion == "FULL_WIDTH") {
-        barycenter = std::round(barycenter);
-        avgCharge = std::round(avgCharge);
-
-      } else if (approxVersion == "BARY_RES_0.1") {
-        barycenter = std::round(barycenter * 10) / 10;
-        if (width > 0x3F)
-          width = 0x3F;
-        avgCharge = std::round(avgCharge);
-
-      } else if (approxVersion == "BARY_CHARGE_RES_0.1") {
-        barycenter = std::round(barycenter * 10) / 10;
-        if (width > 0x3F)
-          width = 0x3F;
-        avgCharge = std::round(avgCharge * 10) / 10;
+      
+      switch(approxVersion){
+        case 0: //ORIGINAL
+          barycenter = std::round(barycenter); 
+          if (width > 0x3F) width = 0x3F;
+          avgCharge = std::round(avgCharge);
+        break;
+        case 1: //FULL_WIDTH
+          barycenter = std::round(barycenter);
+          avgCharge = std::round(avgCharge);
+        break;
+        case 2: //BARY_RES_0.1
+          barycenter = std::round(barycenter * 10) / 10;
+          if (width > 0x3F) width = 0x3F;
+          avgCharge = std::round(avgCharge);
+        break;
+        case 3: //BARY_CHARGE_RES_0.1
+          barycenter = std::round(barycenter * 10) / 10;
+          if (width > 0x3F) width = 0x3F;
+          avgCharge = std::round(avgCharge * 10) / 10;
+        break;
       }
-
+      
       ff.push_back(SiStripApproximateCluster(barycenter, width, avgCharge));
     }
   }
 
-  e.put(std::move(result));
+  event.put(std::move(result));
 }
 
 void SiStripApprox2ApproxClusters::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {

RecoLocalTracker/SiStripClusterizer/plugins/SiStripClusters2ApproxClusters.cc

@@ -41,20 +41,19 @@ SiStripClusters2ApproxClusters::SiStripClusters2ApproxClusters(const edm::Parame
 
 }
 
-void SiStripClusters2ApproxClusters::produce(edm::Event& e, edm::EventSetup const&){
+void SiStripClusters2ApproxClusters::produce(edm::Event& event, edm::EventSetup const&){
   auto result = std::make_unique<edmNew::DetSetVector< SiStripApproximateCluster > >();
-  edm::Handle<edmNew::DetSetVector< SiStripCluster >> clusterCollection = e.getHandle(clusterToken);
+  const auto& clusterCollection = event.get(clusterToken);
 
 
-  for ( const auto& detClusters : *clusterCollection ) {
-    std::vector< SiStripApproximateCluster > tempVec;    
+  for ( const auto& detClusters : clusterCollection ) {
     edmNew::DetSetVector<SiStripApproximateCluster>::FastFiller ff{*result, detClusters.id()};
 
     for ( const auto& cluster : detClusters ) ff.push_back(SiStripApproximateCluster(cluster));
 
   }
 
-  e.put(std::move(result));
+  event.put(std::move(result));
 }
 
 void SiStripClusters2ApproxClusters::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {