diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArAutoCorrMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArAutoCorrMC.h
index 3d664022019d172964f37d97fb87b01cac121f9e..a67874dc23062dc20ff8412f03473927033f9584 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArAutoCorrMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArAutoCorrMC.h
@@ -14,7 +14,6 @@
#include <vector>
-class LArCablingService ;
/** Implementation of the interface ILArAutoCorr for MC
* Derives from LArAutoCorrComplete, and implements the phi-z symmetry
@@ -37,8 +36,6 @@ class LArAutoCorrMC: public LArAutoCorrComplete {
virtual AutoCorrRef_t autoCorr(const HWIdentifier& CellID, int gain) const ;
- virtual AutoCorrRef_t autoCorr(const Identifier& CellID, int gain) const ;
-
protected:
// helper for MC z-phi symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAMC.h
index 3b1a779bc299aafa06dd54576aa7a6a2ae623019..ef8b38d8e9288e42434eadf4264db780a4122a19 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArDAC2uA for MC
@@ -37,8 +36,6 @@ class LArDAC2uAMC: public LArDAC2uAComplete {
virtual const float& DAC2UA(const HWIdentifier& CellID) const ;
- virtual const float& DAC2UA(const Identifier& CellID) const;
-
static float dummy;
private:
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageMC.h
index be02402e29f9a7b47976476eff1378df8e1e6748..3320dae3a0dc1d7c21649edc9925f47e35b822e5 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArMinBiasAverage for MC
@@ -33,8 +32,6 @@ class LArMinBiasAverageMC: public LArMinBiasAverageComplete {
virtual const float& minBiasAverage(const HWIdentifier& CellID) const ;
- virtual const float& minBiasAverage(const Identifier& CellID) const;
-
static float dummy;
private:
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasMC.h
index 4bd12d0eadabf62bcaf9a1415d8a9e0e3b5478ab..cecedf102765f633bb359f93999ca270eac093fa 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArMinBias for MC
@@ -33,8 +32,6 @@ class LArMinBiasMC: public LArMinBiasComplete {
virtual const float& minBiasRMS(const HWIdentifier& CellID) const ;
- virtual const float& minBiasRMS(const Identifier& CellID) const;
-
static float dummy;
private:
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMphysOverMcalMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMphysOverMcalMC.h
index 398fbb76d7a0a10c06aac13cc99e693c36da241b..b11249afe7adb8be93d4b01e59440542a4efdd1d 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMphysOverMcalMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMphysOverMcalMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArMphysOverMcal for MC
@@ -36,9 +35,6 @@ class LArMphysOverMcalMC: public LArMphysOverMcalComplete {
virtual const float& MphysOverMcal(const HWIdentifier& CellID, int gain=0) const ;
- virtual const float& MphysOverMcal(const Identifier& CellID, int gain=0) const;
-
-
private:
// helper for MC z-phi symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseMC.h
index e830e0d1784a536978abc780448428113e2226fd..bdb6dc580826bab84a603dc9f8acbcd01971021b 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseMC.h
@@ -33,9 +33,7 @@ class LArNoiseMC: public LArNoiseComplete {
// retrieving Noise using online ID
virtual const float& noise(const HWIdentifier& CellID, int gain) const ;
-
- virtual const float& noise(const Identifier& CellID, int gain) const;
-
+
private:
// helper for MC z-phi symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArOFCMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArOFCMC.h
index 10b42c386fb0820c7b16ffea0fe97969577c47ad..01d7b9a0da4cf554684747f8da49953defe20e2d 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArOFCMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArOFCMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArOFC for MC
@@ -42,13 +41,6 @@ class LArOFCMC: public LArOFCComplete {
int gain,
int tbin=0) const ;
- virtual OFCRef_t OFC_a(const Identifier& CellID,
- int gain,
- int tbin=0) const ;
- virtual OFCRef_t OFC_b(const Identifier& CellID,
- int gain,
- int tbin=0) const ;
-
private:
// helper for MC z-phi symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArPedestalMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArPedestalMC.h
index f6b8c12f7f63a6c515b2fcc2dca5961080163c0e..429c18f7b62ffea22796d631e8e13fb9282b7546 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArPedestalMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArPedestalMC.h
@@ -32,10 +32,6 @@ class LArPedestalMC: public ILArPedestal {
float pedestalRMS(const HWIdentifier& CellID, int gain) const ;
- float pedestal(const Identifier& CellID, int gain) const;
-
- float pedestalRMS(const Identifier& CellID, int gain) const;
-
// set method filling the data members individually (if one
// wants to fill this class not using the DB)
void set(const std::vector<float>& vPedestal,
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRampMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRampMC.h
index 550127482de9c5560fa4c54fe5423027b001ebe3..eccade24ec6d904f90dff06966fac111920f4491 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRampMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRampMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILArRamp for MC
@@ -39,8 +38,6 @@ class LArRampMC: public LArRampComplete {
virtual RampRef_t ADC2DAC(const HWIdentifier& CellID, int gain) const ;
- virtual RampRef_t ADC2DAC(const Identifier& CellID, int gain) const;
-
private:
// helper for MC z-phi symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArShape32MC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArShape32MC.h
index 45ae16d12faa6fed4cbbb4355f1440469f4598fb..55f1e73e0e152dd56235df7744b7b6bdd3db2fe5 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArShape32MC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArShape32MC.h
@@ -43,10 +43,6 @@ class LArShape32MC: public ILArShape,
virtual ShapeRef_t Shape (const HWIdentifier& CellID, int gain, int tbin = 0, int mode = 0 ) const ;
virtual ShapeRef_t ShapeDer(const HWIdentifier& CellID, int gain, int tbin = 0, int mode = 0) const ;
- // retrieving Shape using offline ID
- virtual ShapeRef_t Shape (const Identifier& CellID, int gain, int tbin = 0, int mode = 0) const;
- virtual ShapeRef_t ShapeDer(const Identifier& CellID, int gain, int tbin = 0, int mode = 0) const;
-
// set method filling the data members individually (if one
// wants to fill this class not using the DB)
void set(const HWIdentifier& CellID, int gain,
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArShapeMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArShapeMC.h
index 918b9c4daf33f9558bf0707b59e61b7ae6eb3d0a..07febce08e0a3c48f529668648bb73d13b57a666 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArShapeMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArShapeMC.h
@@ -47,15 +47,6 @@ class ILArMCSymTool;
int tbin,
int mode) const ;
- // retrieving Shape using offline ID
- virtual ShapeRef_t Shape (const Identifier& CellID,
- int gain,
- int tbin,
- int mode) const;
- virtual ShapeRef_t ShapeDer(const Identifier& CellID,
- int gain,
- int tbin,
- int mode) const;
private:
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplMC.h
index 966e3355ddecb204dbfc80293cd16d87d8f7ca85..ff63708597da6ca672f9b584e9db4c478ca49911 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplMC.h
@@ -11,7 +11,6 @@
#include <vector>
class ILArMCSymTool;
-class LArCablingService ;
/** Implementation of the interface ILArfSampl for MC
* Derives from LArfSamplComplete, and implements the phi-z symmetry
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LAruA2MeVMC.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LAruA2MeVMC.h
index 0370d3b5857c644fd3d6cecf1fcc509782ac1a74..307fed0de790e23196191a95d5c73e14d55f59c5 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LAruA2MeVMC.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LAruA2MeVMC.h
@@ -10,7 +10,6 @@
#include <vector>
-class LArCablingService ;
class ILArMCSymTool;
/** Implementation of the interface ILAruA2MeV for MC
@@ -37,9 +36,6 @@ class LAruA2MeVMC: public LAruA2MeVComplete {
virtual const float& UA2MEV(const HWIdentifier& CellID) const ;
- virtual const float& UA2MEV(const Identifier& CellID) const;
-
-
private:
ToolHandle<ILArMCSymTool> m_larmcsym;
diff --git a/LArCalorimeter/LArRawConditions/src/LArAutoCorrMC.cxx b/LArCalorimeter/LArRawConditions/src/LArAutoCorrMC.cxx
index 977796d3f4c64074698066d343942d8b405a5287..00ee305d16bea6aded0ef11b28e0d81ef670293b 100755
--- a/LArCalorimeter/LArRawConditions/src/LArAutoCorrMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArAutoCorrMC.cxx
@@ -28,21 +28,8 @@ LArAutoCorrMC::~LArAutoCorrMC() {}
/* retrieve AutoCorr ******************************************************
*/
ILArAutoCorr::AutoCorrRef_t LArAutoCorrMC::autoCorr(const HWIdentifier& CellID, int gain) const
-{
-
-// if(!m_larmcsym) initialize();
- // symmetrize CellID for MC usage
+{ // symmetrize CellID for MC usage
HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
return LArAutoCorrComplete::autoCorr(SymCellID, gain);
}
-ILArAutoCorr::AutoCorrRef_t LArAutoCorrMC::autoCorr(const Identifier& CellID, int gain) const
-{
-// if(!m_larmcsym) initialize();
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArAutoCorrComplete::autoCorr(SymCellID, gain);
-
-}
-
diff --git a/LArCalorimeter/LArRawConditions/src/LArDAC2uAMC.cxx b/LArCalorimeter/LArRawConditions/src/LArDAC2uAMC.cxx
index 427267fc66748afcae255e39d5957a275a03f139..a21fc6de5f005feee0c850d83fe35fe3427ec8ff 100755
--- a/LArCalorimeter/LArRawConditions/src/LArDAC2uAMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArDAC2uAMC.cxx
@@ -35,20 +35,8 @@ LArDAC2uAMC::~LArDAC2uAMC() {}
*/
const float& LArDAC2uAMC::DAC2UA(const HWIdentifier& CellID) const
{
- //if(!m_larmcsym) initialize();
// symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
+ HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
return LArDAC2uAComplete::DAC2UA(SymCellID);
}
-const float& LArDAC2uAMC::DAC2UA(const Identifier& CellID) const
-{
-// if(!m_larmcsym) initialize();
-
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArDAC2uAComplete::DAC2UA(SymCellID);
-
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArHVScaleCorrComplete.cxx b/LArCalorimeter/LArRawConditions/src/LArHVScaleCorrComplete.cxx
index 3fb8ddf0a61a3950367d484ee8768035576af937..2a765cb75bfda2b98a7f4889cb01e3cf2a27a5ba 100644
--- a/LArCalorimeter/LArRawConditions/src/LArHVScaleCorrComplete.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArHVScaleCorrComplete.cxx
@@ -8,7 +8,7 @@ void LArHVScaleCorrComplete::set(const HWIdentifier& CellID, const float corr) {
this->setPdata(CellID,corr);
}
-const float& LArHVScaleCorrComplete::HVScaleCorr(const Identifier& id ) const {
+const float& LArHVScaleCorrComplete::HVScaleCorr(const Identifier&) const {
std::cout << "LArHVScaleCorrComplete access by offlien id not implemented!" << std::endl;
std::abort();
const static float errcode=LArElecCalib::ERRORCODE;
diff --git a/LArCalorimeter/LArRawConditions/src/LArMinBiasAverageMC.cxx b/LArCalorimeter/LArRawConditions/src/LArMinBiasAverageMC.cxx
index 99220338971fd2e0659386456319e7e648978762..65d0abacc6eb7543ce3c07688881538c58ca3a54 100755
--- a/LArCalorimeter/LArRawConditions/src/LArMinBiasAverageMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArMinBiasAverageMC.cxx
@@ -32,21 +32,8 @@ LArMinBiasAverageMC::~LArMinBiasAverageMC() {}
*/
const float& LArMinBiasAverageMC::minBiasAverage(const HWIdentifier& CellID) const
{
-
// symmetrize CellID for MC usage
HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
return LArMinBiasAverageComplete::minBiasAverage(SymCellID);
-
}
-const float& LArMinBiasAverageMC::minBiasAverage(const Identifier& CellID) const
-{
-
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArMinBiasAverageComplete::minBiasAverage(SymCellID);
-
-
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArMinBiasMC.cxx b/LArCalorimeter/LArRawConditions/src/LArMinBiasMC.cxx
index 549b8bc0e40951129d0421838e6ed25edfcbdf31..b80b706a1852f7d1a0aa55005824f581d821ed8a 100755
--- a/LArCalorimeter/LArRawConditions/src/LArMinBiasMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArMinBiasMC.cxx
@@ -32,21 +32,7 @@ LArMinBiasMC::~LArMinBiasMC() {}
*/
const float& LArMinBiasMC::minBiasRMS(const HWIdentifier& CellID) const
{
-
// symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
+ HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
return LArMinBiasComplete::minBiasRMS(SymCellID);
-
-}
-
-const float& LArMinBiasMC::minBiasRMS(const Identifier& CellID) const
-{
-
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArMinBiasComplete::minBiasRMS(SymCellID);
-
-
}
diff --git a/LArCalorimeter/LArRawConditions/src/LArMphysOverMcalMC.cxx b/LArCalorimeter/LArRawConditions/src/LArMphysOverMcalMC.cxx
index 3675cd83e778604160a48465d05622311117c537..0d2354f204ded08ba671e79e88ab12cac49be9fb 100755
--- a/LArCalorimeter/LArRawConditions/src/LArMphysOverMcalMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArMphysOverMcalMC.cxx
@@ -39,10 +39,3 @@ const float& LArMphysOverMcalMC::MphysOverMcal(const HWIdentifier& CellID, int g
return LArMphysOverMcalComplete::MphysOverMcal(SymCellID, gain);
}
-const float& LArMphysOverMcalMC::MphysOverMcal(const Identifier& CellID, int gain) const
-{
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- return LArMphysOverMcalComplete::MphysOverMcal(SymCellID, gain);
-
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArNoiseMC.cxx b/LArCalorimeter/LArRawConditions/src/LArNoiseMC.cxx
index 7de876121e2e750f4d344b35a50778e01b251c84..31f814ed22674d93327c048aad15e2136ac70e29 100755
--- a/LArCalorimeter/LArRawConditions/src/LArNoiseMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArNoiseMC.cxx
@@ -31,24 +31,8 @@ LArNoiseMC::~LArNoiseMC() {}
*/
const float& LArNoiseMC::noise(const HWIdentifier& CellID, int gain) const
{
-
// symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArNoiseComplete::noise(SymCellID,gain);
-
-}
-
-const float& LArNoiseMC::noise(const Identifier& CellID, int gain) const
-{
-
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
+ HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
return LArNoiseComplete::noise(SymCellID,gain);
}
-
-
-
-
diff --git a/LArCalorimeter/LArRawConditions/src/LArOFCMC.cxx b/LArCalorimeter/LArRawConditions/src/LArOFCMC.cxx
index e05365de50d8d05e3f18b15265a71c47e4fcb49b..5c32062db4a0f80b39bcaaa3b7314f7d6695d552 100755
--- a/LArCalorimeter/LArRawConditions/src/LArOFCMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArOFCMC.cxx
@@ -41,29 +41,10 @@ LArOFCMC::OFC_a(const HWIdentifier& CellID,int gain,int tbin) const
}
-
-
LArOFCMC::OFCRef_t
LArOFCMC::OFC_b(const HWIdentifier& CellID,int gain,int tbin) const{
// symmetrize CellID for MC usage
HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
return LArOFCComplete::OFC_b(SymCellID,gain,tbin);
-
}
-
-LArOFCMC::OFCRef_t
-LArOFCMC::OFC_a(const Identifier& CellID, int gain, int tbin) const
-{
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- return LArOFCComplete::OFC_a (SymCellID, gain, tbin);
-}
-
-
-LArOFCMC::OFCRef_t
-LArOFCMC::OFC_b(const Identifier& CellID, int gain, int tbin) const
-{
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- return LArOFCComplete::OFC_b (SymCellID, gain, tbin);
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArPedestalMC.cxx b/LArCalorimeter/LArRawConditions/src/LArPedestalMC.cxx
index 7d35d30ce122824dc9e4f2068ca852fa6642d013..5de1955c0cade3e197b436e9024f15586da55bcb 100755
--- a/LArCalorimeter/LArRawConditions/src/LArPedestalMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArPedestalMC.cxx
@@ -37,15 +37,3 @@ float LArPedestalMC::pedestalRMS(const HWIdentifier& /*CellID*/, int /*gain*/) c
else return LArElecCalib::ERRORCODE;
}
-
-float LArPedestalMC::pedestal(const Identifier& /*CellID*/, int /*gain*/) const
-{
- if (m_vPedestal.size()>0) return m_vPedestal[0];
- else return LArElecCalib::ERRORCODE;
-}
-
-float LArPedestalMC::pedestalRMS(const Identifier& /*CellID*/, int /*gain*/) const
-{
- if (m_vPedestalRMS.size()>0) return m_vPedestalRMS[0];
- else return LArElecCalib::ERRORCODE;
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArRampMC.cxx b/LArCalorimeter/LArRawConditions/src/LArRampMC.cxx
index cec4d623b1ba3683d8a8940cd916c6677c321446..1a3a83a372e7d2dd78c583469c24609e6d02822b 100755
--- a/LArCalorimeter/LArRawConditions/src/LArRampMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArRampMC.cxx
@@ -29,26 +29,7 @@ LArRampMC::~LArRampMC() {}
*/
LArRampMC::RampRef_t LArRampMC::ADC2DAC(const HWIdentifier& CellID,int gain) const
{
-// if(!m_larmcsym) initialize();
-
// symmetrize CellID for MC usage
HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
return LArRampComplete::ADC2DAC(SymCellID,gain);
-
}
-
-LArRampMC::RampRef_t LArRampMC::ADC2DAC(const Identifier& CellID,int gain) const
-{
-// if(!m_larmcsym) initialize();
-
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LArRampComplete::ADC2DAC(SymCellID,gain);
-
-}
-
-
-
-
diff --git a/LArCalorimeter/LArRawConditions/src/LArShape32MC.cxx b/LArCalorimeter/LArRawConditions/src/LArShape32MC.cxx
index 1cc3da8554933ce882bd808d2d7033f8c8708c62..5db275413fc17eff197598e7e75d421ec7b6913e 100755
--- a/LArCalorimeter/LArRawConditions/src/LArShape32MC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArShape32MC.cxx
@@ -3,15 +3,9 @@
*/
#include "LArRawConditions/LArShape32MC.h"
-#include "GaudiKernel/IMessageSvc.h"
-
#include "LArIdentifier/LArOnlineID.h"
-#include "LArCabling/LArCablingService.h"
#include "LArTools/LArMCSymTool.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
#include "AthenaKernel/getMessageSvc.h"
#include "LArRawConditions/LArWaveHelper.h"
@@ -82,28 +76,3 @@ LArShape32MC::ShapeDer(const HWIdentifier& CellID,
const LArShapeP1& t = get(SymCellID,gain) ;
return t.m_vShapeDer;
}
-
-
-LArShape32MC::ShapeRef_t
-LArShape32MC::Shape(const Identifier& CellID,
- int gain,
- int /*tbin*/,
- int /*mode*/) const
-{
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- const LArShapeP1& t = get(SymCellID,gain) ;
- return t.m_vShape;
-}
-
-LArShape32MC::ShapeRef_t
-LArShape32MC::ShapeDer(const Identifier& CellID,
- int gain,
- int /*tbin*/,
- int /*mode*/) const
-{
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- const LArShapeP1& t = get(SymCellID,gain) ;
- return t.m_vShapeDer;
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LArShapeMC.cxx b/LArCalorimeter/LArRawConditions/src/LArShapeMC.cxx
index 42803293a3dc5c56afdcb381f0e37d223f2f3ab0..795c91d91f1d72849aa4b35e8aff0b7fd7fb1e40 100755
--- a/LArCalorimeter/LArRawConditions/src/LArShapeMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LArShapeMC.cxx
@@ -126,24 +126,3 @@ LArShapeMC::ShapeDer(const HWIdentifier& CellID,
do_get_shape (get(SymCellID, gain).m_vShapeDer, CellID, tbin, mode, true, v);
return v;
}
-
-
-LArShapeMC::ShapeRef_t
-LArShapeMC::Shape(const Identifier& CellID,
- int gain,
- int tbin=0,
- int mode=0 ) const
-{
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- return Shape(SymCellID, gain, tbin, mode);
-}
-
-LArShapeMC::ShapeRef_t
-LArShapeMC::ShapeDer(const Identifier& CellID,
- int gain,
- int tbin=0,
- int mode=0) const
-{
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
- return ShapeDer(SymCellID, gain, tbin, mode);
-}
diff --git a/LArCalorimeter/LArRawConditions/src/LAruA2MeVMC.cxx b/LArCalorimeter/LArRawConditions/src/LAruA2MeVMC.cxx
index b309e1290a85d6e15d09477592ed16ae20af0ee3..47bb19826b113b1c2da508974d423b2abf33665e 100755
--- a/LArCalorimeter/LArRawConditions/src/LAruA2MeVMC.cxx
+++ b/LArCalorimeter/LArRawConditions/src/LAruA2MeVMC.cxx
@@ -36,13 +36,3 @@ const float& LAruA2MeVMC::UA2MEV(const HWIdentifier& CellID) const
return LAruA2MeVComplete::UA2MEV(SymCellID) ;
}
-
-const float& LAruA2MeVMC::UA2MEV(const Identifier& CellID) const
-{
- // symmetrize CellID for MC usage
- HWIdentifier SymCellID = m_larmcsym->symOnline(CellID);
-
- return LAruA2MeVComplete::UA2MEV(SymCellID) ;
-
-
-}