diff --git a/LArCalorimeter/LArCalibUtils/src/LArMasterWaveBuilder.cxx b/LArCalorimeter/LArCalibUtils/src/LArMasterWaveBuilder.cxx
index e51f5fa21b470a85037021d396029a0c2c648e89..878957325f598378bf7cdda1049ba65be0c61063 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArMasterWaveBuilder.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArMasterWaveBuilder.cxx
@@ -279,7 +279,7 @@ StatusCode LArMasterWaveBuilder::stop()
       }
 
       std::vector<double>   vDACs ;
-      std::vector<LArWave*> vWaves ;
+      std::vector<const LArWave*> vWaves ;
       std::vector<bool>     usable ;
       std::vector<int>      thisDAC ;
       std::vector<double>   thisPeak ;
@@ -375,7 +375,7 @@ StatusCode LArMasterWaveBuilder::stop()
       for ( unsigned i=0 ; i<nDACs ; i++ ) {
 	  if ( usable[i] ) {
 	    vDACs.push_back( (double)( thisDAC[i] ) ) ;
-	    LArWave* wave =  const_cast<LArCaliWave*>(&vCaliWaves[i]);
+	    const LArWave* wave =  &vCaliWaves[i];
 	    vWaves.push_back(wave);
 	  } else {
 	      if ( (unsigned int)thisDAC[i] > 1000/gainFactor )   // record bad "non-zero" DACs
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveHelper.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveHelper.h
index 66922817f90df77214f1352239cde8b81f8089fb..07150efb12fa21b16ec4ab760576c19388b736bd 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveHelper.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveHelper.h
@@ -56,7 +56,7 @@ class LArWaveHelper {
 
   // the following returns a linear master waveform and a "dac0" intercept
   // [0] is dac0, [1] is master waveform
-  std::vector<LArWave> linearMasterWave(const std::vector<LArWave*>& vWaves,const std::vector<double> vAmpli) const;
+  std::vector<LArWave> linearMasterWave(const std::vector<const LArWave*>& vWaves,const std::vector<double> vAmpli) const;
 
  private:
 
diff --git a/LArCalorimeter/LArRawConditions/src/LArWaveHelper.cxx b/LArCalorimeter/LArRawConditions/src/LArWaveHelper.cxx
index 221578e095dc795c7c96f873d5411d591ca4f85d..13b24d60f538577a15e6a0bab591078fd99a222c 100755
--- a/LArCalorimeter/LArRawConditions/src/LArWaveHelper.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArWaveHelper.cxx
@@ -490,7 +490,9 @@ std::vector<double> LArWaveHelper::polyfit(const LArWave& theWave,unsigned iFirs
 
 
 
-std::vector<LArWave> LArWaveHelper::linearMasterWave(const std::vector<LArWave*>& vWaves,const std::vector<double> vAmpli) const
+std::vector<LArWave>
+LArWaveHelper::linearMasterWave(const std::vector<const LArWave*>& vWaves,
+                                const std::vector<double> vAmpli) const
 {
   std::vector<LArWave> MWandDAC0 ;
   unsigned nWaves = vWaves.size() ;