made edits required for new file names Phase2OTHarvestReconstruction.cc and Phase2OTValidateReconstruction.cc

Author: brandiskip

Validation/SiTrackerPhase2V/plugins/Phase2OTHarvestReconstruction.cc

@@ -1,5 +1,5 @@
 // Package:    Validation/SiTrackerPhase2V
-// Class:      Phase2OTHarvestTrackingParticles
+// Class:      Phase2OTHarvestReconstruction
 
 /**
  * This class is part of the Phase 2 Tracker validation framework and performs
@@ -24,10 +24,10 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-class Phase2OTHarvestTrackingParticles : public DQMEDHarvester {
+class Phase2OTHarvestReconstruction : public DQMEDHarvester {
 public:
-  explicit Phase2OTHarvestTrackingParticles(const edm::ParameterSet &);
-  ~Phase2OTHarvestTrackingParticles() override;
+  explicit Phase2OTHarvestReconstruction(const edm::ParameterSet &);
+  ~Phase2OTHarvestReconstruction() override;
   void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) override;
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
@@ -37,14 +37,14 @@ class Phase2OTHarvestTrackingParticles : public DQMEDHarvester {
   std::string topFolderName_;
 };
 
-Phase2OTHarvestTrackingParticles::Phase2OTHarvestTrackingParticles(const edm::ParameterSet &iConfig)
+Phase2OTHarvestReconstruction::Phase2OTHarvestReconstruction(const edm::ParameterSet &iConfig)
     : topFolderName_(iConfig.getParameter<std::string>("TopFolderName")) {}
 
-Phase2OTHarvestTrackingParticles::~Phase2OTHarvestTrackingParticles() {}
+Phase2OTHarvestReconstruction::~Phase2OTHarvestReconstruction() {}
 
 // ------------ method called once each job just after ending the event loop
 // ------------
-void Phase2OTHarvestTrackingParticles::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+void Phase2OTHarvestReconstruction::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
   using namespace edm;
 
   float eta_bins[] = {0.0, 0.7, 1.0, 1.2, 1.6, 2.0, 2.4};
@@ -662,9 +662,9 @@ void Phase2OTHarvestTrackingParticles::dqmEndJob(DQMStore::IBooker &ibooker, DQM
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-void Phase2OTHarvestTrackingParticles::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+void Phase2OTHarvestReconstruction::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<std::string>("TopFolderName", "TrackerPhase2OTL1TrackV");
-  descriptions.add("Phase2OTHarvestTrackingParticles", desc);
+  descriptions.add("Phase2OTHarvestReconstruction", desc);
 }
-DEFINE_FWK_MODULE(Phase2OTHarvestTrackingParticles);
+DEFINE_FWK_MODULE(Phase2OTHarvestReconstruction);

Validation/SiTrackerPhase2V/plugins/Phase2OTValidateReconstruction.cc

@@ -1,5 +1,5 @@
 // Package:    Validation/SiTrackerPhase2V
-// Class:      Phase2OTValidateTrackingParticles
+// Class:      Phase2OTValidateReconstruction
 
 /**
  * This class is part of the Phase 2 Tracker validation framework. It validates the
@@ -54,10 +54,10 @@
 #include "SimDataFormats/Associations/interface/TTStubAssociationMap.h"
 #include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
 
-class Phase2OTValidateTrackingParticles : public DQMEDAnalyzer {
+class Phase2OTValidateReconstruction : public DQMEDAnalyzer {
 public:
-  explicit Phase2OTValidateTrackingParticles(const edm::ParameterSet &);
-  ~Phase2OTValidateTrackingParticles() override;
+  explicit Phase2OTValidateReconstruction(const edm::ParameterSet &);
+  ~Phase2OTValidateReconstruction() override;
   void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
@@ -164,7 +164,7 @@ class Phase2OTValidateTrackingParticles : public DQMEDAnalyzer {
 //
 // constructors and destructor
 //
-Phase2OTValidateTrackingParticles::Phase2OTValidateTrackingParticles(const edm::ParameterSet &iConfig)
+Phase2OTValidateReconstruction::Phase2OTValidateReconstruction(const edm::ParameterSet &iConfig)
     : m_topoToken(esConsumes()), conf_(iConfig) {
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
   trackingParticleToken_ =
@@ -188,12 +188,12 @@ Phase2OTValidateTrackingParticles::Phase2OTValidateTrackingParticles(const edm::
   TP_maxVtxZ = conf_.getParameter<double>("TP_maxVtxZ");  // max vertZ (or z0) to consider matching
 }
 
-Phase2OTValidateTrackingParticles::~Phase2OTValidateTrackingParticles() = default;
+Phase2OTValidateReconstruction::~Phase2OTValidateReconstruction() = default;
 
 // member functions
 
 // ------------ method called for each event  ------------
-void Phase2OTValidateTrackingParticles::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+void Phase2OTValidateReconstruction::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Tracking Particles
   edm::Handle<std::vector<TrackingParticle>> trackingParticleHandle;
   iEvent.getByToken(trackingParticleToken_, trackingParticleHandle);
@@ -586,9 +586,9 @@ void Phase2OTValidateTrackingParticles::analyze(const edm::Event &iEvent, const
 
 // ------------ method called once each job just before starting event loop
 // ------------
-void Phase2OTValidateTrackingParticles::bookHistograms(DQMStore::IBooker &iBooker,
-                                                       edm::Run const &run,
-                                                       edm::EventSetup const &es) {
+void Phase2OTValidateReconstruction::bookHistograms(DQMStore::IBooker &iBooker,
+                                                    edm::Run const &run,
+                                                    edm::EventSetup const &es) {
   // Histogram setup and definitions
   std::string HistoName;
   iBooker.setCurrentFolder(topFolderName_ + "/trackParticles");
@@ -1304,7 +1304,7 @@ void Phase2OTValidateTrackingParticles::bookHistograms(DQMStore::IBooker &iBooke
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-void Phase2OTValidateTrackingParticles::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+void Phase2OTValidateReconstruction::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   // OuterTrackerMonitorTrackingParticles
   edm::ParameterSetDescription desc;
   {
@@ -1425,9 +1425,9 @@ void Phase2OTValidateTrackingParticles::fillDescriptions(edm::ConfigurationDescr
   desc.add<double>("TP_minPt", 1.5);
   desc.add<double>("TP_maxEta", 2.4);
   desc.add<double>("TP_maxVtxZ", 15.0);
-  descriptions.add("Phase2OTValidateTrackingParticles", desc);
+  descriptions.add("Phase2OTValidateReconstruction", desc);
   // or use the following to generate the label from the module's C++ type
   //descriptions.addWithDefaultLabel(desc);
 }
 
-DEFINE_FWK_MODULE(Phase2OTValidateTrackingParticles);
+DEFINE_FWK_MODULE(Phase2OTValidateReconstruction);

Validation/SiTrackerPhase2V/plugins/Phase2OTValidateTTStub.cc

@@ -228,7 +228,6 @@ std::vector<double> Phase2OTValidateTTStub::getTPDerivedCoords(edm::Ptr<Tracking
   float tp_z0 = associatedTP->vertex().z();
   double tp_t = associatedTP->tanl();
   double tp_rinv = (tp_charge * bfield_) / (tp_pt);
-  std::cout << tp_rinv << std::endl;
 
   if (isBarrel) {
     tp_r = stub_r;

Validation/SiTrackerPhase2V/python/Phase2TrackerMCHarvesting_cff.py

@@ -3,7 +3,7 @@
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
 from Validation.SiTrackerPhase2V.Phase2ITRechitHarvester_cfi import *
-from Validation.SiTrackerPhase2V.Phase2OTHarvestTrackingParticles_cfi import *
+from Validation.SiTrackerPhase2V.Phase2OTHarvestReconstruction_cfi import *
 #ITTracking rechit
 #clone the rechit harvester for tracking rechit
 Phase2ITtrackingrechitHarvester=Phase2ITRechitHarvester.clone(
@@ -76,5 +76,5 @@
                                                             * Phase2OTRechitHarvester_2S
                                                             * Phase2OTTrackingRechitHarvester_PS
                                                             * Phase2OTTrackingRechitHarvester_2S
-                                                            * Phase2OTHarvestTrackingParticles
+                                                            * Phase2OTHarvestReconstruction
 )

Validation/SiTrackerPhase2V/python/Phase2ValidateL1TTObjects_cff.py

@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Validation.SiTrackerPhase2V.Phase2OTValidateTrackingParticles_cfi import * 
+from Validation.SiTrackerPhase2V.Phase2OTValidateReconstruction_cfi import * 
 from Validation.SiTrackerPhase2V.Phase2OTValidateTTStub_cfi import *
 
-trackingParticleValidOT = Phase2OTValidateTrackingParticles.clone()
+trackingParticleValidOT = Phase2OTValidateReconstruction.clone()
 
 stubValidOT = Phase2OTValidateTTStub.clone()