Merge pull request cms-sw#33918 from Dr15Jones/fixHFRecalibration

Moved HFRecalibration to CalibCalorimetry/HcalAlgos

Author: cmsbuild

DataFormats/HcalCalibObjects/interface/HFRecalibration.h renamed to CalibCalorimetry/HcalAlgos/interface/HFRecalibration.h

@@ -1,5 +1,5 @@
-#ifndef DataFormats_HFRecalibration_h
-#define DataFormats_HFRecalibration_h
+#ifndef CalibCalorimetry_HcalAlgos_HFRecalibration_h
+#define CalibCalorimetry_HcalAlgos_HFRecalibration_h
 //
 // Simple class with parameterized function provided by James Wetzel
 // to compansate for darkening of HF QP fibers

DataFormats/HcalCalibObjects/src/HFRecalibration.cc renamed to CalibCalorimetry/HcalAlgos/src/HFRecalibration.cc

@@ -5,11 +5,10 @@
 //              evaluated using SimG4CMS/Calo/ HFDarkening
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "DataFormats/HcalCalibObjects/interface/HFRecalibration.h"
+#include "CalibCalorimetry/HcalAlgos/interface/HFRecalibration.h"
 
 // CMSSW Headers
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace edm;
 

CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.h

@@ -16,7 +16,7 @@
 #include "CondFormats/HcalObjects/interface/AllObjects.h"
 #include "CalibCalorimetry/HcalAlgos/interface/HBHERecalibration.h"
 #include "CondFormats/DataRecord/interface/HcalTPParametersRcd.h"
-#include "DataFormats/HcalCalibObjects/interface/HFRecalibration.h"
+#include "CalibCalorimetry/HcalAlgos/interface/HFRecalibration.h"
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbHardcode.h"
 #include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "CondFormats/DataRecord/interface/HcalAllRcds.h"

DataFormats/HcalCalibObjects/BuildFile.xml

@@ -1,6 +1,4 @@
 <use name="DataFormats/Common"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>

SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h

@@ -7,7 +7,7 @@
 #include "CondFormats/DataRecord/interface/HcalTimeSlewRecord.h"
 #include "CondFormats/HcalObjects/interface/HBHEDarkening.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/HcalCalibObjects/interface/HFRecalibration.h"
+#include "CalibCalorimetry/HcalAlgos/interface/HFRecalibration.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"