Merge pull request #29613 from smuzaffar/cleanup-EcalObjects

added missing dependency; header cleanup
cms-sw · May 5, 2020 · cc0b33b · cc0b33b
2 parents 09a0747 + 13087e0
commit cc0b33b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/CalibCalorimetry/EcalTrivialCondModules/BuildFile.xml b/CalibCalorimetry/EcalTrivialCondModules/BuildFile.xml
@@ -10,4 +10,5 @@
 <use   name="CondFormats/ESObjects"/>
 <use   name="CondFormats/DataRecord"/>
 <use   name="DataFormats/EcalDetId"/>
+<use   name="DataFormats/EcalDigi"/>
 <use   name="clhep"/>
diff --git a/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h b/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h
@@ -113,6 +113,7 @@
 #include "SimG4CMS/Calo/interface/EnergyResolutionVsLumi.h"
 #include "SimG4CMS/Calo/interface/EvolutionECAL.h"
 
+#include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
 // forward declarations
 
 namespace edm {

diff --git a/CondFormats/EcalObjects/BuildFile.xml b/CondFormats/EcalObjects/BuildFile.xml
@@ -3,6 +3,7 @@
 <use   name="CondFormats/Serialization"/>
 <use   name="DataFormats/StdDictionaries"/>
 <use   name="DataFormats/EcalDetId"/>
+<use   name="DataFormats/EcalDigi"/>
 <use   name="DataFormats/Math"/>
 <use   name="boost"/>
 <use   name="boost_serialization"/>

diff --git a/CondFormats/EcalObjects/interface/EcalWeightSet.h b/CondFormats/EcalObjects/interface/EcalWeightSet.h
@@ -11,7 +11,6 @@
 #include "CondFormats/Serialization/interface/Serializable.h"
 
 #include "CondFormats/EcalObjects/interface/EcalWeight.h"
-#include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
 #include "DataFormats/Math/interface/Matrix.h"
 #include <iostream>