fix cout of current areatag

Author: mvicenzi

icaruscode/PMT/Calibration/CMakeLists.txt

@@ -79,6 +79,7 @@ cet_build_plugin( OpHitRecalibrator art::module
                 lardataobj::RecoBase
                 lardataobj::RawData
                 larcore::Geometry_Geometry_service
+                larreco::PhotonCalibrator   # IPhotonCalibrator interface
                 icaruscode_Timing
               )
 

icaruscode/PMT/Calibration/ICARUSPhotonCalibratorServiceFromDB.h

@@ -56,7 +56,7 @@ namespace calib {
 
     ICARUSPhotonCalibratorServiceFromDB(Parameters const& params, art::ActivityRegistry& reg);
 
-    virtual std::string getAreaDatabaseTag() const = 0;
+    std::string getAreaDatabaseTag() const { return fProvider.getAreaDatabaseTag(); }
 
   private:
     provider_type const* provider() const override { return &fProvider; }

icaruscode/PMT/Calibration/OpHitRecalibrator_module.cc

@@ -113,7 +113,7 @@ class icarus::OpHitRecalibrator : public art::SharedProducer
 
     /// Pointers to the online corrections services
     icarusDB::PMTTimingCorrections const &fPMTTimingCorrectionsService;
-    icarusDB::PhotonCalibratorFromDB const &fPhotonCalibratorService;
+    calib::IPhotonCalibrator const &fPhotonCalibratorService;
 
     /// Pointer to the provider for the old pmt corrections
     std::unique_ptr<icarusDB::PMTTimingCorrectionsProvider> fOldTimingProvider;
@@ -129,7 +129,7 @@ icarus::OpHitRecalibrator::OpHitRecalibrator(fhicl::ParameterSet const &config,
       fSPEArea{config.get<double>("SPEArea", -1.)},
       fVerbose{config.get<bool>("Verbose", false)},
       fPMTTimingCorrectionsService{*(lar::providerFrom<icarusDB::IPMTTimingCorrectionService const>())},
-      fPhotonCalibratorService{*(lar::providerFrom<icarusDB::ICARUSPhotonCalibratorServiceFromDB const>())},
+      fPhotonCalibratorService{*(lar::providerFrom<calib::IPhotonCalibratorService const>())},
       fOldTimingProvider{std::make_unique<icarusDB::PMTTimingCorrectionsProvider>(config.get<fhicl::ParameterSet>("OldTimingDBTags"))}
 {
     async<art::InEvent>();
@@ -166,8 +166,9 @@ icarus::OpHitRecalibrator::OpHitRecalibrator(fhicl::ParameterSet const &config,
 
     if (fRecalibratePE && fUseGainDatabase)
     {
-        mf::LogInfo("OpHitRecalibrator") << "Re-calibration of PE (gain) enabled:\n"
-                                         << "AreaTag: " << fPhotonCalibratorService.getAreaDatabaseTag();
+        art::ServiceHandle<calib::ICARUSPhotonCalibratorServiceFromDB const> serv; //really sorry about this
+        mf::LogInfo("OpHitRecalibrator") << "Re-calibration of PE (gain) from database enabled:\n"
+                                         << "AreaTag: " << serv->getAreaDatabaseTag();
     }
 
     // Consumes

icaruscode/PMT/Calibration/PhotonCalibratorFromDB.h

@@ -149,7 +149,7 @@ class icarusDB::PhotonCalibratorFromDB: public calib::IPhotonCalibrator {
     std::uint64_t RunToDatabaseTimestamp( unsigned int run ) const;
 
     /// Get current area database tag
-    std::string getAreaDatabaseTag() const override { return fAreaTag; }
+    std::string getAreaDatabaseTag() const { return fAreaTag; }
 
   private: