remove HcalCovarianceMatrix object entirely

CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h

@@ -94,8 +94,6 @@ namespace HcalDbASCIIIO {
   bool getObject (std::istream& fInput, HcalMCParams* fObject);
   bool dumpObject (std::ostream& fOutput, const HcalMCParams& fObject);
 
-  bool getObject (std::istream& fInput, HcalCovarianceMatrices* fObject);
-  bool dumpObject (std::ostream& fOutput, const HcalCovarianceMatrices& fObject);
   // Getting/Dumping Hcal Flag information
   bool getObject (std::istream& fInput, HcalFlagHFDigiTimeParams* fObject);
   bool dumpObject (std::ostream& fOutput, const HcalFlagHFDigiTimeParams& fObject);

CalibCalorimetry/HcalAlgos/src/HcalDbASCIIIO.cc

@@ -381,8 +381,6 @@ bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalZDCLowGainFract
 
 bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalValidationCorrs* fObject) {return getHcalSingleFloatObject (fInput, fObject, new HcalValidationCorr); }
 bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalValidationCorrs& fObject) {return dumpHcalSingleFloatObject (fOutput, fObject); }
-bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalCovarianceMatrices* fObject) {return getHcalMatrixObject (fInput, fObject, new HcalCovarianceMatrix); }
-bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalCovarianceMatrices& fObject) {return dumpHcalMatrixObject (fOutput, fObject); }
 
 bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalQIETypes* fObject) {return getHcalSingleIntObject (fInput, fObject, new HcalQIEType); }
 bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalQIETypes& fObject) {return dumpHcalSingleIntObject (fOutput, fObject); }

CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc

@@ -251,10 +251,6 @@ HcalHardcodeCalibrations::HcalHardcodeCalibrations ( const edm::ParameterSet& iC
       setWhatProduced (this, &HcalHardcodeCalibrations::produceFlagHFDigiTimeParams);
       findingRecord <HcalFlagHFDigiTimeParamsRcd> ();
     }
-    if ((*objectName == "CovarianceMatrices") || all) {
-      setWhatProduced (this, &HcalHardcodeCalibrations::produceCovarianceMatrices);
-      findingRecord <HcalCovarianceMatricesRcd> ();
-    }
     if ((*objectName == "FrontEndMap") || (*objectName == "frontEndMap") || all) {
       setWhatProduced (this, &HcalHardcodeCalibrations::produceFrontEndMap);
       findingRecord <HcalFrontEndMapRcd> ();
@@ -731,21 +727,6 @@ std::unique_ptr<HcalFlagHFDigiTimeParams> HcalHardcodeCalibrations::produceFlagH
 } 
 
 
-std::unique_ptr<HcalCovarianceMatrices> HcalHardcodeCalibrations::produceCovarianceMatrices (const HcalCovarianceMatricesRcd& rec) {
-
-  edm::ESHandle<HcalTopology> htopo;
-  rec.getRecord<HcalRecNumberingRecord>().get(htopo);
-  const HcalTopology* topo=&(*htopo);
-  auto result = std::make_unique<HcalCovarianceMatrices>(topo);
-  std::vector <HcalGenericDetId> cells = allCells(*topo);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-
-    HcalCovarianceMatrix item(cell->rawId());
-    result->addValues(item);
-  }
-  return result;
-}
-
 std::unique_ptr<HcalFrontEndMap> HcalHardcodeCalibrations::produceFrontEndMap (const HcalFrontEndMapRcd& rcd) {
   edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceFrontEndMap-> ...";
 

CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.h

@@ -43,7 +43,6 @@ class HcalZDCLowGainFractionsRcd;
 class HcalMCParamsRcd;
 class HcalFlagHFDigiTimeParamsRcd;
 class HcalTimingParamsRcd;
-class HcalCovarianceMatricesRcd;
 class HcalFrontEndMapRcd;
 
 class HcalHardcodeCalibrations : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
@@ -89,8 +88,6 @@ class HcalHardcodeCalibrations : public edm::ESProducer, public edm::EventSetupR
   std::unique_ptr<HcalMCParams> produceMCParams (const HcalMCParamsRcd& rcd);
   std::unique_ptr<HcalFlagHFDigiTimeParams> produceFlagHFDigiTimeParams (const HcalFlagHFDigiTimeParamsRcd& rcd);
 
-  std::unique_ptr<HcalCovarianceMatrices> produceCovarianceMatrices (const HcalCovarianceMatricesRcd& rcd);
-
   std::unique_ptr<HcalFrontEndMap> produceFrontEndMap (const HcalFrontEndMapRcd& rcd);
 
 private:

CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.cc

@@ -112,10 +112,6 @@ HcalTextCalibrations::HcalTextCalibrations ( const edm::ParameterSet& iConfig )
       setWhatProduced (this, &HcalTextCalibrations::produceDcsMap);
       findingRecord <HcalDcsMapRcd> ();
     }
-    else if (objectName == "CovarianceMatrices") {
-      setWhatProduced (this, &HcalTextCalibrations::produceCovarianceMatrices);
-      findingRecord <HcalCovarianceMatricesRcd> ();
-    }
     else if (objectName == "RecoParams") {
       setWhatProduced (this, &HcalTextCalibrations::produceRecoParams);
       findingRecord <HcalRecoParamsRcd> ();
@@ -145,7 +141,7 @@ HcalTextCalibrations::HcalTextCalibrations ( const edm::ParameterSet& iConfig )
 		<< "', known names are: "
 		<< "Pedestals PedestalWidths Gains GainWidths QIEData QIETypes ChannelQuality ElectronicsMap "
 		<< "FrontEndMap ZSThresholds RespCorrs LUTCorrs PFCorrs TimeCorrs L1TriggerObjects "
-		<< "ValidationCorrs LutMetadata DcsValues DcsMap CovarianceMatrices "
+		<< "ValidationCorrs LutMetadata DcsValues DcsMap "
 		<< "RecoParams LongRecoParams ZDCLowGainFraction FlagHFDigiTimeParams MCParams "
 		<< std::endl;
     }
@@ -324,13 +320,6 @@ std::unique_ptr<HcalDcsMap> HcalTextCalibrations::produceDcsMap (const HcalDcsMa
   return produce_impl<HcalDcsMap> (mInputs ["DcsMap"]);
 }
 
-std::unique_ptr<HcalCovarianceMatrices> HcalTextCalibrations::produceCovarianceMatrices (const HcalCovarianceMatricesRcd& rcd) {
-  edm::ESHandle<HcalTopology> htopo;
-  rcd.getRecord<HcalRecNumberingRecord>().get(htopo);
-  const HcalTopology* topo=&(*htopo);
-  return produce_impl<HcalCovarianceMatrices> (topo,mInputs ["CovarianceMatrices"]);
-}
-
 std::unique_ptr<HcalRecoParams> HcalTextCalibrations::produceRecoParams (const HcalRecoParamsRcd& rcd) {
   edm::ESHandle<HcalTopology> htopo;
   rcd.getRecord<HcalRecNumberingRecord>().get(htopo);

CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h

@@ -31,7 +31,6 @@ class HcalValidationCorrsRcd;
 class HcalLutMetadataRcd;
 class HcalDcsRcd;
 class HcalDcsMapRcd;
-class HcalCovarianceMatricesRcd;
 class HcalRecoParamsRcd;
 class HcalLongRecoParamsRcd;
 class HcalZDCLowGainFractionsRcd;
@@ -80,7 +79,6 @@ class HcalTextCalibrations : public edm::ESProducer,
   std::unique_ptr<HcalLutMetadata> produceLutMetadata (const HcalLutMetadataRcd& rcd);
   std::unique_ptr<HcalDcsValues> produceDcsValues (HcalDcsRcd const & rcd);
   std::unique_ptr<HcalDcsMap> produceDcsMap (const HcalDcsMapRcd& rcd);
-  std::unique_ptr<HcalCovarianceMatrices> produceCovarianceMatrices (const HcalCovarianceMatricesRcd& rcd);
 
   std::unique_ptr<HcalTimingParams> produceTimingParams (const HcalTimingParamsRcd& rcd);
  private:

CondCore/HcalPlugins/src/plugin.cc

@@ -59,7 +59,6 @@ REGISTER_PLUGIN(HcalValidationCorrsRcd,HcalValidationCorrs);
 REGISTER_PLUGIN(HcalLutMetadataRcd,HcalLutMetadata);
 REGISTER_PLUGIN(HcalDcsRcd, HcalDcsValues);
 REGISTER_PLUGIN(HcalDcsMapRcd,HcalDcsMap);
-REGISTER_PLUGIN(HcalCovarianceMatricesRcd,HcalCovarianceMatrices);
 REGISTER_PLUGIN(HcalRecoParamsRcd,HcalRecoParams);
 REGISTER_PLUGIN(HcalLongRecoParamsRcd,HcalLongRecoParams);
 REGISTER_PLUGIN(HcalZDCLowGainFractionsRcd,HcalZDCLowGainFractions);

CondFormats/DataRecord/doc/DataRecord.doc

@@ -149,7 +149,6 @@
 - HcalAllRcds
 - HcalCalibrationQIEDataRcd
 - HcalChannelQualityRcd
-- HcalCovarianceMatricesRcd
 - HcalDcsMapRcd
 - HcalDcsRcd
 - HcalElectronicsMapRcd

CondFormats/DataRecord/interface/HcalAllRcds.h

@@ -21,7 +21,6 @@
 #include "CondFormats/DataRecord/interface/HcalLutMetadataRcd.h"
 #include "CondFormats/DataRecord/interface/HcalDcsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalDcsMapRcd.h"
-#include "CondFormats/DataRecord/interface/HcalCovarianceMatricesRcd.h"
 #include "CondFormats/DataRecord/interface/HcalRecoParamsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalLongRecoParamsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h"

CondFormats/HcalObjects/interface/AllObjects.h

@@ -22,8 +22,6 @@
 #include "CondFormats/HcalObjects/interface/HcalLutMetadata.h"
 #include "CondFormats/HcalObjects/interface/HcalDcsValues.h"
 #include "CondFormats/HcalObjects/interface/HcalDcsMap.h"
-#include "CondFormats/HcalObjects/interface/HcalCovarianceMatrix.h"
-#include "CondFormats/HcalObjects/interface/HcalCovarianceMatrices.h"
 #include "CondFormats/HcalObjects/interface/HcalRecoParams.h"
 #include "CondFormats/HcalObjects/interface/HcalLongRecoParams.h"
 #include "CondFormats/HcalObjects/interface/HcalZDCLowGainFractions.h"