Merge branch 'release/v10_10_02'

Author: nathanielerowe

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.09.00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.10.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

sbndcode/CMakeLists.txt

@@ -16,6 +16,7 @@ add_subdirectory(OpDetSim)
 add_subdirectory(OpDetReco)
 add_subdirectory(OpDetAnalyzer)
 add_subdirectory(OpT0Finder)
+add_subdirectory(OpPathTool)
 #add_subdirectory(PDS)
 #add_subdirectory(CosmicId)
 add_subdirectory(ShowerAna)

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h

@@ -25,8 +25,11 @@ namespace sbndDB {
     virtual int getBreakoutBox(unsigned int channelID) const = 0;
     virtual int getCAENDigitizer(unsigned int channelID) const = 0;
     virtual int getCAENDigitizerChannel(unsigned int channelID) const = 0;
+    virtual bool getReconstructChannel(unsigned int channelID) const = 0;
     virtual double getTotalTransitTime(unsigned int channelID) const = 0;
+    virtual double getCosmicTimeCorrection(unsigned int channelID) const = 0;
     virtual double getSPEAmplitude(unsigned int channelID) const = 0;
+    virtual double getSPEAmplitudeStd(unsigned int channelID) const = 0;
     virtual double getGaussFilterPower(unsigned int channelID) const = 0;
     virtual double getGaussFilterWC(unsigned int channelID) const = 0;
     virtual std::vector<double> getSER(unsigned int channelID) const = 0;

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.cxx

@@ -115,6 +115,15 @@ void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
         << ") while trying to access 'caen_digitizer_channel' on table " << dbname << "\n";
     fPMTCalibrationData[channel].caenDigitizerChannel = static_cast<int>(_caen_digitizer_channel);
 
+    // Read reconstruct channel
+    bool _reconstruct_channel = false;
+    error = db.GetNamedChannelData(channel, "reconstruct_channel", _reconstruct_channel);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'reconstruct_channel' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].reconstructChannel = _reconstruct_channel;
+
     // Read total transit time
     double _total_transit_time = 0.;
     error = db.GetNamedChannelData(channel, "total_transit_time", _total_transit_time);
@@ -124,6 +133,15 @@ void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
         << ") while trying to access 'total_transit_time' on table " << dbname << "\n";
     fPMTCalibrationData[channel].totalTransitTime = _total_transit_time;
 
+    // Read cosmic timing correction
+    double _cosmic_timing_correction = 0.;
+    error = db.GetNamedChannelData(channel, "cosmic_timing_correction", _cosmic_timing_correction);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'cosmic_timing_correction' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].cosmicTimeCorrection = _cosmic_timing_correction;
+
     // Read spe amplitude
     double _spe_amplitude = 0.;
     error = db.GetNamedChannelData(channel, "spe_amp", _spe_amplitude);
@@ -133,6 +151,15 @@ void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
         << ") while trying to access 'spe_amplitude' on table " << dbname << "\n";
     fPMTCalibrationData[channel].spe_amplitude = _spe_amplitude;
 
+    // Read spe amplitude std
+    double _spe_amplitude_std = 0.;
+    error = db.GetNamedChannelData(channel, "spe_amp_std", _spe_amplitude_std);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'spe_amplitude_std' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].spe_amplitude_std = _spe_amplitude_std;
+
     // Read gauss filter power
     double _gauss_w_wc_power = 0;
     error = db.GetNamedChannelData(channel, "gauss_w_wc_power", _gauss_w_wc_power);

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.h

@@ -50,12 +50,21 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
         int getCAENDigitizerChannel( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).caenDigitizerChannel;
         };
+        bool getReconstructChannel(unsigned int channelID) const override {
+            return getChannelCorrOrDefault(channelID).reconstructChannel;
+        };
         double getTotalTransitTime( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).totalTransitTime;
         };
+        double getCosmicTimeCorrection(unsigned int channelID) const override {
+            return getChannelCorrOrDefault(channelID).cosmicTimeCorrection;
+        };
         double getSPEAmplitude( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).spe_amplitude;
         };
+        double getSPEAmplitudeStd( unsigned int channelID ) const override {
+            return getChannelCorrOrDefault(channelID).spe_amplitude_std;
+        };
         double getGaussFilterPower( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).gauss_wc_power;
         };
@@ -80,8 +89,11 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
             size_t breakoutBox=0;
             size_t caenDigitizer=0;
             size_t caenDigitizerChannel=0;
-            size_t totalTransitTime=0;
+            bool reconstructChannel=false;
+            double totalTransitTime=0.;
+            double cosmicTimeCorrection=0.;
             double spe_amplitude=0.;
+            double spe_amplitude_std=0.;
             double gauss_wc_power=0.;
             double gauss_wc=0.;
             std::vector<double> ser={};

sbndcode/Calibration/PDSDatabaseInterface/pmtcalibrationdatabase_sbnd.fcl

@@ -4,7 +4,7 @@ sbnd_pmtcalibrationdatabaseservice : {
   service_provider: "PMTCalibrationDatabaseService" 
     CorrectionTags: {
       PMTCalibrationDatabaseTag: "v1r1"
-      DatabaseTimeStamp: 1740739388000000000
+      DatabaseTimeStamp: 1757601071000000000
       TableName: "pds_calibration"
       SERLength: 550
     }