Merge pull request cms-sw#600 from gartung/argsize-Calib

Misc cleanups -- changes for large object passed by value in Calibration Packages
igv4321 · Sep 17, 2013 · 51560f7 · 51560f7
2 parents b788121 + d88c94b
commit 51560f7
Show file tree

Hide file tree

Showing 33 changed files with 61 additions and 61 deletions.
diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc
@@ -331,7 +331,7 @@ EcalTPGParamBuilder::~EcalTPGParamBuilder()
 }
 
 
-bool EcalTPGParamBuilder::checkIfOK(EcalPedestals::Item item) 
+bool EcalTPGParamBuilder::checkIfOK(const EcalPedestals::Item& item) 
 {
   bool result=true;
   if( item.mean_x1 <150. || item.mean_x1 >250) result=false;

diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h
@@ -68,7 +68,7 @@ class EcalTPGParamBuilder : public edm::EDAnalyzer {
   ~EcalTPGParamBuilder() ;
   virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) ;
   virtual void beginJob() ;
-  bool checkIfOK (EcalPedestals::Item item) ;
+  bool checkIfOK (const EcalPedestals::Item& item) ;
 
  private:
   bool computeLinearizerParam(double theta, double gainRatio, double calibCoeff, std::string subdet, int & mult , int & shift) ;

diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h b/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h
@@ -44,7 +44,7 @@ class HcalLedAnalysis{
   void processLedEvent(const HBHEDigiCollection& hbhe,
 		    const HODigiCollection& ho,
 		    const HFDigiCollection& hf,
-                    const HcalCalibDigiCollection calib,
+                    const HcalCalibDigiCollection& calib,
 		    const HcalDbService& cond);
 
 protected:
@@ -78,7 +78,7 @@ class HcalLedAnalysis{
   void SetupLEDHists(int id, const HcalDetId detid, std::map<HcalDetId, std::map<int,LEDBUNCH> > &toolT);
   void GetLedConst(std::map<HcalDetId,std::map<int, LEDBUNCH > > &toolT);
   void LedTrendings(std::map<HcalDetId,std::map<int, LEDBUNCH > > &toolT);
-  void ProcessCalibEvent(int fiberChan,HcalCalibDetId calibId, const HcalCalibDataFrame digi);
+  void ProcessCalibEvent(int fiberChan,HcalCalibDetId calibId, const HcalCalibDataFrame& digi);
   float BinsizeCorr(float time);
 
   std::string m_outputFileROOT;

diff --git a/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc b/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc
@@ -524,7 +524,7 @@ void HcalLedAnalysis::LedDone()
 void HcalLedAnalysis::processLedEvent(const HBHEDigiCollection& hbhe,
 					const HODigiCollection& ho,
 					const HFDigiCollection& hf,
-                                        const HcalCalibDigiCollection calib,
+                                        const HcalCalibDigiCollection& calib,
 					const HcalDbService& cond)
 {
   evt++;
@@ -890,7 +890,7 @@ float HcalLedAnalysis::BinsizeCorr(float time) {
 
 
 //-----------------------------------------------------------------------------
-void HcalLedAnalysis::ProcessCalibEvent(int fiberChan, HcalCalibDetId calibId, const HcalCalibDataFrame digi){
+void HcalLedAnalysis::ProcessCalibEvent(int fiberChan, HcalCalibDetId calibId, const HcalCalibDataFrame& digi){
 
   _meca = calibHists.find(calibId);
   if (_meca==calibHists.end()){

diff --git a/CalibCalorimetry/HcalPlugins/src/HERecalibration.cc b/CalibCalorimetry/HcalPlugins/src/HERecalibration.cc
@@ -13,7 +13,7 @@ iLumi(integrated_lumi),cutoff_(cutoff),darkening()
 
 HERecalibration::~HERecalibration() { }
 
-void HERecalibration::setDsegm( std::vector<std::vector<int>> m_segmentation) 
+void HERecalibration::setDsegm( const std::vector<std::vector<int>>& m_segmentation) 
 {
 
   //  std::cout << std::endl << " HERecalibration->setDsegm" << std::endl;

diff --git a/CalibCalorimetry/HcalPlugins/src/HERecalibration.h b/CalibCalorimetry/HcalPlugins/src/HERecalibration.h
@@ -24,7 +24,7 @@ class HERecalibration {
   ~HERecalibration();
 
   double getCorr(int ieta, int idepth);
-  void  setDsegm(std::vector<std::vector<int> > m_segmentation);
+  void  setDsegm(const std::vector<std::vector<int> >& m_segmentation);
 
 private:
 

diff --git a/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h b/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h
@@ -263,16 +263,16 @@ namespace pos{
 		      unsigned int irows, unsigned int icols,
 		      pos::PixelROCMaskBits* masks,
 		      pos::PixelROCTrimBits* trims,	
-		      PixelHdwAddress theROC) const;
+		      const PixelHdwAddress& theROC) const;
 
     void disablePixels(PixelFECConfigInterface* pixelFEC,
 		       unsigned int irows, unsigned int icols,
 		       pos::PixelROCTrimBits* trims,	
-		       PixelHdwAddress theROC) const;
+		       const PixelHdwAddress& theROC) const;
 
     void disablePixels(PixelFECConfigInterface* pixelFEC,
 		       pos::PixelROCTrimBits* trims,	
-		       PixelHdwAddress theROC) const;
+		       const PixelHdwAddress& theROC) const;
 
     mutable std::vector<int> old_irows;
     mutable std::vector<int> old_icols;

diff --git a/CalibFormats/SiPixelObjects/interface/PixelDACScanRange.h b/CalibFormats/SiPixelObjects/interface/PixelDACScanRange.h
@@ -32,7 +32,7 @@ namespace pos{
 		      unsigned int last, unsigned int step,
 		      unsigned int index, bool mixValuesAcrossROCs);
     PixelDACScanRange(std::string name, 
-		      std::vector<unsigned int> values,
+		      const std::vector<unsigned int>& values,
 		      unsigned int index, bool mixValuesAcrossROCs);
 
     std::string name() const { return name_;}

diff --git a/CalibFormats/SiPixelObjects/interface/PixelMaskAllPixels.h b/CalibFormats/SiPixelObjects/interface/PixelMaskAllPixels.h
@@ -28,7 +28,7 @@ namespace pos{
     PixelMaskAllPixels(std::vector< std::vector<std::string> >& tableMat);
 // modified by MR on 18-04-2008 10:05:04
     PixelMaskAllPixels() ;
-    void addROCMaskBits(PixelROCMaskBits);
+    void addROCMaskBits(const PixelROCMaskBits&);
 
 
     void writeBinary(std::string filename) const;

diff --git a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc
@@ -1457,7 +1457,7 @@ void PixelCalibConfiguration::enablePixels(PixelFECConfigInterface* pixelFEC,
 					   unsigned int icols,
 					   pos::PixelROCMaskBits* masks,
 					   pos::PixelROCTrimBits* trims, 
-					   PixelHdwAddress theROC) const{
+					   const PixelHdwAddress& theROC) const{
 
   for (unsigned int irow=0;irow<rows_[irows].size();irow++){
     for (unsigned int icol=0;icol<cols_[icols].size();icol++){
@@ -1486,7 +1486,7 @@ void PixelCalibConfiguration::enablePixels(PixelFECConfigInterface* pixelFEC,
 void PixelCalibConfiguration::disablePixels(PixelFECConfigInterface* pixelFEC,
 			      unsigned int irows, unsigned int icols,
 			      pos::PixelROCTrimBits* trims, 
-			      PixelHdwAddress theROC) const{
+			      const PixelHdwAddress& theROC) const{
 
 	for (unsigned int irow=0;irow<rows_[irows].size();irow++){
 	    for (unsigned int icol=0;icol<cols_[icols].size();icol++){
@@ -1510,7 +1510,7 @@ void PixelCalibConfiguration::disablePixels(PixelFECConfigInterface* pixelFEC,
 
 void PixelCalibConfiguration::disablePixels(PixelFECConfigInterface* pixelFEC,
 					    pos::PixelROCTrimBits* trims, 
-					    PixelHdwAddress theROC) const{
+					    const PixelHdwAddress& theROC) const{
 
   //cout<<" disable ROC "<<theROC.hubaddress()<<" "<<theROC.rocid()<<endl;
   //FIXME This should be done with more efficient commands!

diff --git a/CalibFormats/SiPixelObjects/src/PixelDACScanRange.cc b/CalibFormats/SiPixelObjects/src/PixelDACScanRange.cc
@@ -41,7 +41,7 @@ PixelDACScanRange::PixelDACScanRange(std::string name, unsigned int first,
 }
 
 PixelDACScanRange::PixelDACScanRange(std::string name, 
-				     std::vector<unsigned int> values,
+				     const std::vector<unsigned int>& values,
                                      unsigned int index, bool mixValuesAcrossROCs){
 
   uniformSteps_=false;

diff --git a/CalibFormats/SiPixelObjects/src/PixelMaskAllPixels.cc b/CalibFormats/SiPixelObjects/src/PixelMaskAllPixels.cc
@@ -86,7 +86,7 @@ PixelMaskAllPixels::PixelMaskAllPixels(std::vector< std::vector<std::string> >&
 PixelMaskAllPixels::PixelMaskAllPixels():PixelMaskBase("","",""){;}
 
 //================================================================================================================
-void PixelMaskAllPixels::addROCMaskBits(PixelROCMaskBits bits)
+void PixelMaskAllPixels::addROCMaskBits(const PixelROCMaskBits& bits)
 {
   maskbits_.push_back(bits);
 }

diff --git a/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h b/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h
@@ -25,9 +25,9 @@ class SiStripCoralIface
   /** destructor*/
   ~SiStripCoralIface();
   /** Method to retrieve information from status change table or lastValue table.  queryType defines which table is to be accessed.*/
-  void doQuery(std::string queryType, coral::TimeStamp startTime, coral::TimeStamp endTime, std::vector<coral::TimeStamp>&, std::vector<float>&, std::vector<std::string>& );
+  void doQuery(std::string queryType, const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp>&, std::vector<float>&, std::vector<std::string>& );
   /** Method to access the settings for each channel stored in the status change table*/
-  void doSettingsQuery(coral::TimeStamp startTime,coral::TimeStamp endTime,std::vector<coral::TimeStamp>&,std::vector<float>&,std::vector<std::string>&,std::vector<uint32_t>&);
+  void doSettingsQuery(const coral::TimeStamp& startTime,const coral::TimeStamp& endTime,std::vector<coral::TimeStamp>&,std::vector<float>&,std::vector<std::string>&,std::vector<uint32_t>&);
   //
   void doNameQuery(std::vector<std::string> &vec_dpname, std::vector<uint32_t> &vec_dpid);
  private:

diff --git a/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h b/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
@@ -82,31 +82,31 @@ class SiStripDetVOffBuilder
 
   /** Returns the PSU channel setting, based on date.  Works from DP ID. */
   int findSetting(uint32_t id, 
-		  coral::TimeStamp changeDate, 
-		  std::vector<uint32_t> settingID, 
-		  std::vector<coral::TimeStamp> settingDate);
+		  const coral::TimeStamp& changeDate, 
+		  const std::vector<uint32_t>& settingID, 
+		  const std::vector<coral::TimeStamp>& settingDate);
 
   /** Returns the PSU channel setting, based on date.  Works from PSU channel name. Overloaded. */
   int findSetting(std::string dpname, 
-		  coral::TimeStamp changeDate, 
-		  std::vector<std::string> settingDpname, 
-		  std::vector<coral::TimeStamp> settingDate);
+		  const coral::TimeStamp& changeDate, 
+		  const std::vector<std::string>& settingDpname, 
+		  const std::vector<coral::TimeStamp>& settingDate);
 
   /** Extract the lastValue values from file rather than from the PVSS cond DB. */
   void readLastValueFromFile(std::vector<uint32_t> &dpIDs,
 			     std::vector<float> &vmonValues, 
 			     std::vector<coral::TimeStamp> &dateChange);
 
   /** Utility code to convert a coral timestamp to the correct time format for O2O timestamp. */
-  cond::Time_t getCondTime(coral::TimeStamp coralTime);
+  cond::Time_t getCondTime(const coral::TimeStamp& coralTime);
 
   /** Utility code to convert an O2O timestamp into a coral timestamp. */
   coral::TimeStamp getCoralTime(cond::Time_t iovTime);
 
   /** Utility code to remove all the duplicates from a vector of uint32_t. */
   void removeDuplicates( std::vector<uint32_t> & vec );
   /** */
-  cond::Time_t findMostRecentTimeStamp( std::vector<coral::TimeStamp> coralDate );
+  cond::Time_t findMostRecentTimeStamp( const std::vector<coral::TimeStamp>& coralDate );
 
   // member data
   std::vector< std::vector<uint32_t> > payloadStats;

diff --git a/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h b/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h
@@ -125,7 +125,7 @@ class SiStripPsuDetIdMap
   void clone(DcuPsuVector &input, DcuPsuVector &output);
   /** Produces a detailed debug of the input values. */
   // for debugging
-  void checkMapInputValues(SiStripConfigDb::DcuDetIdsV dcuDetIds_, DcuPsuVector dcuPsus_);
+  void checkMapInputValues(const SiStripConfigDb::DcuDetIdsV& dcuDetIds_, const DcuPsuVector& dcuPsus_);
 
   // member variables
   edm::Service<SiStripConfigDb> db_;

diff --git a/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc b/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc
@@ -48,7 +48,7 @@ void  SiStripCoralIface::initialize() {
 }
 
 // access the status change or lastValue tables
-void SiStripCoralIface::doQuery(std::string queryType, coral::TimeStamp startTime, coral::TimeStamp endTime, std::vector<coral::TimeStamp> &vec_changedate, 
+void SiStripCoralIface::doQuery(std::string queryType, const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp> &vec_changedate, 
 				std::vector<float> &vec_actualValue, std::vector<std::string> &vec_dpname)
 {
   std::auto_ptr<coral::IQuery> query( m_session.schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
@@ -115,7 +115,7 @@ void SiStripCoralIface::doQuery(std::string queryType, coral::TimeStamp startTim
 }
 
 // access the channel settings in the status change table
-void SiStripCoralIface::doSettingsQuery(coral::TimeStamp startTime, coral::TimeStamp endTime, std::vector<coral::TimeStamp> &vec_changedate,
+void SiStripCoralIface::doSettingsQuery(const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp> &vec_changedate,
 					std::vector<float> &vec_settings, std::vector<std::string> &vec_dpname, std::vector<uint32_t> &vec_dpid) 
 {
   std::auto_ptr<coral::IQuery> query( m_session.schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());

diff --git a/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc b/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc
@@ -298,7 +298,7 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
   }
 }
 
-int SiStripDetVOffBuilder::findSetting(uint32_t id, coral::TimeStamp changeDate, std::vector<uint32_t> settingID, std::vector<coral::TimeStamp> settingDate) {
+int SiStripDetVOffBuilder::findSetting(uint32_t id, const coral::TimeStamp& changeDate, const std::vector<uint32_t>& settingID, const std::vector<coral::TimeStamp>& settingDate) {
   int setting = -1;
   // find out how many channel entries there are
   std::vector<int> locations;
@@ -324,7 +324,7 @@ int SiStripDetVOffBuilder::findSetting(uint32_t id, coral::TimeStamp changeDate,
   return setting;
 }
 
-int SiStripDetVOffBuilder::findSetting(std::string dpname, coral::TimeStamp changeDate, std::vector<std::string> settingDpname, std::vector<coral::TimeStamp> settingDate) {
+int SiStripDetVOffBuilder::findSetting(std::string dpname, const coral::TimeStamp& changeDate, const std::vector<std::string>& settingDpname, const std::vector<coral::TimeStamp>& settingDate) {
   int setting = -1;
   // find out how many channel entries there are
   std::vector<int> locations;
@@ -412,7 +412,7 @@ void SiStripDetVOffBuilder::readLastValueFromFile(std::vector<uint32_t> &dpIDs,
   if (changeDates.size() != dateChange.size()) {edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: date conversion failed!!";}
 }
 
-cond::Time_t SiStripDetVOffBuilder::getCondTime(coral::TimeStamp coralTime) {
+cond::Time_t SiStripDetVOffBuilder::getCondTime(const coral::TimeStamp& coralTime) {
 
   // const boost::posix_time::ptime& t = coralTime.time();
   cond::Time_t condTime = cond::time::from_boost(coralTime.time());
@@ -454,7 +454,7 @@ void SiStripDetVOffBuilder::setLastSiStripDetVOff( SiStripDetVOff * lastPayload,
   lastStoredCondObj.second = lastTimeStamp;
 }
 
-cond::Time_t SiStripDetVOffBuilder::findMostRecentTimeStamp( std::vector<coral::TimeStamp> coralDate ) {
+cond::Time_t SiStripDetVOffBuilder::findMostRecentTimeStamp( const std::vector<coral::TimeStamp>& coralDate ) {
   cond::Time_t latestDate = getCondTime(coralDate[0]);
 
   if( debug_ ) {

diff --git a/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc b/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc
@@ -466,7 +466,7 @@ std::vector< std::pair<uint32_t, std::string> > SiStripPsuDetIdMap::getDcuPsuMap
   return emptyVec;
 }
 
-void SiStripPsuDetIdMap::checkMapInputValues(SiStripConfigDb::DcuDetIdsV dcuDetIds_, DcuPsuVector dcuPsus_) {
+void SiStripPsuDetIdMap::checkMapInputValues(const SiStripConfigDb::DcuDetIdsV& dcuDetIds_, const DcuPsuVector& dcuPsus_) {
   std::cout << "Number of entries in DCU-PSU map:    " << dcuPsus_.size() << std::endl;
   std::cout << "Number of entries in DCU-DETID map:  " << dcuDetIds_.size() << std::endl;
   std::cout << std::endl;

diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h
@@ -69,7 +69,7 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy{
     double apvabsoluteOccupancy[6];
   };
 
-  void CalculateMeanAndRMS(std::vector<Apv>, std::pair<double,double>*, int);
+  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double,double>*, int);
 
   void AnalyzeOccupancy(SiStripQuality*, std::vector<Apv>&, std::pair<double,double>*, std::vector<unsigned int>&, edm::ESHandle<SiStripQuality>&);
 

diff --git a/...bTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h b/...bTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h
@@ -78,7 +78,7 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
     int NEmptyBins[6];
   };
 
-  void CalculateMeanAndRMS(std::vector<Apv>, std::pair<double,double>*, int);
+  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double,double>*, int);
 
   void AnalyzeOccupancy(SiStripQuality*, std::vector<Apv>&, std::pair<double,double>*, std::vector<unsigned int>&, edm::ESHandle<SiStripQuality>&);
 

diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
@@ -336,7 +336,7 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality*
 }
 
 
-void SiStripBadAPVAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(std::vector<Apv> a, std::pair<double,double>* MeanRMS, int number_iterations)
+void SiStripBadAPVAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a, std::pair<double,double>* MeanRMS, int number_iterations)
 {
   Double_t tot[7], tot2[7];
   Double_t n[7];

diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
@@ -363,7 +363,7 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVSandStr
 }
 
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(std::vector<Apv> a, std::pair<double,double>* MeanRMS, int number_iterations)
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a, std::pair<double,double>* MeanRMS, int number_iterations)
 {
   Double_t tot[7], tot2[7];
   Double_t n[7];

diff --git a/Calibration/EcalCalibAlgos/interface/ClusterFillMap.h b/Calibration/EcalCalibAlgos/interface/ClusterFillMap.h
@@ -10,10 +10,10 @@ class ClusterFillMap : public VFillMap
 	//!ctor
 	ClusterFillMap (int ,
 			int ,
-			std::map<int,int> ,
+			const std::map<int,int>& ,
 			double,
 			double, 
-		        std::map<int,int>,
+		        const std::map<int,int>&,
   			EcalIntercalibConstantMap *,
 			EcalIntercalibConstantMap *);
 

diff --git a/Calibration/EcalCalibAlgos/interface/MatrixFillMap.h b/Calibration/EcalCalibAlgos/interface/MatrixFillMap.h
@@ -10,10 +10,10 @@ class MatrixFillMap : public VFillMap
 	//! ctor
 	MatrixFillMap (int ,
 		       int ,
-			std::map<int,int> ,
+			const std::map<int,int>& ,
 			double,
 			double, 
-			std::map<int,int>,
+			const std::map<int,int>&,
 			EcalIntercalibConstantMap *,
 			EcalIntercalibConstantMap *);
 	//! dtor

diff --git a/Calibration/EcalCalibAlgos/interface/VFillMap.h b/Calibration/EcalCalibAlgos/interface/VFillMap.h
@@ -15,10 +15,10 @@ class VFillMap
 	//!ctor
 	VFillMap (int ,
 		  int ,
-		  std::map<int,int> ,
+		  const std::map<int,int>& ,
 		  double,
 		  double, 
-		  std::map<int,int>,
+		  const std::map<int,int>&,
 	          EcalIntercalibConstantMap *,
 		  EcalIntercalibConstantMap *); 
 

diff --git a/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h b/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h
@@ -132,7 +132,7 @@ class ZeeCalibration : public edm::ESProducerLooper {
 
   void printStatistics();
 
-  std::pair<DetId, double> getHottestDetId(std::vector<std::pair<DetId, float> > mySCRecHits, const EBRecHitCollection* ebhits , const EERecHitCollection* eehits);
+  std::pair<DetId, double> getHottestDetId(const std::vector<std::pair<DetId, float> >& mySCRecHits, const EBRecHitCollection* ebhits , const EERecHitCollection* eehits);
 
   bool xtalIsOnModuleBorder( EBDetId myEBDetId );
 

diff --git a/Calibration/EcalCalibAlgos/src/ClusterFillMap.cc b/Calibration/EcalCalibAlgos/src/ClusterFillMap.cc
@@ -5,10 +5,10 @@
 
 	ClusterFillMap::ClusterFillMap (int WindowX,
 			int WindowY,
-			std::map<int,int> xtalReg,
+			const std::map<int,int>& xtalReg,
 			double minE,
 			double maxE, 
-			std::map<int,int> IndexReg,
+			const std::map<int,int>& IndexReg,
 			EcalIntercalibConstantMap * barrelMap,
 			EcalIntercalibConstantMap * endcapMap):
    	      VFillMap (WindowX,WindowY,xtalReg,minE,

diff --git a/Calibration/EcalCalibAlgos/src/MatrixFillMap.cc b/Calibration/EcalCalibAlgos/src/MatrixFillMap.cc
@@ -5,10 +5,10 @@
 
 MatrixFillMap::MatrixFillMap (int WindowX,
 	int WindowY,
-	std::map<int,int> xtalReg,
+	const std::map<int,int>& xtalReg,
 	double minE,
 	double maxE, 
-	std::map<int,int> IndexReg,
+	const std::map<int,int>& IndexReg,
 	EcalIntercalibConstantMap * barrelMap,
 	EcalIntercalibConstantMap * endcapMap): 
 

diff --git a/Calibration/EcalCalibAlgos/src/VFillMap.cc b/Calibration/EcalCalibAlgos/src/VFillMap.cc
@@ -1,8 +1,8 @@
 #include "Calibration/EcalCalibAlgos/interface/VFillMap.h"
 
 	VFillMap::VFillMap (int WindowX,int WindowY,
-			std::map<int,int> xtalReg,double minE,
-			double maxE, std::map<int,int> RingReg,
+			const std::map<int,int>& xtalReg,double minE,
+			double maxE, const std::map<int,int>& RingReg,
 			EcalIntercalibConstantMap * barrelMap,
 			EcalIntercalibConstantMap * endcapMap):
 	m_recoWindowSidex (WindowX),