Linter fixes

Author: ekryshen

Common/TableProducer/eventSelectionService.cxx

@@ -44,7 +44,7 @@ using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Run3MatchedToBCSparse>;
 using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
 using FullTracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
 
-struct eventselectionRun2 {
+struct EventselectionRun2 { // o2-linter: disable=name/workflow-file (exception due to metadata-driven topology)
   o2::common::timestamp::TimestampConfigurables timestampConfigurables;
   o2::common::timestamp::TimestampModule timestampMod;
 
@@ -103,7 +103,7 @@ struct eventselectionRun2 {
   }
 };
 
-struct eventselectionRun3 {
+struct EventselectionRun3 { // o2-linter: disable=name/workflow-file (exception due to metadata-driven topology)
   o2::common::timestamp::TimestampConfigurables timestampConfigurables;
   o2::common::timestamp::TimestampModule timestampMod;
 
@@ -167,7 +167,7 @@ struct eventselectionRun3 {
   }
 };
 
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) // o2-linter: disable=o2-workflow-options (metadata-driven topology selection)
 {
   // Parse the metadata for later too
   metadataInfo.initMetadata(cfgc);
@@ -185,18 +185,18 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     LOGF(warn, "Metadata info missing or incomplete. Make sure --aod-file is provided at the end of the last workflow and that the AO2D has metadata stored.");
     LOGF(warn, "Initializing with Run 3 data as default. Please note you will not be able to change settings manually.");
     LOGF(warn, "You should instead make sure the metadata is read in correctly.");
-    return WorkflowSpec{adaptAnalysisTask<eventselectionRun3>(cfgc)};
+    return WorkflowSpec{adaptAnalysisTask<EventselectionRun3>(cfgc)};
   } else {
     LOGF(info, "Metadata successfully read in. Is this Run 3? %i - will self-configure.", isRun3);
     if (isRun3) {
-      return WorkflowSpec{adaptAnalysisTask<eventselectionRun3>(cfgc)};
+      return WorkflowSpec{adaptAnalysisTask<EventselectionRun3>(cfgc)};
     } else {
       LOGF(warn, "******************************************************************");
       LOGF(warn, " Event selection service self-configuring for Run 2.");
       LOGF(warn, " WARNING: THIS HAS NOT BEEN VALIDATED YET, USE WITH CAUTION");
       LOGF(warn, " If this fails, please use event-selection-service-run2 instead.");
       LOGF(warn, "******************************************************************");
-      return WorkflowSpec{adaptAnalysisTask<eventselectionRun2>(cfgc)};
+      return WorkflowSpec{adaptAnalysisTask<EventselectionRun2>(cfgc)};
     }
   }
   throw std::runtime_error("Unsupported run type / problem when configuring event selection!");

Common/TableProducer/eventSelectionServiceRun2.cxx

@@ -43,7 +43,7 @@ using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Run3MatchedToBCSparse>;
 using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
 using FullTracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
 
-struct eventselectionRun2 {
+struct EventselectionRun2 {
   o2::common::timestamp::TimestampConfigurables timestampConfigurables;
   o2::common::timestamp::TimestampModule timestampMod;
 
@@ -102,7 +102,7 @@ struct eventselectionRun2 {
   }
 };
 
-struct eventselectionRun3 {
+struct EventselectionRun3 {
   o2::common::timestamp::TimestampConfigurables timestampConfigurables;
   o2::common::timestamp::TimestampModule timestampMod;
 
@@ -175,5 +175,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
   LOGF(info, "To be improved once metadata enabling in defineDataProcessing is worked out.");
 
   // force Run 2 mode
-  return WorkflowSpec{adaptAnalysisTask<eventselectionRun2>(cfgc)};
+  return WorkflowSpec{adaptAnalysisTask<EventselectionRun2>(cfgc)};
 }

Common/Tools/EventSelectionModule.h

@@ -10,7 +10,7 @@
 // or submit itself to any jurisdiction.
 
 /// \file EventSelectionModule.h
-/// \brief Event selection modeule
+/// \brief Event selection module
 /// \author ALICE
 
 #ifndef COMMON_TOOLS_EVENTSELECTIONMODULE_H_

Common/Tools/timestampModule.h

@@ -9,6 +9,10 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file timestampModule.h
+/// \brief Timestamp module
+/// \author ALICE
+
 #ifndef COMMON_TOOLS_TIMESTAMPMODULE_H_
 #define COMMON_TOOLS_TIMESTAMPMODULE_H_
 
@@ -36,8 +40,7 @@ struct TimestampConfigurables : o2::framework::ConfigurableGroup {
   std::string prefix = "timestamp";
   o2::framework::Configurable<bool> verbose{"verbose", false, "verbose mode"};
   o2::framework::Configurable<bool> fatalOnInvalidTimestamp{"fatalOnInvalidTimestamp", false, "Generate fatal error for invalid timestamps"};
-  o2::framework::Configurable<std::string> rct_path{"rct-path", "RCT/Info/RunInformation", "path to the ccdb RCT objects for the SOR timestamps"};
-  o2::framework::Configurable<std::string> orbit_reset_path{"orbit-reset-path", "CTP/Calib/OrbitReset", "path to the ccdb orbit-reset objects"};
+  o2::framework::Configurable<std::string> orbitResetPath{"orbit-reset-path", "CTP/Calib/OrbitReset", "path to the ccdb orbit-reset objects"};                                                             // o2-linter: disable=name/configurable (temporary fix)
   o2::framework::Configurable<int> isRun2MC{"isRun2MC", -1, "Running mode: enable only for Run 2 MC. Timestamps are set to SOR timestamp. Default: -1 (autoset from metadata) 0 (Standard) 1 (Run 2 MC)"}; // o2-linter: disable=name/configurable (temporary fix)
 };
 
@@ -104,22 +107,24 @@ class TimestampModule
 
         // clear cache to prevent interference with orbit reset queries from other code
         // FIXME this should not have been a problem, to be investigated
-        ccdb->clearCache(timestampOpts.orbit_reset_path.value.data());
+        ccdb->clearCache(timestampOpts.orbitResetPath.value.data());
 
-        const bool isUnanchoredRun3MC = runNumber >= 300000 && runNumber < 500000;
+        constexpr int maxRunNumberUnanchored = 499999;
+        constexpr int minRunNumberUnanchored = 300000;
+        const bool isUnanchoredRun3MC = runNumber >= minRunNumberUnanchored && runNumber < maxRunNumberUnanchored;
         if (timestampOpts.isRun2MC.value == 1 || isUnanchoredRun3MC) {
           // isRun2MC: bc/orbit distributions are not simulated in Run2 MC. All bcs are set to 0.
           // isUnanchoredRun3MC: assuming orbit-reset is done in the beginning of each run
           // Setting orbit-reset timestamp to start-of-run timestamp
-          orbitResetTimestamp = sorTimestamp * 1000; // from ms to us
-        } else if (runNumber < 300000) {             // Run 2
+          orbitResetTimestamp = sorTimestamp * 1000;     // from ms to us
+        } else if (runNumber < minRunNumberUnanchored) { // Run 2
           LOGF(debug, "Getting orbit-reset timestamp using start-of-run timestamp from CCDB");
-          auto ctp = ccdb->template getSpecific<std::vector<int64_t>>(timestampOpts.orbit_reset_path.value.data(), sorTimestamp);
+          auto ctp = ccdb->template getSpecific<std::vector<int64_t>>(timestampOpts.orbitResetPath.value.data(), sorTimestamp);
           orbitResetTimestamp = (*ctp)[0];
         } else {
           // sometimes orbit is reset after SOR. Using EOR timestamps for orbitReset query is more reliable
           LOGF(debug, "Getting orbit-reset timestamp using end-of-run timestamp from CCDB");
-          auto ctp = ccdb->template getSpecific<std::vector<int64_t>>(timestampOpts.orbit_reset_path.value.data(), eorTimestamp / 2 + sorTimestamp / 2);
+          auto ctp = ccdb->template getSpecific<std::vector<int64_t>>(timestampOpts.orbitResetPath.value.data(), eorTimestamp / 2 + sorTimestamp / 2);
           orbitResetTimestamp = (*ctp)[0];
         }
 
@@ -136,7 +141,7 @@ class TimestampModule
       if (timestampOpts.verbose) {
         LOGF(info, "Orbit-reset timestamp for run number %i found: %llu us", runNumber, orbitResetTimestamp);
       }
-      int64_t timestamp{(orbitResetTimestamp + int64_t(bc.globalBC() * o2::constants::lhc::LHCBunchSpacingNS * 1e-3)) / 1000}; // us -> ms
+      int64_t timestamp{(orbitResetTimestamp + static_cast<int64_t>(bc.globalBC() * o2::constants::lhc::LHCBunchSpacingNS * 1e-3)) / 1000}; // us -> ms
       if (timestamp < runDuration.first || timestamp > runDuration.second) {
         if (timestampOpts.fatalOnInvalidTimestamp.value) {
           LOGF(fatal, "Timestamp %llu us is out of run duration [%llu, %llu] ms", timestamp, runDuration.first, runDuration.second);