move TrajectoryStopReasons to DataFormats/TrackCandidate in order to …

…break circular dependence
cms-sw · Sep 2, 2020 · 0e3175b · 0e3175b
1 parent 22e8691
commit 0e3175b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/DQM/TrackingMonitor/BuildFile.xml b/DQM/TrackingMonitor/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="DQMServices/Core"/>
 <use name="CommonTools/TriggerUtils"/>
 <use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackCandidate"/>
 <use name="DataFormats/Luminosity"/>
 <use   name="DataFormats/OnlineMetaData"/>
 <use name="DataFormats/VertexReco"/>

diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc
@@ -311,7 +311,7 @@ void TrackAnalyzer::bookHistosForEfficiencyFromHitPatter(DQMStore::IBooker& iboo
   }
 }
 
-#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+#include "DataFormats/TrackCandidate/interface/TrajectoryStopReasons.h"
 void TrackAnalyzer::bookHistosForHitProperties(DQMStore::IBooker& ibooker) {
   // parameters from the configuration
   std::string QualName = conf_->getParameter<std::string>("Quality");

diff --git a/DataFormats/TrackCandidate/interface/TrackCandidate.h b/DataFormats/TrackCandidate/interface/TrackCandidate.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "DataFormats/Common/interface/OwnVector.h"
-#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+#include "DataFormats/TrackCandidate/interface/TrajectoryStopReasons.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
 #include "FWCore/Utilities/interface/Range.h"

diff --git a/...ts/TrackReco/src/TrajectoryStopReasons.cc → ...ackCandidate/src/TrajectoryStopReasons.cc b/...ts/TrackReco/src/TrajectoryStopReasons.cc → ...ackCandidate/src/TrajectoryStopReasons.cc
@@ -1,4 +1,4 @@
-#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+#include "DataFormats/TrackCandidate/interface/TrajectoryStopReasons.h"
 
 static_assert(sizeof(StopReasonName::StopReasonName) / sizeof(std::string) ==
                   static_cast<unsigned int>(StopReason::SIZE),

diff --git a/TrackingTools/PatternTools/BuildFile.xml b/TrackingTools/PatternTools/BuildFile.xml
@@ -3,6 +3,7 @@
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/GeometryVector"/>
 <use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackCandidate"/>
 <use name="DataFormats/TrackerRecHit2D"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>

diff --git a/TrackingTools/PatternTools/interface/TempTrajectory.h b/TrackingTools/PatternTools/interface/TempTrajectory.h
@@ -2,7 +2,7 @@
 #define CkfPattern_TempTrajectory_H
 
 #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
-#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+#include "DataFormats/TrackCandidate/interface/TrajectoryStopReasons.h"
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "DataFormats/Common/interface/OwnVector.h"

diff --git a/TrackingTools/PatternTools/interface/Trajectory.h b/TrackingTools/PatternTools/interface/Trajectory.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
-#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+#include "DataFormats/TrackCandidate/interface/TrajectoryStopReasons.h"
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"