Merge pull request #33179 from davidlange6/dl210315fft

Move FFTJet to JetMETCorrections/FFTJetObjects
cms-sw · Mar 19, 2021 · add6ea7 · add6ea7
2 parents 6cc5d9b + 531310a
commit add6ea7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/JetMETCorrections/FFTJetModules/plugins/FFTJetSealModule.cc b/JetMETCorrections/FFTJetModules/plugins/FFTJetSealModule.cc
@@ -4,8 +4,7 @@
 #include "JetMETCorrections/FFTJetObjects/interface/FFTJetCorrectorSequenceRcdTypes.h"
 #include "JetMETCorrections/FFTJetObjects/interface/FFTJetLookupTableRcdTypes.h"
 #include "JetMETCorrections/FFTJetObjects/interface/FFTJetLookupTableSequence.h"
-
-#include "CondFormats/JetMETObjects/interface/FFTJet.h"
+#include "JetMETCorrections/FFTJetObjects/interface/FFTJet.h"
 
 REGISTER_PLUGIN(FFTBasicJetCorrectorSequenceRcd, FFTBasicJetCorrectorSequence);
 REGISTER_PLUGIN(FFTGenJetCorrectorSequenceRcd, FFTGenJetCorrectorSequence);

diff --git a/CondFormats/JetMETObjects/interface/FFTJet.h → ...rections/FFTJetObjects/interface/FFTJet.h b/CondFormats/JetMETObjects/interface/FFTJet.h → ...rections/FFTJetObjects/interface/FFTJet.h
@@ -1,5 +1,5 @@
-#ifndef CondFormats_JetMETObjects_FFTJET_H
-#define CondFormats_JetMETObjects_FFTJET_H
+#ifndef JetMETCorrections_FFTJetObjects_FFTJET_H
+#define JetMETCorrections_FFTJetObjects_FFTJET_H
 
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/nvp.hpp>