cms-sw · davidlange6 · Mar 11, 2015 · Mar 6, 2015 · Mar 6, 2015
diff --git a/DQM/HcalMonitorTasks/src/HcalNoiseMonitor.cc b/DQM/HcalMonitorTasks/src/HcalNoiseMonitor.cc
@@ -18,7 +18,7 @@
 #include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 
 #include "CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "FWCore/Common/interface/TriggerNames.h"
 

diff --git a/DQM/HcalMonitorTasks/src/HcalRecHitMonitor.cc b/DQM/HcalMonitorTasks/src/HcalRecHitMonitor.cc
@@ -6,7 +6,7 @@
 
 #include "CalibCalorimetry/HcalAlgos/interface/HcalLogicalMapGenerator.h"
 #include "CondFormats/HcalObjects/interface/HcalLogicalMap.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "Geometry/HcalTowerAlgo/src/HcalHardcodeGeometryData.h" // for eta bounds

diff --git a/...alRecAlgos/interface/HcalCaloFlagLabels.h → ...ts/METReco/interface/HcalCaloFlagLabels.h b/...alRecAlgos/interface/HcalCaloFlagLabels.h → ...ts/METReco/interface/HcalCaloFlagLabels.h
@@ -1,12 +1,12 @@
-#ifndef GUARD_HCALCALOFLAGLABELS_H
-#define GUARD_HCALCALOFLAGLABELS_H
+#ifndef DataFormats_METReco_HcalCaloFlagLabels_h
+#define DataFormats_METReco_HcalCaloFlagLabels_h
 
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include <string>
 
 // Create alias names for all status bits
 // These aliases are valid for only the _current release_
-// Use the HcalCaloFlagTool (below) for full interpretation
+// Use the HcalCaloFlagTool for full interpretation
 namespace HcalCaloFlagLabels
 {
   //subdetector-specific bits defined here (bits 0-15)
@@ -59,22 +59,4 @@ namespace HcalCaloFlagLabels
 
 }
 
-/** \brief Provides interpretation of flag bits with understanding of 
-    CMSSW version dependence.
-*/
-class HcalCaloFlagTool {
-public:
-  HcalCaloFlagTool(const std::string& releaseName);
-  std::string getFieldName(HcalSubdetector sd, int bit) const;
-  int getFieldWidth(HcalSubdetector sd, int bit) const;
-  int getFieldStart(HcalSubdetector sd, const std::string& field) const;
-  int getFieldWidth(HcalSubdetector sd, const std::string& field) const;
-  bool hasField(HcalSubdetector sd, const std::string& field) const;
-  bool hasField(HcalSubdetector sd, int bit) const;
-private:
-  std::string releaseName_;
-  bool standardFormat_;
-  int major_, minor_, patch_, subpatch_;
-};
-
-#endif
+#endif //DataFormats_METReco_HcalCaloFlagLabels_h
diff --git a/DataFormats/METReco/interface/HcalCaloFlagTool.h b/DataFormats/METReco/interface/HcalCaloFlagTool.h
@@ -0,0 +1,27 @@
+#ifndef DataFormats_METReco_HcalCaloFlagTool_h
+#define DataFormats_METReco_HcalCaloFlagTool_h
+
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
+#include <string>
+
+// Use the HcalCaloFlagTool (below) for full interpretation of HcalCaloFlagLabels
+/** \brief Provides interpretation of flag bits with understanding of 
+    CMSSW version dependence.
+*/
+class HcalCaloFlagTool {
+public:
+  HcalCaloFlagTool(const std::string& releaseName);
+  std::string getFieldName(HcalSubdetector sd, int bit) const;
+  int getFieldWidth(HcalSubdetector sd, int bit) const;
+  int getFieldStart(HcalSubdetector sd, const std::string& field) const;
+  int getFieldWidth(HcalSubdetector sd, const std::string& field) const;
+  bool hasField(HcalSubdetector sd, const std::string& field) const;
+  bool hasField(HcalSubdetector sd, int bit) const;
+private:
+  std::string releaseName_;
+  bool standardFormat_;
+  int major_, minor_, patch_, subpatch_;
+};
+
+#endif //DataFormats_METReco_HcalCaloFlagTool_h
diff --git a/DataFormats/METReco/interface/HcalNoiseHPD.h b/DataFormats/METReco/interface/HcalNoiseHPD.h
@@ -21,7 +21,7 @@
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/RefProd.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 namespace reco {
 

diff --git a/...lo/HcalRecAlgos/src/HcalCaloFlagLabels.cc → DataFormats/METReco/src/HcalCaloFlagTool.cc b/...lo/HcalRecAlgos/src/HcalCaloFlagLabels.cc → DataFormats/METReco/src/HcalCaloFlagTool.cc
@@ -1,4 +1,4 @@
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagTool.h"
 #include <string.h>
 #include <cstdio>
 

diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFClusterAlgo.cc b/RecoEgamma/EgammaHFProducers/plugins/HFClusterAlgo.cc
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <list> 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 
 using namespace std;

diff --git a/RecoJets/JetAnalyzers/src/myFilter.cc b/RecoJets/JetAnalyzers/src/myFilter.cc
@@ -7,7 +7,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h"

diff --git a/RecoJets/JetAnalyzers/src/myJetAna.cc b/RecoJets/JetAnalyzers/src/myJetAna.cc
@@ -12,7 +12,7 @@
 #include "DataFormats/METReco/interface/CaloMET.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h"
@@ -70,7 +70,7 @@
 #include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 #include "DataFormats/METReco/interface/HcalNoiseSummary.h"
 
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"  
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"  
 
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/RecoJets/JetProducers/src/JetIDHelper.cc b/RecoJets/JetProducers/src/JetIDHelper.cc
@@ -10,7 +10,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 
 
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 // JetIDHelper needs a much more detailed description that the one in HcalTopology, 
 // so to be consistent, all needed constants are hardwired in JetIDHelper.cc itself
 // #include "Geometry/CaloTopology/interface/HcalTopology.h"

diff --git a/RecoLocalCalo/CastorReco/plugins/CastorSimpleReconstructor.cc b/RecoLocalCalo/CastorReco/plugins/CastorSimpleReconstructor.cc
@@ -16,7 +16,7 @@ using namespace std;
 #include "CondFormats/DataRecord/interface/CastorChannelQualityRcd.h"
 #include "CondFormats/DataRecord/interface/CastorSaturationCorrsRcd.h"
 #include "CondFormats/CastorObjects/interface/CastorSaturationCorrs.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>

diff --git a/RecoLocalCalo/CastorReco/src/CastorSimpleRecAlgo.cc b/RecoLocalCalo/CastorReco/src/CastorSimpleRecAlgo.cc
@@ -1,7 +1,7 @@
 #include "RecoLocalCalo/CastorReco/interface/CastorSimpleRecAlgo.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include <algorithm> // for "max"
 #include <math.h>
 
@@ -165,7 +165,7 @@ void CastorSimpleRecAlgo::recoverADCSaturation(CastorRecHit& rechit,  const Cast
 									   maxADCvalue,satCorrConst,
 									   firstSample_,samplesToAdd_))
     // use empty flag bit for recording saturation correction
-    // see also CMSSW/RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h
+    // see also CMSSW/DataFormats/METReco/interface/HcalCaloFlagLabels.h
     rechit.setFlagField(1,HcalCaloFlagLabels::UserDefinedBit0);
 } 
 

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HBHENegativeFlag.h b/RecoLocalCalo/HcalRecAlgos/interface/HBHENegativeFlag.h
@@ -14,7 +14,7 @@
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HBHERecHit.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
 #include "CondFormats/HcalObjects/interface/AbsOOTPileupCorrection.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HBHEPulseShapeFlag.h b/RecoLocalCalo/HcalRecAlgos/interface/HBHEPulseShapeFlag.h
@@ -18,7 +18,7 @@
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HBHERecHit.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
 //---------------------------------------------------------------------------

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HBHEStatusBitSetter.h b/RecoLocalCalo/HcalRecAlgos/interface/HBHEStatusBitSetter.h
@@ -7,7 +7,7 @@
 #include "DataFormats/HcalRecHit/interface/HBHERecHit.h"
 #include "CondFormats/HcalObjects/interface/HcalLogicalMap.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
 

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HBHETimingShapedFlag.h b/RecoLocalCalo/HcalRecAlgos/interface/HBHETimingShapedFlag.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HBHERecHit.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 
 class HBHETimingShapedFlagSetter {

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromDigis.h b/RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromDigis.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromRecHits.h b/RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromRecHits.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HcalHF_PETalgorithm.h b/RecoLocalCalo/HcalRecAlgos/interface/HcalHF_PETalgorithm.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 // Forward declarations
 class HcalChannelQuality;

diff --git a/RecoLocalCalo/HcalRecAlgos/interface/HcalHF_S9S1algorithm.h b/RecoLocalCalo/HcalRecAlgos/interface/HcalHF_S9S1algorithm.h
@@ -3,7 +3,7 @@
 
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 // Forward declarations
 class HcalChannelQuality;

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HBHENegativeFlag.cc b/RecoLocalCalo/HcalRecAlgos/src/HBHENegativeFlag.cc
@@ -8,7 +8,7 @@
 
 //---------------------------------------------------------------------------
 #include "RecoLocalCalo/HcalRecAlgos/interface/HBHENegativeFlag.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HBHEPulseShapeFlag.cc b/RecoLocalCalo/HcalRecAlgos/src/HBHEPulseShapeFlag.cc
@@ -8,7 +8,7 @@
 
 //---------------------------------------------------------------------------
 #include "RecoLocalCalo/HcalRecAlgos/interface/HBHEPulseShapeFlag.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HBHETimeProfileStatusBitSetter.cc b/RecoLocalCalo/HcalRecAlgos/src/HBHETimeProfileStatusBitSetter.cc
@@ -1,6 +1,6 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HBHETimeProfileStatusBitSetter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include <algorithm> // for "max"
 #include <math.h>

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HFTimingTrustFlag.cc b/RecoLocalCalo/HcalRecAlgos/src/HFTimingTrustFlag.cc
@@ -1,5 +1,5 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HFTimingTrustFlag.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 namespace HFTimingTrust 
 {

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalADCSaturationFlag.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalADCSaturationFlag.cc
@@ -1,5 +1,5 @@
 #include "../interface/HcalADCSaturationFlag.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 
 

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalHF_PETalgorithm.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalHF_PETalgorithm.cc
@@ -1,7 +1,7 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHF_PETalgorithm.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/HcalTowerAlgo/src/HcalHardcodeGeometryData.h" // for eta bounds
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalHF_S9S1algorithm.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalHF_S9S1algorithm.cc
@@ -1,5 +1,5 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHF_S9S1algorithm.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/HcalTowerAlgo/src/HcalHardcodeGeometryData.h" // for eta bounds
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalSeverityLevelComputer.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalSeverityLevelComputer.cc
@@ -1,6 +1,6 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelStatus.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/RecoLocalCalo/HcalRecAlgos/src/HcalTimingCorrector.cc b/RecoLocalCalo/HcalRecAlgos/src/HcalTimingCorrector.cc
@@ -1,5 +1,5 @@
 #include "../interface/HcalTimingCorrector.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 // Using defined flags instead of hardcoding bits 2 and 3
 

diff --git a/RecoLocalCalo/HcalRecAlgos/test/HcalRecHitReflagger.cc b/RecoLocalCalo/HcalRecAlgos/test/HcalRecHitReflagger.cc
@@ -29,7 +29,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "Geometry/HcalTowerAlgo/src/HcalHardcodeGeometryData.h" // for eta bounds
 
 #include "CondFormats/HcalObjects/interface/HcalChannelStatus.h"

diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc
@@ -13,7 +13,7 @@ Original Author: John Paul Chou (Brown University)
 #include "DataFormats/JetReco/interface/TrackExtrapolation.h"
 #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 

diff --git a/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.h b/RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.h
@@ -13,7 +13,7 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSimpleRecAlgo.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromRecHits.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromDigis.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 
 #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelStatus.h"

diff --git a/RecoLocalCalo/HcalRecProducers/src/ZdcHitReconstructor.h b/RecoLocalCalo/HcalRecProducers/src/ZdcHitReconstructor.h
@@ -11,7 +11,7 @@
 #include "RecoLocalCalo/HcalRecAlgos/interface/ZdcSimpleRecAlgo.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromRecHits.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalHFStatusBitFromDigis.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelStatus.h"
 #include "CondFormats/HcalObjects/interface/HcalLongRecoParams.h"

diff --git a/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc b/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc
@@ -17,7 +17,7 @@
 #include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 

diff --git a/RecoParticleFlow/PFClusterProducer/interface/PFRecHitQTestBase.h b/RecoParticleFlow/PFClusterProducer/interface/PFRecHitQTestBase.h
@@ -24,7 +24,7 @@
 #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
 #include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
 

diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.cc
@@ -33,7 +33,7 @@
 #include "Geometry/CaloTopology/interface/CaloTowerTopology.h"
 #include "RecoCaloTools/Navigation/interface/CaloTowerNavigator.h"
 
-#include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
+#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"