From c13ac4554e31202e760920b0a3f63d31ed29b749 Mon Sep 17 00:00:00 2001
From: David <David.Lange@cern.ch>
Date: Thu, 11 Jun 2020 17:17:06 +0200
Subject: [PATCH] remove CondFormats dependency from DataFormats/PatCandidates

---
 .../L1TObjects/interface/L1GtDefinitions.h    | 36 +------------------
 DataFormats/PatCandidates/BuildFile.xml       |  2 +-
 .../interface/TriggerCondition.h              |  2 +-
 PhysicsTools/NanoAOD/plugins/BuildFile.xml    |  1 +
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/CondFormats/L1TObjects/interface/L1GtDefinitions.h b/CondFormats/L1TObjects/interface/L1GtDefinitions.h
index 5fc8adeadda49..e814794cb3fae 100644
--- a/CondFormats/L1TObjects/interface/L1GtDefinitions.h
+++ b/CondFormats/L1TObjects/interface/L1GtDefinitions.h
@@ -22,6 +22,7 @@
 #include <string>
 
 // user include files
+#include "DataFormats/L1GlobalTrigger/interface/L1GtDefinitions.h"
 
 /// board types in GT
 enum L1GtBoardType { GTFE, FDL, PSB, GMT, TCS, TIM, BoardNull };
@@ -88,26 +89,6 @@ std::string l1GtPsbQuadEnumToString(const L1GtPsbQuad&);
 /// TypeBptx: BPTX (logical result only; definition in BPTX system)
 /// TypeExternal: external conditions (logical result only; definition in L1 GT external systems)
 /// Type2CorrWithOverlapRemoval: three particles, first two with spatial correlations among them, third used for removal if overlap
-enum L1GtConditionType {
-  TypeNull,
-  Type1s,
-  Type2s,
-  Type2wsc,
-  Type2cor,
-  Type3s,
-  Type4s,
-  TypeETM,
-  TypeETT,
-  TypeHTT,
-  TypeHTM,
-  TypeJetCounts,
-  TypeCastor,
-  TypeHfBitCounts,
-  TypeHfRingEtSums,
-  TypeBptx,
-  TypeExternal,
-  Type2corWithOverlapRemoval
-};
 
 struct L1GtConditionTypeStringToEnum {
   const char* label;
@@ -117,21 +98,6 @@ struct L1GtConditionTypeStringToEnum {
 L1GtConditionType l1GtConditionTypeStringToEnum(const std::string&);
 std::string l1GtConditionTypeEnumToString(const L1GtConditionType&);
 
-/// condition categories
-enum L1GtConditionCategory {
-  CondNull,
-  CondMuon,
-  CondCalo,
-  CondEnergySum,
-  CondJetCounts,
-  CondCorrelation,
-  CondCastor,
-  CondHfBitCounts,
-  CondHfRingEtSums,
-  CondBptx,
-  CondExternal,
-  CondCorrelationWithOverlapRemoval
-};
 
 struct L1GtConditionCategoryStringToEnum {
   const char* label;
diff --git a/DataFormats/PatCandidates/BuildFile.xml b/DataFormats/PatCandidates/BuildFile.xml
index d0a0b633ba94a..19f01f6ad6d10 100644
--- a/DataFormats/PatCandidates/BuildFile.xml
+++ b/DataFormats/PatCandidates/BuildFile.xml
@@ -12,7 +12,7 @@
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/BTauReco"/>
-<use name="CondFormats/L1TObjects"/>
+<use name="DataFormats/L1GlobalTrigger"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/HLTReco"/>
 <use name="DataFormats/CaloTowers"/>
diff --git a/DataFormats/PatCandidates/interface/TriggerCondition.h b/DataFormats/PatCandidates/interface/TriggerCondition.h
index fa63b224d9885..84c0d1b0fa0fa 100644
--- a/DataFormats/PatCandidates/interface/TriggerCondition.h
+++ b/DataFormats/PatCandidates/interface/TriggerCondition.h
@@ -26,7 +26,7 @@
 #include "DataFormats/Common/interface/RefProd.h"
 #include "DataFormats/Common/interface/RefVector.h"
 #include "DataFormats/Common/interface/RefVectorIterator.h"
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GtDefinitions.h"
 #include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
 
 namespace pat {
diff --git a/PhysicsTools/NanoAOD/plugins/BuildFile.xml b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
index ababa3956d953..ead809d3c1d0a 100644
--- a/PhysicsTools/NanoAOD/plugins/BuildFile.xml
+++ b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
@@ -17,6 +17,7 @@
 <use name="IOPool/Provenance"/>
 <use name="DQMServices/Core"/>
 <use name="CondFormats/BTauObjects"/>
+<use name="CondFormats/L1TObjects"/>
 <use name="CondTools/BTau"/>
 <use name="fastjet"/>
 <use name="fastjet-contrib"/>