---

yaml --- r: 143538 b: "refs/heads/CMSSW_7_6_X" c: 458f102 h: "refs/heads/CMSSW_7_6_X" v: v3
cms-sw · Feb 2, 2015 · 4016741 · 4016741
1 parent 3084561
commit 4016741
Show file tree

Hide file tree

Showing 357 changed files with 56,382 additions and 35,686 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_7_6_X": a40c640aca8d4c7a453b643d2f2ed1f0f9a5da45
+"refs/heads/CMSSW_7_6_X": 458f1027546bb4cb41aba365ad11457147160672
diff --git a/trunk/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/trunk/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
@@ -758,10 +758,10 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
 
     if( isolatedMuonMode_ ){      //------------------------------- Isolated Muon -----
       const Surface& refSurface = innerMuTSOS.surface(); 
-      ReferenceCountingPointer<TangentPlane> 
+      ConstReferenceCountingPointer<TangentPlane> 
 	tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
       Nl = tpMuLocal->normalVector();
-      ReferenceCountingPointer<TangentPlane> 
+      ConstReferenceCountingPointer<TangentPlane> 
       tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
       GlobalVector Ng = tpMuGlobal->normalVector();
       Surface* surf = (Surface*)&refSurface;
@@ -819,7 +819,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
 	if(debug_) std::cout<<" -----    Out - In -----"<<std::endl;
 
         const Surface& refSurface = innerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 
@@ -876,7 +876,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
 	if(debug_) std::cout<<" -----    In - Out -----"<<std::endl;
 
 	const Surface& refSurface = outerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 
@@ -934,7 +934,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
 	continue;
 
 	const Surface& refSurface = outerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 
@@ -1477,10 +1477,10 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
     if( isolatedMuonMode_ ){      //------------------------------- Isolated Muon --- Out-In --
       if(debug_) std::cout<<" ------ Isolated (out-in) ----- "<<std::endl;
       const Surface& refSurface = innerMuTSOS.surface(); 
-      ReferenceCountingPointer<TangentPlane> 
+      ConstReferenceCountingPointer<TangentPlane> 
 	tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
       Nl = tpMuLocal->normalVector();
-      ReferenceCountingPointer<TangentPlane> 
+      ConstReferenceCountingPointer<TangentPlane> 
       tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
       GlobalVector Ng = tpMuGlobal->normalVector();
       Surface* surf = (Surface*)&refSurface;
@@ -1550,7 +1550,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
 	if(debug_) std::cout<<" -----    Out - In -----"<<std::endl;
 
         const Surface& refSurface = innerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 
@@ -1617,7 +1617,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
 	if(debug_) std::cout<<" -----    In - Out -----"<<std::endl;
 
 	const Surface& refSurface = outerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 
@@ -1686,7 +1686,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
 	continue;
 
 	const Surface& refSurface = outerMuTSOS.surface(); 
-	ReferenceCountingPointer<TangentPlane> 
+	ConstReferenceCountingPointer<TangentPlane> 
 	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
 	Nl = tpMuGlobal->normalVector();
 

diff --git a/trunk/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h b/trunk/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h
@@ -79,6 +79,9 @@ namespace HcalDbASCIIIO {
   bool getObject (std::istream& fInput, HcalLongRecoParams* fObject);
   bool dumpObject (std::ostream& fOutput, const HcalLongRecoParams& fObject);
 
+  bool getObject (std::istream& fInput, HcalZDCLowGainFractions* fObject);
+  bool dumpObject (std::ostream& fOutput, const HcalZDCLowGainFractions& fObject);
+
   bool getObject (std::istream& fInput, HcalTimingParams* fObject);
   bool dumpObject (std::ostream& fOutput, const HcalTimingParams& fObject);
 

diff --git a/trunk/CalibCalorimetry/HcalAlgos/src/HcalDbASCIIIO.cc b/trunk/CalibCalorimetry/HcalAlgos/src/HcalDbASCIIIO.cc
@@ -376,6 +376,9 @@ bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalTimeCorrs& fObj
 bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalZSThresholds* fObject) {return getHcalSingleIntObject (fInput, fObject, new HcalZSThreshold); }
 bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalZSThresholds& fObject) {return dumpHcalSingleIntObject (fOutput, fObject); }
 
+bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalZDCLowGainFractions* fObject) {return getHcalSingleFloatObject (fInput, fObject, new HcalZDCLowGainFraction); }
+bool HcalDbASCIIIO::dumpObject (std::ostream& fOutput, const HcalZDCLowGainFractions& fObject) {return dumpHcalSingleFloatObject (fOutput, fObject); }
+
 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, HcalCholeskyMatrices* fObject) {return getHcalMatrixObject (fInput, fObject, new HcalCholeskyMatrix); }
@@ -608,6 +611,7 @@ bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalLongRecoParams* fObject
   }
   return true;
 }
+
 bool HcalDbASCIIIO::getObject (std::istream& fInput, HcalTimingParams* fObject)
 {
   if (!fObject) return false; // fObject = new HcalTimingParams();

diff --git a/trunk/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc b/trunk/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc
@@ -247,6 +247,10 @@ HcalHardcodeCalibrations::HcalHardcodeCalibrations ( const edm::ParameterSet& iC
       setWhatProduced (this, &HcalHardcodeCalibrations::produceLongRecoParams);
       findingRecord <HcalLongRecoParamsRcd> ();
     }
+    if ((*objectName == "ZDCLowGainFractions") || all) {
+      setWhatProduced (this, &HcalHardcodeCalibrations::produceZDCLowGainFractions);
+      findingRecord <HcalZDCLowGainFractionsRcd> ();
+    }
     if ((*objectName == "MCParams") || all) {
       setWhatProduced (this, &HcalHardcodeCalibrations::produceMCParams);
       findingRecord <HcalMCParamsRcd> ();
@@ -636,6 +640,21 @@ std::auto_ptr<HcalLongRecoParams> HcalHardcodeCalibrations::produceLongRecoParam
   return result;
 }
 
+std::auto_ptr<HcalZDCLowGainFractions> HcalHardcodeCalibrations::produceZDCLowGainFractions (const HcalZDCLowGainFractionsRcd& rec) {
+  edm::LogInfo("HCAL") << "HcalHardcodeCalibrations::produceZDCLowGainFractions-> ...";
+  edm::ESHandle<HcalTopology> htopo;
+  rec.getRecord<IdealGeometryRecord>().get(htopo);
+  const HcalTopology* topo=&(*htopo);
+
+  std::auto_ptr<HcalZDCLowGainFractions> result (new HcalZDCLowGainFractions (topo));
+  std::vector <HcalGenericDetId> cells = allCells(*topo);
+  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); cell++) {
+    HcalZDCLowGainFraction item(cell->rawId(),0.0);
+    result->addValues(item);
+  }
+  return result;
+}
+
 std::auto_ptr<HcalMCParams> HcalHardcodeCalibrations::produceMCParams (const HcalMCParamsRcd& rec) {
 
 

diff --git a/trunk/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.h b/trunk/CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.h
@@ -35,6 +35,7 @@ class HcalDcsRcd;
 class HcalDcsMapRcd;
 class HcalRecoParamsRcd;
 class HcalLongRecoParamsRcd;
+class HcalZDCLowGainFractionsRcd;
 class HcalMCParamsRcd;
 class HcalFlagHFDigiTimeParamsRcd;
 class HcalTimingParamsRcd;
@@ -78,6 +79,8 @@ class HcalHardcodeCalibrations : public edm::ESProducer,
   std::auto_ptr<HcalRecoParams> produceRecoParams (const HcalRecoParamsRcd& rcd);
   std::auto_ptr<HcalTimingParams> produceTimingParams (const HcalTimingParamsRcd& rcd);
   std::auto_ptr<HcalLongRecoParams> produceLongRecoParams (const HcalLongRecoParamsRcd& rcd);
+  std::auto_ptr<HcalZDCLowGainFractions> produceZDCLowGainFractions (const HcalZDCLowGainFractionsRcd& rcd);
+
   std::auto_ptr<HcalMCParams> produceMCParams (const HcalMCParamsRcd& rcd);
   std::auto_ptr<HcalFlagHFDigiTimeParams> produceFlagHFDigiTimeParams (const HcalFlagHFDigiTimeParamsRcd& rcd);
 

diff --git a/trunk/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.cc b/trunk/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.cc
@@ -123,6 +123,10 @@ HcalTextCalibrations::HcalTextCalibrations ( const edm::ParameterSet& iConfig )
       setWhatProduced (this, &HcalTextCalibrations::produceLongRecoParams);
       findingRecord <HcalLongRecoParamsRcd> ();
     }
+    else if (objectName == "ZDCLowGainFractions") {
+      setWhatProduced (this, &HcalTextCalibrations::produceZDCLowGainFractions);
+      findingRecord <HcalZDCLowGainFractionsRcd> ();
+    }
     else if (objectName == "MCParams") {
       setWhatProduced (this, &HcalTextCalibrations::produceMCParams);
       findingRecord <HcalMCParamsRcd> ();
@@ -137,7 +141,7 @@ HcalTextCalibrations::HcalTextCalibrations ( const edm::ParameterSet& iConfig )
 		<< "Pedestals PedestalWidths Gains GainWidths QIEData ChannelQuality ElectronicsMap "
 		<< "ZSThresholds RespCorrs LUTCorrs PFCorrs TimeCorrs L1TriggerObjects "
 		<< "ValidationCorrs LutMetadata DcsValues DcsMap CholeskyMatrices CovarianceMatrices "
-		<< "RecoParams LongRecoParams FlagHFDigiTimeParams MCParams "
+		<< "RecoParams LongRecoParams ZDCLowGainFraction FlagHFDigiTimeParams MCParams "
 		<< std::endl;
     }
   }
@@ -331,6 +335,14 @@ std::auto_ptr<HcalLongRecoParams> HcalTextCalibrations::produceLongRecoParams (c
   const HcalTopology* topo=&(*htopo);
   return produce_impl<HcalLongRecoParams> (topo,mInputs ["LongRecoParams"]);
 }
+
+std::auto_ptr<HcalZDCLowGainFractions> HcalTextCalibrations::produceZDCLowGainFractions (const HcalZDCLowGainFractionsRcd& rcd) {
+  edm::ESHandle<HcalTopology> htopo;
+  rcd.getRecord<IdealGeometryRecord>().get(htopo);
+  const HcalTopology* topo=&(*htopo);
+  return produce_impl<HcalZDCLowGainFractions> (topo,mInputs ["ZDCLowGainFractions"]);
+}
+
 std::auto_ptr<HcalTimingParams> HcalTextCalibrations::produceTimingParams (const HcalTimingParamsRcd& rcd) {
   edm::ESHandle<HcalTopology> htopo;
   rcd.getRecord<IdealGeometryRecord>().get(htopo);

diff --git a/trunk/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h b/trunk/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h
@@ -33,6 +33,7 @@ class HcalCholeskyMatricesRcd;
 class HcalCovarianceMatricesRcd;
 class HcalRecoParamsRcd;
 class HcalLongRecoParamsRcd;
+class HcalZDCLowGainFractionsRcd;
 class HcalMCParamsRcd;
 class HcalFlagHFDigiTimeParamsRcd;
 class HcalTimingParamsRcd;
@@ -68,6 +69,7 @@ class HcalTextCalibrations : public edm::ESProducer,
 
   std::auto_ptr<HcalRecoParams> produceRecoParams (const HcalRecoParamsRcd& rcd);
   std::auto_ptr<HcalLongRecoParams> produceLongRecoParams (const HcalLongRecoParamsRcd& rcd);
+  std::auto_ptr<HcalZDCLowGainFractions> produceZDCLowGainFractions (const HcalZDCLowGainFractionsRcd& rcd);
   std::auto_ptr<HcalMCParams> produceMCParams (const HcalMCParamsRcd& rcd);
   std::auto_ptr<HcalFlagHFDigiTimeParams> produceFlagHFDigiTimeParams (const HcalFlagHFDigiTimeParamsRcd& rcd);
 

diff --git a/trunk/CalibFormats/CastorObjects/interface/CastorDbService.h b/trunk/CalibFormats/CastorObjects/interface/CastorDbService.h
@@ -58,7 +58,6 @@ class CastorDbService {
   bool makeCastorCalibrationWidth (const HcalGenericDetId& fId, CastorCalibrationWidths* fObject, 
 				 bool pedestalInADC) const;
   void buildCalibWidths();
-  mutable reco::castor::QieShape* mQieShapeCache;
   const CastorPedestals* mPedestals;
   const CastorPedestalWidths* mPedestalWidths;
   const CastorGains* mGains;

diff --git a/trunk/CalibFormats/CastorObjects/src/CastorDbService.cc b/trunk/CalibFormats/CastorObjects/src/CastorDbService.cc
@@ -15,7 +15,6 @@
 
 CastorDbService::CastorDbService (const edm::ParameterSet& cfg)
   : 
-  mQieShapeCache (0),
   mPedestals (0),
   mPedestalWidths (0),
   mGains (0),

diff --git a/trunk/CondCore/HIPlugins/src/plugin.cc b/trunk/CondCore/HIPlugins/src/plugin.cc
@@ -1,8 +1,11 @@
 #include "CondCore/PluginSystem/interface/registration_macros.h"
 #include "CondFormats/DataRecord/interface/HeavyIonRcd.h"
 #include "CondFormats/DataRecord/interface/HeavyIonRPRcd.h"
+#include "CondFormats/DataRecord/interface/HeavyIonUERcd.h"
 #include "CondFormats/HIObjects/interface/CentralityTable.h"
+#include "CondFormats/HIObjects/interface/UETable.h"
 #include "CondFormats/HIObjects/interface/RPFlatParams.h"
 
 REGISTER_PLUGIN(HeavyIonRPRcd,RPFlatParams);
 REGISTER_PLUGIN(HeavyIonRcd,CentralityTable);
+REGISTER_PLUGIN(HeavyIonUERcd,UETable);
diff --git a/trunk/CondCore/HcalPlugins/src/plugin.cc b/trunk/CondCore/HcalPlugins/src/plugin.cc
@@ -58,6 +58,7 @@ REGISTER_PLUGIN(HcalCholeskyMatricesRcd,HcalCholeskyMatrices);
 REGISTER_PLUGIN(HcalCovarianceMatricesRcd,HcalCovarianceMatrices);
 REGISTER_PLUGIN(HcalRecoParamsRcd,HcalRecoParams);
 REGISTER_PLUGIN(HcalLongRecoParamsRcd,HcalLongRecoParams);
+REGISTER_PLUGIN(HcalZDCLowGainFractionsRcd,HcalZDCLowGainFractions);
 REGISTER_PLUGIN(HcalMCParamsRcd,HcalMCParams);
 REGISTER_PLUGIN(HcalFlagHFDigiTimeParamsRcd,HcalFlagHFDigiTimeParams);
 REGISTER_PLUGIN(HcalTimingParamsRcd,HcalTimingParams);

diff --git a/trunk/CondCore/Utilities/src/CondDBImport.cc b/trunk/CondCore/Utilities/src/CondDBImport.cc
@@ -154,6 +154,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( HcalL1TriggerObjects )
       IMPORT_PAYLOAD_CASE( HcalLUTCorrs )
       IMPORT_PAYLOAD_CASE( HcalLongRecoParams )
+      IMPORT_PAYLOAD_CASE( HcalZDCLowGainFractions )
       IMPORT_PAYLOAD_CASE( HcalLutMetadata )
       IMPORT_PAYLOAD_CASE( HcalMCParams )
       IMPORT_PAYLOAD_CASE( HcalPFCorrs )

diff --git a/trunk/CondCore/Utilities/src/CondFormats.h b/trunk/CondCore/Utilities/src/CondFormats.h
@@ -176,6 +176,7 @@
 #include "CondFormats/HcalObjects/interface/HcalL1TriggerObjects.h"
 #include "CondFormats/HcalObjects/interface/HcalLUTCorrs.h"
 #include "CondFormats/HcalObjects/interface/HcalLongRecoParams.h"
+#include "CondFormats/HcalObjects/interface/HcalZDCLowGainFractions.h"
 #include "CondFormats/HcalObjects/interface/HcalLutMetadata.h"
 #include "CondFormats/HcalObjects/interface/HcalMCParams.h"
 #include "CondFormats/HcalObjects/interface/HcalPFCorrs.h"

diff --git a/trunk/CondFormats/DataRecord/doc/DataRecord.doc b/trunk/CondFormats/DataRecord/doc/DataRecord.doc
@@ -160,6 +160,7 @@
 - HcalL1TriggerObjectsRcd
 - HcalLUTCorrsRcd
 - HcalLongRecoParamsRcd
+- HcalZDCLowGainFractionsRcd
 - HcalLutMetadataRcd
 - HcalMCParamsRcd
 - HcalPFCorrsRcd

diff --git a/trunk/CondFormats/DataRecord/interface/HcalAllRcds.h b/trunk/CondFormats/DataRecord/interface/HcalAllRcds.h
@@ -23,6 +23,7 @@
 #include "CondFormats/DataRecord/interface/HcalCholeskyMatricesRcd.h"
 #include "CondFormats/DataRecord/interface/HcalRecoParamsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalLongRecoParamsRcd.h"
+#include "CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalMCParamsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalFlagHFDigiTimeParamsRcd.h"
 #include "CondFormats/DataRecord/interface/HcalTimingParamsRcd.h"

diff --git a/trunk/CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h b/trunk/CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h
@@ -0,0 +1,26 @@
+#ifndef HcalZDCLowGainFractionsRcd_H
+#define HcalZDCLowGainFractionsRcd_H
+// -*- C++ -*-
+//
+// Package:     CondFormats/DataRecord
+// Class  :     HcalZDCLowGainFractionsRcd
+// 
+/**\class HcalZDCLowGainFractionsRcd HcalZDCLowGainFractionsRcd.h CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h
+
+ Description: [one line class summary]
+
+ Usage:
+    <usage>
+
+*/
+//
+// Author:      Audrius Mecionis
+// Created:     Wed, 24 Sep 2014 11:27:57 GMT
+//
+
+#include "FWCore/Framework/interface/DependentRecordImplementation.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+
+class HcalZDCLowGainFractionsRcd : public edm::eventsetup::DependentRecordImplementation<HcalZDCLowGainFractionsRcd, boost::mpl::vector<IdealGeometryRecord> > {};
+
+#endif
diff --git a/trunk/CondFormats/DataRecord/interface/HeavyIonUERcd.h b/trunk/CondFormats/DataRecord/interface/HeavyIonUERcd.h
@@ -0,0 +1,8 @@
+#ifndef DataRecord_HeavyIonUERcd_h
+#define DataRecord_HeavyIonUERcd_h
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+
+class HeavyIonUERcd : public edm::eventsetup::EventSetupRecordImplementation<HeavyIonUERcd> {};
+
+#endif
diff --git a/trunk/CondFormats/DataRecord/src/HcalZDCLowGainFractionsRcd.cc b/trunk/CondFormats/DataRecord/src/HcalZDCLowGainFractionsRcd.cc
@@ -0,0 +1,15 @@
+// -*- C++ -*-
+//
+// Package:     CondFormats/DataRecord
+// Class  :     HcalZDCLowGainFractionsRcd
+// 
+// Implementation:
+//     [Notes on implementation]
+//
+// Author:      Audrius Mecionis
+// Created:     Wed, 24 Sep 2014 11:27:57 GMT
+
+#include "CondFormats/DataRecord/interface/HcalZDCLowGainFractionsRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(HcalZDCLowGainFractionsRcd);
diff --git a/trunk/CondFormats/DataRecord/src/HeavyIonUERcd.cc b/trunk/CondFormats/DataRecord/src/HeavyIonUERcd.cc
@@ -0,0 +1,5 @@
+
+#include "CondFormats/DataRecord/interface/HeavyIonUERcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(HeavyIonUERcd);
diff --git a/trunk/CondFormats/HIObjects/interface/UETable.h b/trunk/CondFormats/HIObjects/interface/UETable.h
@@ -0,0 +1,35 @@
+#ifndef __UETable_h__
+#define __UETable_h__
+
+#include "CondFormats/Serialization/interface/Serializable.h"
+#include <vector>
+
+class UETable{
+ public:
+  UETable(){};
+  float getUE(int i){return values[i];}
+  unsigned int getNp(int i){return np[i];}
+  unsigned int getNi0(int i){return ni0[i];}
+  unsigned int getNi1(int i){return ni1[i];}
+  unsigned int getNi2(int i){return ni2[i];}
+  float getEtaEdge(int i){return edgeEta[i];}
+
+
+  void pushUE(float v){values.push_back(v);}
+  void pushNp(unsigned int v){np.push_back(v);}
+  void pushNi0(unsigned int v){ni0.push_back(v);}
+  void pushNi1(unsigned int v){ni1.push_back(v);}
+  void pushNi2(unsigned int v){ni2.push_back(v);}
+  void pushEtaEdge(float v){edgeEta.push_back(v);}
+
+  std::vector<float> values;
+  std::vector<unsigned int> np;
+  std::vector<unsigned int> ni0;
+  std::vector<unsigned int> ni1;
+  std::vector<unsigned int> ni2;
+  std::vector<float> edgeEta;
+
+  COND_SERIALIZABLE;
+};
+
+#endif
diff --git a/trunk/CondFormats/HIObjects/src/T_EventSetup_CentralityCuts.cc b/trunk/CondFormats/HIObjects/src/T_EventSetup_CentralityCuts.cc
@@ -1,9 +1,11 @@
 #include "CondFormats/HIObjects/interface/CentralityTable.h" 
 #include "CondFormats/HIObjects/interface/RPFlatParams.h"
+#include "CondFormats/HIObjects/interface/UETable.h"
 
 #include "FWCore/Utilities/interface/typelookup.h"
 
 TYPELOOKUP_DATA_REG(CentralityTable);
 TYPELOOKUP_DATA_REG(RPFlatParams);
+TYPELOOKUP_DATA_REG(UETable);
 
 
diff --git a/trunk/CondFormats/HIObjects/src/classes.h b/trunk/CondFormats/HIObjects/src/classes.h
@@ -4,6 +4,7 @@ namespace CondFormats_HIObjects {
   struct dictionary{
     std::vector<CentralityTable::CBin> dummy;
     std::vector<RPFlatParams::EP> yummy;
+    UETable pred;
   };
 }