Cleanup

Author: asanchezcastillo

sbndcode/DatabaseInterface/IPMTCalibrationDatabaseService.h

@@ -27,4 +27,4 @@ DECLARE_ART_SERVICE_INTERFACE(sbndDB::IPMTCalibrationDatabaseService, SHARED)
 
 // -----------------------------------------------------------------------------
 
-#endif // ICARUSCODE_DATABASEINTERFACE_IPMTCALIBRATIONDATABASESERVICE_H
+#endif

sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.cxx

@@ -30,14 +30,13 @@ sbndDB::PMTCalibrationDatabaseProvider::PMTCalibrationDatabaseProvider(
   , fLogCategory{pset.get<std::string>("LogCategory", "PMTTimingCorrection")}
 {
   fhicl::ParameterSet const tags{pset.get<fhicl::ParameterSet>("CorrectionTags")};
-  fCablesTag = tags.get<std::string>("CablesTag");
+  fPMTCalibrationDatabaseTag = tags.get<std::string>("PMTCalibrationDatabaseTag");
   fDatabaseTimeStamp = tags.get<long>("DatabaseTimeStamp");
   fTableName = tags.get<std::string>("TableName");
-  fVariabletoread = tags.get<std::string>("VariableToRead");
   fSERLength = tags.get<size_t>("SERLength");
   if (fVerbose)
     mf::LogInfo(fLogCategory) << "Database tags for timing corrections:\n"
-                              << "Cables corrections  " << fCablesTag << "\n";
+                              << "Cables corrections  " << fPMTCalibrationDatabaseTag << "\n";
 }
 
 // -------------------------------------------------------------------------------
@@ -47,7 +46,7 @@ uint64_t sbndDB::PMTCalibrationDatabaseProvider::RunToDatabaseTimestamp(uint32_t
 
   // Run number to timestamp used in the db
   // DBFolder.h only takes 19 digit (= timestamp in nano second),
-  // but ICARUS tables are currently using run numbers
+  // but SBND tables are currently using run numbers
   // Step 1) Add 1000000000 to the run number; e.g., run XXXXX -> 10000XXXXX
   // Step 2) Multiply 1000000000
   uint64_t runNum = uint64_t(run);
@@ -65,14 +64,10 @@ uint64_t sbndDB::PMTCalibrationDatabaseProvider::RunToDatabaseTimestamp(uint32_t
 /// Function to look up the calibration database at the table holding the pmt hardware cables corrections
 void sbndDB::PMTCalibrationDatabaseProvider::ReadPMTCalibration(uint32_t run)
 {
-
-  // pmt_cables_delay: delays of the cables relative to trigger
-  // and reset distribution
-
   const std::string dbname(fTableName);
-  lariov::DBFolder db(dbname, "", "", fCablesTag, true, false);
+  lariov::DBFolder db(dbname, "", "", fPMTCalibrationDatabaseTag, true, false);
 
-  bool ret = db.UpdateData(fDatabaseTimeStamp); // select table based on run number
+  bool ret = db.UpdateData(fDatabaseTimeStamp); // select table based on timestamp (this is temporary, once we generate db based on run numbers this should be changed)
   mf::LogDebug(fLogCategory) << dbname + " corrections" << (ret ? "" : " not")
                              << " updated for run " << run;
   mf::LogTrace(fLogCategory)

sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.h

@@ -31,18 +31,6 @@ namespace sbndDB{ class PMTCalibrationDatabaseProvider; }
  * @brief 
  * 
  * This module reads the PMT timing corrections from the database.
- * Corrections are picked according to the run number being processed.  
- *
- * All time corrections are offsets (in microseconds) that need to be _added_ to the uncorrected time.
- * 
- * Configuration parameters
- * -------------------------
- * * `CorrectionTags`: tags to select the correction versions:
- *     * `CablesTag` (default: `v1r0`): correction for cable delay.
- *     * `LaserTag` (default: `v1r0`): first order PMT time correction, from laser data.
- *     * `CosmicsTag` (default: `v1r0`): second order PMT time correction, from cosmic rays.
- * * `Verbose` (default: `false`): Print-out the corrections read from the database.
- * * `LogCategory` (default: `PMTTimingCorrection")
  *
  */
 class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
@@ -51,10 +39,8 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
 
         PMTCalibrationDatabaseProvider(const fhicl::ParameterSet& pset);
 
-	/// Read timing corrections from the database
         void readPMTCalibrationDatabase(const art::Run& run);
 
-	/// Get time delay on the trigger line
         int getBreakoutBox( unsigned int channelID ) const override {
             return getChannelCorrOrDefault(channelID).breakoutBox;
         };
@@ -83,12 +69,9 @@ class sbndDB::PMTCalibrationDatabaseProvider : public PMTCalibrationDatabase {
 
         bool fVerbose = false; ///< Whether to print the configuration we read.
         std::string fLogCategory; ///< Category tag for messages.
-        std::string fCablesTag;  ///< Tag for cable corrections database.	
+        std::string fPMTCalibrationDatabaseTag;  
         long fDatabaseTimeStamp;
-        std::string fLaserTag;   ///< Tag for laser corrections database.
-        std::string fCosmicsTag; ///< Tag for cosmics corrections database.	
         std::string fTableName;
-        std::string fVariabletoread;
         size_t fSERLength;
 
         /// Structure for single channel corrections

sbndcode/DatabaseInterface/database_config.fcl

@@ -2,7 +2,12 @@ BEGIN_PROLOG
 
 sbnd_pmttimingservice : {
   service_provider: PMTTimingCorrectionService 
-  CorrectionTags: {CablesTag: "v1r0"} 
+    CorrectionTags: {
+      PMTCalibrationDatabaseTag: "v1r1"
+      DatabaseTimeStamp: 1740739388000000000
+      TableName: "pds_calibration"
+      SERLength: 550
+    }
   Verbose: false
 }