Merge branch 'develop' into feature/sungbino_timedep_etau

Author: nathanielerowe

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h

@@ -25,13 +25,16 @@ 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 getOnPMT(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 double getNonLineatiryPESat(unsigned int channelID) const = 0;
+    virtual double getNonLineatiryAlpha(unsigned int channelID) const = 0;
     virtual std::vector<double> getSER(unsigned int channelID) const = 0;
   }; // end class
 

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.cxx

@@ -114,6 +114,14 @@ void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
         << "Encountered error (code " << error
         << ") while trying to access 'caen_digitizer_channel' on table " << dbname << "\n";
     fPMTCalibrationData[channel].caenDigitizerChannel = static_cast<int>(_caen_digitizer_channel);
+    // Read on PMT
+    bool _on_pmt = false;
+    error = db.GetNamedChannelData(channel, "on_pmt", _on_pmt);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'on_pmt' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].onPMT = _on_pmt;
 
     // Read reconstruct channel
     bool _reconstruct_channel = false;
@@ -178,6 +186,21 @@ void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
         << dbname << "\n";
     fPMTCalibrationData[channel].gauss_wc = _gauss_wc;
 
+    double _nonlinearity_pesat = 0.;
+    error = db.GetNamedChannelData(channel, "nonlinearity_pesat", _nonlinearity_pesat);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'nonlinearity_pesat' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].nonlinearity_pesat = _nonlinearity_pesat;
+    double _nonlinearity_alpha = 0.;
+    error = db.GetNamedChannelData(channel, "nonlinearity_alpha", _nonlinearity_alpha);
+    if (error)
+      throw cet::exception("PMTTimingCorrectionsProvider")
+        << "Encountered error (code " << error
+        << ") while trying to access 'nonlinearity_alpha' on table " << dbname << "\n";
+    fPMTCalibrationData[channel].nonlinearity_alpha = _nonlinearity_alpha;
+    
     // Read SER
     std::vector<double> _ser;
     std::string name_base = "ser_vec_";

sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.h

@@ -50,6 +50,9 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
         int getCAENDigitizerChannel( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).caenDigitizerChannel;
         };
+        bool getOnPMT(unsigned int channelID) const override {
+            return getChannelCorrOrDefault(channelID).onPMT;
+        };
         bool getReconstructChannel(unsigned int channelID) const override {
             return getChannelCorrOrDefault(channelID).reconstructChannel;
         };
@@ -71,6 +74,12 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
         double getGaussFilterWC( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).gauss_wc;
         };
+        double getNonLineatiryPESat( unsigned int channelID ) const override {
+            return getChannelCorrOrDefault(channelID).nonlinearity_pesat;
+        };
+        double getNonLineatiryAlpha( unsigned int channelID ) const override {
+            return getChannelCorrOrDefault(channelID).nonlinearity_alpha;
+        };
         std::vector<double> getSER( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).ser;
         };
@@ -89,18 +98,20 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
             size_t breakoutBox=0;
             size_t caenDigitizer=0;
             size_t caenDigitizerChannel=0;
+            bool onPMT=true;
             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.;
+            double nonlinearity_pesat=0.;
+            double nonlinearity_alpha=0.;
             std::vector<double> ser={};
             };
 
-        const PMTCalibrationDB CorrectionDefaults = {0, 0, 0, 0, 0.0, 0.0, 0.0, {}};
-
+        const PMTCalibrationDB CorrectionDefaults = {0, 0, 0, true, false, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, {}};
 	    /// Map of corrections by channel
         std::map<unsigned int, PMTCalibrationDB> fPMTCalibrationData;
 

sbndcode/Calibration/configurations/calibration_database_PDS_TagSets_sbnd.fcl

@@ -10,8 +10,8 @@ BEGIN_PROLOG
 
 # For SBND 2025 Fall production
 PDS_CalibrationTags_Nov2025: {
-  PMTCalibrationDatabaseTag:    "v1r1"
-  DatabaseTimeStamp: 1757601071000000000
+  PMTCalibrationDatabaseTag:    "v2r1"
+  DatabaseTimeStamp: 1763157679000000000
 }
 
 END_PROLOG

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

@@ -155,6 +155,9 @@ physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
 # Include 3D barycenter flahs matching 
 physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching"
 
+# Include MC version of PMT Software Trigger
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricmc"
+
 # Overwrite weight_functions label:
 physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
 physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnblight.fcl

@@ -1,3 +1,4 @@
 #include "cafmakerjob_sbnd_data_base.fcl"
 
 physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnblight"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_bnbzerobias.fcl

@@ -1,3 +1,4 @@
 #include "cafmakerjob_sbnd_data_base.fcl"
 
 physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnbzero"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_offbeamlight.fcl

@@ -1,3 +1,4 @@
 #include "cafmakerjob_sbnd_data_base.fcl"
 
 physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricoffbeamlight"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_bnblight.fcl

@@ -1,3 +1,4 @@
 #include "cafmakerjob_sbnd_data_sce.fcl"
 
 physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnblight"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce_bnbzerobias.fcl

@@ -1,3 +1,4 @@
 #include "cafmakerjob_sbnd_data_sce.fcl"
 
 physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"
+physics.producers.cafmaker.SBNDSoftwareTriggerLabel: "pmtmetricbnbzero"