Skip to content

Commit 7a520f6

Browse files
Undo unrequired changes
1 parent 3ee8046 commit 7a520f6

1 file changed

Lines changed: 3 additions & 17 deletions

File tree

sbndcode/OpDetReco/OpDeconvolution/Alg/OpDeconvolutionAlgWienerData_tool.cc

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
#include "TComplex.h"
2727

2828
#include "sbndcode/OpDetReco/OpDeconvolution/Alg/OpDeconvolutionAlg.hh"
29-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabase.h"
30-
#include "sbndcode/DatabaseInterface/IPMTCalibrationDatabaseService.h"
29+
3130

3231
namespace opdet {
3332
class OpDeconvolutionAlgWiener;
@@ -89,8 +88,6 @@ class opdet::OpDeconvolutionAlgWiener : opdet::OpDeconvolutionAlg {
8988
short unsigned int fBaseSampleBins;
9089
double fBaseVarCut;
9190

92-
sbndDB::PMTCalibrationDatabase const* fPMTCalibrationDatabaseService;
93-
9491
// Declare member functions
9592
void ApplyExpoAvSmoothing(std::vector<double>& wf);
9693
void ApplyUnAvSmoothing(std::vector<double>& wf);
@@ -169,9 +166,7 @@ opdet::OpDeconvolutionAlgWiener::OpDeconvolutionAlgWiener(fhicl::ParameterSet co
169166
fSinglePEWaveVector = *SinglePEVec_p;
170167
fSinglePEChannels = *fSinglePEChannels_p;
171168
fPeakAmplitude = *fPeakAmplitude_p;
172-
fFilterParamVector = *fFilterParamVector_p;
173-
174-
fPMTCalibrationDatabaseService = lar::providerFrom<sbndDB::IPMTCalibrationDatabaseService const>();
169+
fFilterParamVector = *fFilterParamVector_p;
175170

176171
mf::LogInfo("OpDeconvolutionAlg")<<"Loaded SER from "<<fOpDetDataFile<<"... size="<<fSinglePEWave.size()<<std::endl;
177172
file->Close();
@@ -199,15 +194,6 @@ opdet::OpDeconvolutionAlgWiener::OpDeconvolutionAlgWiener(fhicl::ParameterSet co
199194

200195
std::vector<raw::OpDetWaveform> opdet::OpDeconvolutionAlgWiener::RunDeconvolution(std::vector<raw::OpDetWaveform> const& wfVector)
201196
{
202-
203-
int channel_0= 6;
204-
int channel_1 = 7;
205-
int breakoutbox_0 = fPMTCalibrationDatabaseService->getBreakoutBox(channel_0);
206-
int breakoutbox_1 = fPMTCalibrationDatabaseService->getBreakoutBox(channel_1);
207-
208-
std::cout << " breakcout box for channel " << channel_0 << " is " << breakoutbox_0 << std::endl;
209-
std::cout << " breakcout box for channel " << channel_1 << " is " << breakoutbox_1 << std::endl;
210-
211197
std::vector<raw::OpDetWaveform> wfDeco;
212198
wfDeco.reserve(wfVector.size());
213199
for(auto const& wf : wfVector)
@@ -563,4 +549,4 @@ std::vector<TComplex> opdet::OpDeconvolutionAlgWiener::DeconvolutionKernel(size_
563549
return kernel;
564550
}
565551

566-
DEFINE_ART_CLASS_TOOL(opdet::OpDeconvolutionAlgWiener)
552+
DEFINE_ART_CLASS_TOOL(opdet::OpDeconvolutionAlgWiener)

0 commit comments

Comments
 (0)