From fe932a957f4542b20f34918266225cd84298ef42 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 3 Sep 2020 10:06:23 +0200 Subject: [PATCH 1/2] move plugin headers out of interface to avoid circular dependency --- CalibTracker/SiStripCommon/plugins/BuildFile.xml | 1 + .../SiStripCommon/plugins/SealModules.cc | 16 ++++++++-------- .../plugins/ShallowDigisProducer.cc | 2 +- .../ShallowDigisProducer.h | 0 .../plugins/ShallowEventDataProducer.cc | 2 +- .../ShallowEventDataProducer.h | 0 .../ShallowExampleProducer.h | 0 .../plugins/ShallowGainCalibration.cc | 2 +- .../ShallowGainCalibration.h | 0 .../plugins/ShallowRechitClustersProducer.cc | 2 +- .../ShallowRechitClustersProducer.h | 0 .../plugins/ShallowSimhitClustersProducer.cc | 2 +- .../ShallowSimhitClustersProducer.h | 0 .../plugins/ShallowTrackClustersProducer.cc | 2 +- .../ShallowTrackClustersProducer.h | 0 .../plugins/ShallowTracksProducer.cc | 2 +- .../ShallowTracksProducer.h | 0 .../SiStripCommon/plugins/ShallowTree.cc | 2 +- .../{interface => plugins}/ShallowTree.h | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowDigisProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowEventDataProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowExampleProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowGainCalibration.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowRechitClustersProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowSimhitClustersProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowTrackClustersProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowTracksProducer.h (100%) rename CalibTracker/SiStripCommon/{interface => plugins}/ShallowTree.h (100%) diff --git a/CalibTracker/SiStripCommon/plugins/BuildFile.xml b/CalibTracker/SiStripCommon/plugins/BuildFile.xml index 4fd409ebedef6..2d4b1ad2bcbe4 100644 --- a/CalibTracker/SiStripCommon/plugins/BuildFile.xml +++ b/CalibTracker/SiStripCommon/plugins/BuildFile.xml @@ -1,6 +1,7 @@ + diff --git a/CalibTracker/SiStripCommon/plugins/SealModules.cc b/CalibTracker/SiStripCommon/plugins/SealModules.cc index c144ac1e3b6b9..6613d45b91294 100644 --- a/CalibTracker/SiStripCommon/plugins/SealModules.cc +++ b/CalibTracker/SiStripCommon/plugins/SealModules.cc @@ -5,14 +5,14 @@ DEFINE_FWK_MODULE(SiStripDetInfoFileWriter); -#include "CalibTracker/SiStripCommon/interface/ShallowTree.h" -#include "CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h" -#include "CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h" +#include "ShallowTree.h" +#include "ShallowEventDataProducer.h" +#include "ShallowDigisProducer.h" +#include "ShallowTrackClustersProducer.h" +#include "ShallowRechitClustersProducer.h" +#include "ShallowSimhitClustersProducer.h" +#include "ShallowTracksProducer.h" +#include "ShallowGainCalibration.h" #include "ShallowSimTracksProducer.h" DEFINE_FWK_MODULE(ShallowTree); diff --git a/CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.cc index e96f15581d159..c0c6c733a091f 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h" +#include "ShallowDigisProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowDigisProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc index eb9d0be4d432e..305b067dff969 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h" +#include "ShallowEventDataProducer.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.h diff --git a/CalibTracker/SiStripCommon/interface/ShallowExampleProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowExampleProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowExampleProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowExampleProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.cc b/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.cc index abc67edfe531b..791d1746cfb31 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h" +#include "ShallowGainCalibration.h" using namespace edm; using namespace reco; diff --git a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h b/CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h rename to CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc index f894fa2ef2213..e066faf1da20e 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h" +#include "ShallowRechitClustersProducer.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc index 38184f42a44a0..97e442466b0f0 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h" +#include "ShallowSimhitClustersProducer.h" #include "CalibTracker/SiStripCommon/interface/ShallowTools.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc index 87145e29fce92..1224e0d575fa4 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h" +#include "ShallowTrackClustersProducer.h" #include "CalibTracker/SiStripCommon/interface/ShallowTools.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc index 984cc90740eec..09cb415e5e6b3 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h" +#include "ShallowTracksProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h rename to CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.h diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTree.cc b/CalibTracker/SiStripCommon/plugins/ShallowTree.cc index 360e3dd160259..05a160baf8c4d 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTree.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTree.cc @@ -1,4 +1,4 @@ -#include "CalibTracker/SiStripCommon/interface/ShallowTree.h" +#include "ShallowTree.h" #include "FWCore/Framework/interface/ConstProductRegistry.h" #include "FWCore/Framework/interface/ProductSelector.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowTree.h b/CalibTracker/SiStripCommon/plugins/ShallowTree.h similarity index 100% rename from CalibTracker/SiStripCommon/interface/ShallowTree.h rename to CalibTracker/SiStripCommon/plugins/ShallowTree.h From f072a18c76f3edb0040ee275c2f0f14d10de8359 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 3 Sep 2020 10:20:06 +0200 Subject: [PATCH 2/2] code checks --- CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc index 09cb415e5e6b3..5371578fbb1f4 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc @@ -121,7 +121,7 @@ void ShallowTracksProducer::produce(edm::StreamID, edm::Event& iEvent, const edm algo.push_back((int)track.algo()); } - iEvent.emplace(numberPut_, std::move(number)); + iEvent.emplace(numberPut_, number); iEvent.emplace(chi2Put_, std::move(chi2)); iEvent.emplace(ndofPut_, std::move(ndof)); iEvent.emplace(chi2ndofPut_, std::move(chi2ndof));