Merge pull request #23239 from mrodozov/check-headers-fix-EventFilter…

…-second fix headers in EventFilter_pkgs
cms-sw · May 22, 2018 · 9a83efa · 9a83efa
2 parents 3de268f + e5ec639
commit 9a83efa
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 4 deletions.
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloTokens.h
@@ -15,8 +15,7 @@
 #include "DataFormats/L1CaloTrigger/interface/L1CaloRegionDetId.h"
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
-
-
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFTokens.h
@@ -4,6 +4,7 @@
 #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambPhContainer.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambThContainer.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h
@@ -4,6 +4,7 @@
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h
@@ -7,6 +7,7 @@
 #include "DataFormats/L1Trigger/interface/Tau.h"
 #include "DataFormats/L1Trigger/interface/Muon.h"
 
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h
@@ -1,4 +1,3 @@
-
 #ifndef EventFilter_L1TRawToDigi_EMTFTokens_h
 #define EventFilter_L1TRawToDigi_EMTFTokens_h
 
@@ -7,7 +6,7 @@
 #include "DataFormats/L1TMuon/interface/EMTFHit.h"
 #include "DataFormats/L1TMuon/interface/EMTFTrack.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
-
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h
@@ -2,6 +2,8 @@
 #define EventFilter_L1TRawToDigi_stage2_IntermediateMuonUnpacker_h
 
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
+#include <map>
+#include "DataFormats/L1Trigger/interface/Muon.h"
 
 namespace l1t {
    namespace stage2 {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h
@@ -1,6 +1,7 @@
 #ifndef L1T_PACKER_STAGE2_MUONPACKER_H
 #define L1T_PACKER_STAGE2_MUONPACKER_H
 
+#include <map>
 #include "EventFilter/L1TRawToDigi/interface/Packer.h"
 
 namespace l1t {

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h
@@ -1,6 +1,13 @@
 #ifndef L1T_PACKER_STAGE2_REGIONALMUONGMTPACKER_H
 #define L1T_PACKER_STAGE2_REGIONALMUONGMTPACKER_H
 
+#include <vector>
+#include <map>
+#include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
+#include "EventFilter/L1TRawToDigi/interface/Block.h"
+#include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
+#include "FWCore/Framework/interface/Event.h"
+
 namespace l1t {
    namespace stage2 {
       class RegionalMuonGMTPacker : public Packer {