Merge pull request #31345 from davidlange6/dl200903circ2

move CalibTracker/SiStripCommon plugin headers out of interface to avoid circular dependency
cms-sw · Sep 7, 2020 · a2e0b04 · a2e0b04
2 parents 2d41a27 + f072a18
commit a2e0b04
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 17 deletions.
diff --git a/CalibTracker/SiStripCommon/plugins/BuildFile.xml b/CalibTracker/SiStripCommon/plugins/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="DataFormats/L1GlobalTrigger"/>
 <use name="TrackingTools/TrackFitters"/>
 <use name="CalibTracker/SiStripCommon"/>
+<use name="CalibFormats/SiStripObjects"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RunInfo"/>

diff --git 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
@@ -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/...ipCommon/interface/ShallowDigisProducer.h → ...tripCommon/plugins/ShallowDigisProducer.h b/...ipCommon/interface/ShallowDigisProducer.h → ...tripCommon/plugins/ShallowDigisProducer.h
diff --git 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/...mmon/interface/ShallowEventDataProducer.h → ...Common/plugins/ShallowEventDataProducer.h b/...mmon/interface/ShallowEventDataProducer.h → ...Common/plugins/ShallowEventDataProducer.h
diff --git a/...Common/interface/ShallowExampleProducer.h → ...ipCommon/plugins/ShallowExampleProducer.h b/...Common/interface/ShallowExampleProducer.h → ...ipCommon/plugins/ShallowExampleProducer.h
diff --git 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/...Common/interface/ShallowGainCalibration.h → ...ipCommon/plugins/ShallowGainCalibration.h b/...Common/interface/ShallowGainCalibration.h → ...ipCommon/plugins/ShallowGainCalibration.h
diff --git 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/...interface/ShallowRechitClustersProducer.h → ...n/plugins/ShallowRechitClustersProducer.h b/...interface/ShallowRechitClustersProducer.h → ...n/plugins/ShallowRechitClustersProducer.h
diff --git 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/...interface/ShallowSimhitClustersProducer.h → ...n/plugins/ShallowSimhitClustersProducer.h b/...interface/ShallowSimhitClustersProducer.h → ...n/plugins/ShallowSimhitClustersProducer.h
diff --git 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/.../interface/ShallowTrackClustersProducer.h → ...on/plugins/ShallowTrackClustersProducer.h b/.../interface/ShallowTrackClustersProducer.h → ...on/plugins/ShallowTrackClustersProducer.h
diff --git 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"
@@ -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));

diff --git a/...pCommon/interface/ShallowTracksProducer.h → ...ripCommon/plugins/ShallowTracksProducer.h b/...pCommon/interface/ShallowTracksProducer.h → ...ripCommon/plugins/ShallowTracksProducer.h
diff --git 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/...ker/SiStripCommon/interface/ShallowTree.h → ...acker/SiStripCommon/plugins/ShallowTree.h b/...ker/SiStripCommon/interface/ShallowTree.h → ...acker/SiStripCommon/plugins/ShallowTree.h