Test2

.github/workflows/fix-eof-newline-coderabbit-docstrings.yml

@@ -0,0 +1,106 @@
+name: Fix missing final newline (CodeRabbit docstring PRs)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: write
+  pull-requests: read
+
+jobs:
+  fix_eof_newline:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Guard - only CodeRabbit docstring PRs from same repo
+        id: guard
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          AUTHOR='${{ github.event.pull_request.user.login }}'
+          BASE_REPO='${{ github.event.pull_request.base.repo.full_name }}'
+          HEAD_REPO='${{ github.event.pull_request.head.repo.full_name }}'
+          TITLE='${{ github.event.pull_request.title }}'
+
+          if [[ "$AUTHOR" != "coderabbitai[bot]" ]]; then
+            echo "run=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # Safety: only push to branches within the same repo
+          if [[ "$BASE_REPO" != "$HEAD_REPO" ]]; then
+            echo "run=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # only run for docstring PRs
+          if ! echo "$TITLE" | grep -qi "docstring"; then
+            echo "run=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          echo "run=true" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout PR head
+        if: steps.guard.outputs.run == 'true'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          fetch-depth: 0
+
+      - name: Append final newline when missing (changed files only)
+        if: steps.guard.outputs.run == 'true'
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          BASE_SHA="${{ github.event.pull_request.base.sha }}"
+          HEAD_SHA="${{ github.event.pull_request.head.sha }}"
+
+          files=$(git diff --name-only "$BASE_SHA" "$HEAD_SHA" -- \
+            '*.C' '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' || true)
+
+          if [[ -z "${files}" ]]; then
+            echo "No relevant files changed."
+            exit 0
+          fi
+
+          changed=0
+          for f in $files; do
+            [[ -f "$f" ]] || continue
+
+            # For non-empty files: ensure last byte is '\n'
+            if [[ -s "$f" ]]; then
+              last_byte="$(tail -c 1 "$f" || true)"
+              if [[ "$last_byte" != $'\n' ]]; then
+                printf '\n' >> "$f"
+                echo "Fixed EOF newline: $f"
+                changed=1
+              fi
+            fi
+          done
+
+          if [[ "$changed" -eq 0 ]]; then
+            echo "All files already end with a newline."
+            exit 0
+          fi
+
+          git status --porcelain
+          git add -A
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git commit -m "Fix missing final newline in docstring PR"
+
+      - name: Push fix commit back to PR branch
+        if: steps.guard.outputs.run == 'true'
+        shell: bash
+        run: |
+          set -euo pipefail
+          # If no commit was created, pushing will fail; so only push if HEAD is ahead.
+          if git rev-parse HEAD~1 >/dev/null 2>&1; then
+            git push origin "HEAD:${{ github.event.pull_request.head.ref }}"
+          fi

calibrations/calorimeter/calo_cdb/CaloCDB-FilterDatasets.cc

@@ -1,6 +1,10 @@
-#include "filter-datasets.h"
+#include "FilterDatasets.h"
+
+#include <phool/recoConsts.h>
 
 #include <iostream>
+#include <string>
+#include <vector>
 
 int main(int argc, const char* const argv[])
 {
@@ -17,7 +21,7 @@ int main(int argc, const char* const argv[])
 
   const std::string& input_csv = args[1];
   std::string output_dir_path = ".";
-  Bool_t debug = false;
+  bool debug = false;
 
   if (args.size() >= 3)
   {
@@ -28,6 +32,9 @@ int main(int argc, const char* const argv[])
     debug = std::stoi(args[3]);
   }
 
+  recoConsts* rc = recoConsts::instance();
+  rc->set_StringFlag("CDB_GLOBALTAG", "newcdbtag");
+
   FilterDatasets filter(debug);
   filter.process(input_csv, output_dir_path);
 

calibrations/calorimeter/calo_cdb/CaloCDB-GenStatus.cc

@@ -1,6 +1,7 @@
-#include "genStatus.h"
+#include "GenStatus.h"
 
 #include <iostream>
+#include <string>
 #include <vector>
 
 int main(int argc, const char* const argv[])

calibrations/calorimeter/calo_cdb/filter-datasets.cc → calibrations/calorimeter/calo_cdb/FilterDatasets.cc

@@ -1,14 +1,18 @@
 
-#include "filter-datasets.h"
+#include "FilterDatasets.h"
 
 // -- My Utils --
 #include "myUtils.h"
 
-// c++ includes --
+// sPHENIX includes --
+#include <ffamodules/CDBInterface.h>
+#include <phool/recoConsts.h>
+
+#include <RtypesCore.h>
 #include <filesystem>
 #include <fstream>
-#include <iomanip>
 #include <iostream>
+#include <sstream>
 
 FilterDatasets::FilterDatasets(Bool_t debug)
   : m_debug(debug)
@@ -30,21 +34,12 @@ void FilterDatasets::readRunInfo(const std::string &line)
 
 std::string FilterDatasets::getCalibration(const std::string &pl_type, uint64_t iov)
 {
-  if (!uti)
-  {
-    uti = std::make_unique<CDBUtils>();
-  }
-  return uti->getUrl(pl_type, iov);
-}
+  recoConsts *rc = recoConsts::instance();
+  // Update the global timestamp flag for the current run in the loop
+  rc->set_uint64Flag("TIMESTAMP", iov);
 
-int FilterDatasets::setGlobalTag(const std::string &tagname)
-{
-  if (!uti)
-  {
-    uti = std::make_unique<CDBUtils>();
-  }
-  int iret = uti->setGlobalTag(tagname);
-  return iret;
+  // Fetch the calibration URL via CDBInterface
+  return CDBInterface::instance()->getUrl(pl_type);
 }
 
 void FilterDatasets::analyze(const std::string &input, const std::string &outputDir)
@@ -142,8 +137,6 @@ void FilterDatasets::process(const std::string &input, const std::string &output
   std::cout << "Debug: " << ((m_debug) ? "True" : "False") << std::endl;
   std::cout << "#############################" << std::endl;
 
-  setGlobalTag("newcdbtag");
-
   std::filesystem::path input_filepath_obj(input);
   if (!myUtils::readCSV(input_filepath_obj, [this](const std::string &line)
                         { this->readRunInfo(line); }))

calibrations/calorimeter/calo_cdb/filter-datasets.h → calibrations/calorimeter/calo_cdb/FilterDatasets.h

@@ -1,23 +1,16 @@
 #ifndef CALOCDB_FILTERDATASETS_H
 #define CALOCDB_FILTERDATASETS_H
 
-// -- sPHENIX includes --
-#include <sphenixnpc/CDBUtils.h>
-
-// -- ROOT includes --
-#include <RtypesCore.h>
-
 // -- c++ includes --
 #include <map>
-#include <memory>
+#include <cstdint>
 #include <string>
-#include <utility>
 #include <vector>
 
 class FilterDatasets
 {
  public:
-  explicit FilterDatasets(Bool_t debug = false);
+  explicit FilterDatasets(bool debug = false);
 
   void process(const std::string &input, const std::string &output = ".");
 
@@ -26,7 +19,6 @@ class FilterDatasets
   void readRunInfo(const std::string &line);
 
   std::string getCalibration(const std::string &pl_type, uint64_t iov);
-  int setGlobalTag(const std::string &tagname);
 
   std::vector<std::pair<std::string, std::string>> m_runInfo;
   std::map<std::string, int> m_ctr;
@@ -36,9 +28,7 @@ class FilterDatasets
                                       , "CEMC_hotTowers_fracBadChi2", "HCALIN_hotTowers_fracBadChi2", "HCALOUT_hotTowers_fracBadChi2"
                                       , "CEMC_ZSCrossCalib", "HCALIN_ZSCrossCalib", "HCALOUT_ZSCrossCalib"};
 
-  Bool_t m_debug;
-
-  std::unique_ptr<CDBUtils> uti{nullptr};
+  bool m_debug;
 };
 
 #endif

calibrations/calorimeter/calo_cdb/genStatus.cc → calibrations/calorimeter/calo_cdb/GenStatus.cc

@@ -1,4 +1,4 @@
-#include "genStatus.h"
+#include "GenStatus.h"
 
 #include "geometry_constants.h"
 
@@ -15,7 +15,6 @@
 // c++ includes --
 #include <filesystem>
 #include <fstream>
-#include <iomanip>
 #include <iostream>
 #include <map>
 

calibrations/calorimeter/calo_cdb/Makefile.am

@@ -15,18 +15,22 @@ AM_LDFLAGS = \
   -L$(OFFLINE_MAIN)/lib64 \
    `root-config --libs`
 
+# Headers installed for use in macros and by other packages
 pkginclude_HEADERS = \
-  genStatus.h \
-  filter-datasets.h \
-  geometry_constants.h \
+  GenStatus.h \
+  geometry_constants.h
+
+# Headers used only for building this library and its binaries
+noinst_HEADERS = \
+  FilterDatasets.h \
   myUtils.h
 
 lib_LTLIBRARIES = \
   libcalo_cdb.la
 
 libcalo_cdb_la_SOURCES = \
-  genStatus.cc \
-  filter-datasets.cc \
+  GenStatus.cc \
+  FilterDatasets.cc \
   myUtils.cc
 
 libcalo_cdb_la_LIBADD = \
@@ -35,6 +39,7 @@ libcalo_cdb_la_LIBADD = \
   -lcalo_io \
   -lcdbobjects \
   -lsphenixnpc \
+  -lffamodules \
   -lemcNoisyTowerFinder
 
 CaloCDB_GenStatus_SOURCES = CaloCDB-GenStatus.cc

calibrations/calorimeter/calo_cdb/myUtils.cc

@@ -4,9 +4,12 @@
 // root includes --
 #include <TF1.h>
 #include <TFitResult.h>
+#include <TH1.h>
+#include <TMath.h>
 
 // c++ includes --
 #include <memory>
+#include <sstream>
 
 TFitResultPtr myUtils::doGausFit(TH1 *hist, Double_t start, Double_t end, const std::string &name)
 {

calibrations/calorimeter/calo_cdb/myUtils.h

@@ -2,18 +2,19 @@
 #define CALOCDB_MYUTILS_H
 
 // ROOT includes --
+#include <RtypesCore.h>
 #include <TFitResultPtr.h>
-#include <TH1.h>
 
 // -- c++ includes --
 #include <concepts>
 #include <filesystem>
 #include <fstream>
-#include <functional>
 #include <iostream>
 #include <string>
 #include <vector>
 
+class TH1;
+
 template <typename Func>
 concept InvocableWithString = std::invocable<Func, const std::string&>;
 
@@ -39,7 +40,7 @@ class myUtils
    * @return true if the file was successfully opened and read, false otherwise.
    */
   template <InvocableWithString Callable>  // Using the more general concept for wider applicability
-  static Bool_t readCSV(const std::filesystem::path& filePath, Callable lineHandler, Bool_t skipHeader = true)
+  static bool readCSV(const std::filesystem::path& filePath, Callable lineHandler, bool skipHeader = true)
   {
     std::ifstream file(filePath);
 

calibrations/framework/oncal/OnCal.cc → calibrations/framework/fun4cal/CalReco.cc

@@ -1,23 +1,23 @@
-#include "OnCal.h"
+#include "CalReco.h"
 
 #include <fun4all/SubsysReco.h>  // for SubsysReco
 
 #include <phool/phool.h>  // for PHWHERE
 
 #include <iostream>
 
-OnCal::OnCal(const std::string &Name)
+CalReco::CalReco(const std::string &Name)
   : SubsysReco(Name)
 {
 }
 
-int OnCal::process_event(PHCompositeNode * /*topNode*/)
+int CalReco::process_event(PHCompositeNode * /*topNode*/)
 {
   std::cout << "process_event(PHCompositeNode *topNode) not implemented by daughter class: " << Name() << std::endl;
   return -1;
 }
 
-int OnCal::End(PHCompositeNode * /*topNode*/)
+int CalReco::End(PHCompositeNode * /*topNode*/)
 {
   std::cout << "EndOfAnalysis not implemented by subsystem!" << std::endl;
   std::cout << "Use this signal for computing your calibrations and commit." << std::endl;
@@ -26,7 +26,7 @@ int OnCal::End(PHCompositeNode * /*topNode*/)
   return 0;
 }
 
-void OnCal::AddComment(const std::string &adcom)
+void CalReco::AddComment(const std::string &adcom)
 {
   if (m_Comment.empty())
   {
@@ -40,7 +40,7 @@ void OnCal::AddComment(const std::string &adcom)
   return;
 }
 
-int OnCal::CopyTables(const int /*FromRun*/, const int /*ToRun*/, const int /*commit*/) const
+int CalReco::CopyTables(const int /*FromRun*/, const int /*ToRun*/, const int /*commit*/) const
 {
   std::cout << PHWHERE << " CopyTables not implemented" << std::endl
             << "this calibrator cannot copy its own tables" << std::endl;