Skip to content

Commit a4b8813

Browse files
committed
removed db file + copilot suggestions
1 parent 74b471e commit a4b8813

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

icaruscode/PMT/Calibration/PhotonCalibratorFromDB.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ void icarusDB::PhotonCalibratorFromDB::readCalibrationFromDB(unsigned int run)
7171
log << "Loading calibration for " << channelList.size() << " channels in run " << run;
7272
for( auto channel : channelList ) {
7373

74-
// Laser calibration
74+
// SPE area from database
7575
double area = 0;
7676
int error = fDB.GetNamedChannelData( channel, "area", area );
7777
if( error ) throw cet::exception( "PhotonCalibratorFromDB" ) << "Encountered error (code " << error << ") while trying to access 'area' from the table\n";
7878

79-
fDatabaseSPECalibrations[channel].speArea = area;
79+
fDatabaseSPECalibrations[channel].speArea = area; // ADC x tick
8080
if (fVerbose)
8181
log << "\n channel " << std::setw(3) << channel << " SPE area " << area;
8282
}

icaruscode/PMT/Calibration/PhotonCalibratorFromDB.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class icarusDB::PhotonCalibratorFromDB: public calib::IPhotonCalibrator {
132132

133133
/**
134134
* @brief Whether calibration parameter is area or peak amplitude.
135-
* @return `false` (this calibration is amplitude-based)
135+
* @return `true` (this calibration is area-based)
136136
*/
137137
bool UseArea() const override;
138138

@@ -169,7 +169,7 @@ class icarusDB::PhotonCalibratorFromDB: public calib::IPhotonCalibrator {
169169
}
170170

171171

172-
}; // class icarus::PhotonCalibratorStandard
172+
}; // class icarusDB::PhotonCalibratorFromDB
173173

174174

175175
#endif // ICARUSCODE_PMT_CALIBRATION_PHOTONCALIBRATORFROMDB_H

icaruscode/PMT/Calibration/fcl/pmt_calibration_icarus.fcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
#
55
# Provides the following configuration tables:
66
#
7-
# * pmt_laser_calibration, pmt_calibration_icarus: hit timing calibrations
7+
# * pmt_laser_calibration, pmt_bkgphotons_calibration: hit timing calibrations
88
# * icarus_photon_calibration: configuration of IPhotonCalibratorService
99
#
1010

1111
#include "calibrationtools.fcl"
12+
#include "icarus_spe.fcl"
1213

1314
BEGIN_PROLOG
1415

@@ -47,10 +48,9 @@ pmt_bkgphotons_calibration:
4748
icarus_photon_calibration:
4849
{
4950
service_provider: ICARUSPhotonCalibratorServiceFromDB
50-
5151
AreaTag: "v1r0"
5252
Defaults: {
53-
SPEArea: 256.658 # ADC sum (2-ns sampling), Run2 default
53+
SPEArea: @local::SPERun2.Area # ADC x tick, Run2 default
5454
}
5555
} # icarus_photon_calibration
5656

File renamed without changes.
-2.49 MB
Binary file not shown.

0 commit comments

Comments
 (0)