Merge 4e90ae6 into sapling-pr-archive-ktf

Author: ktf

CCDB/include/CCDB/BasicCCDBManager.h

@@ -333,7 +333,7 @@ T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber
   auto [start, stop] = getRunDuration(runNumber);
   if (start < 0 || stop < 0) {
     if (mFatalWhenNull) {
-      reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber));
+      reportFatal(std::string("Failed to get run duration for run ") + std::to_string(runNumber) + std::string(" from CCDB"));
     }
     return nullptr;
   }

Common/Constants/include/CommonConstants/PhysicsConstants.h

@@ -52,6 +52,7 @@ enum Pdg {
   kDS1 = 10433,
   kDS2Star = 435,
   kDStar = 413,
+  kDStar0 = 423,
   kChiC1 = 20443,
   kJPsi = 443,
   kLambdaB0 = 5122,
@@ -101,6 +102,7 @@ constexpr double MassDSStar = 2.1122;
 constexpr double MassDS1 = 2.53511;
 constexpr double MassDS2Star = 2.5691;
 constexpr double MassDStar = 2.01026;
+constexpr double MassDStar0 = 2.00685;
 constexpr double MassChiC1 = 3.51067;
 constexpr double MassJPsi = 3.0969;
 constexpr double MassLambdaB0 = 5.6196;

Common/Constants/include/CommonConstants/make_pdg_header.py

@@ -107,6 +107,7 @@ class Pdg(Enum):
     kDS1 = 10433
     kDS2Star = 435
     kDStar = 413
+    kDStar0 = 423
     kChiC1 = 20443
     kJPsi = 443
     kLambdaB0 = 5122

Common/MathUtils/include/MathUtils/detail/basicMath.h

@@ -113,7 +113,11 @@ GPUdi() int nint(double x)
 template <>
 GPUdi() bool finite(double x)
 {
+#ifdef __FAST_MATH__
+  return false;
+#else
   return std::isfinite(x);
+#endif
 }
 template <>
 GPUdi() double log(double x)

DataFormats/Detectors/CTP/src/CTPRateFetcher.cxx

@@ -46,7 +46,8 @@ double CTPRateFetcher::fetchNoPuCorr(o2::ccdb::BasicCCDBManager* ccdb, uint64_t
         LOG(info) << "Trying different class";
         ret = fetchCTPratesClassesNoPuCorr(timeStamp, "CMTVX-NONE");
         if (ret < 0) {
-          LOG(fatal) << "None of the classes used for lumi found";
+          LOG(error) << "None of the classes used for lumi found";
+          return -1.;
         }
       }
       return ret;
@@ -245,17 +246,19 @@ void CTPRateFetcher::setupRun(int runNumber, o2::ccdb::BasicCCDBManager* ccdb, u
     return;
   }
   mRunNumber = runNumber;
-  LOG(info) << "Setting up CTP scalers for run " << mRunNumber;
+  LOG(info) << "Setting up CTP scalers for run " << mRunNumber << " and timestamp : " << timeStamp;
   auto ptrLHCIFdata = ccdb->getSpecific<parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp);
   if (ptrLHCIFdata == nullptr) {
-    LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
+    LOG(error) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
+    return;
   }
   mLHCIFdata = *ptrLHCIFdata;
   std::map<string, string> metadata;
   metadata["runNumber"] = std::to_string(mRunNumber);
   auto ptrConfig = ccdb->getSpecific<ctp::CTPConfiguration>("CTP/Config/Config", timeStamp, metadata);
   if (ptrConfig == nullptr) {
-    LOG(fatal) << "CTPRunConfig not in database, timestamp:" << timeStamp;
+    LOG(error) << "CTPRunConfig not in database, timestamp:" << timeStamp;
+    return;
   }
   mConfig = *ptrConfig;
   if (initScalers) {
@@ -264,7 +267,7 @@ void CTPRateFetcher::setupRun(int runNumber, o2::ccdb::BasicCCDBManager* ccdb, u
       mScalers = *ptrScalers;
       mScalers.convertRawToO2();
     } else {
-      LOG(fatal) << "CTPRunScalers not in database, timestamp:" << timeStamp;
+      LOG(error) << "CTPRunScalers not in database, timestamp:" << timeStamp;
     }
   }
 }

DataFormats/Detectors/FIT/FDD/CMakeLists.txt

@@ -11,6 +11,7 @@
 
 o2_add_library(DataFormatsFDD
   SOURCES src/RawEventData.cxx
+          src/RecPoint.cxx
           src/CTF.cxx
           src/LookUpTable.cxx
   PUBLIC_LINK_LIBRARIES O2::FDDBase

DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h

@@ -9,8 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file RecPoint.h
+/// \file  RecPoint.h
 /// \brief Definition of the FDD RecPoint class
+
 #ifndef ALICEO2_FDD_RECPOINT_H
 #define ALICEO2_FDD_RECPOINT_H
 
@@ -42,6 +43,7 @@ struct ChannelDataFloat {
   }
 
   void print() const;
+  bool operator==(const ChannelDataFloat&) const = default;
 
   ClassDefNV(ChannelDataFloat, 1);
 };
@@ -80,6 +82,9 @@ class RecPoint
   int getFirstEntry() const { return mRef.getFirstEntry(); }
   int getEntriesInCurrentBC() const { return mRef.getEntries(); }
 
+  void print() const;
+  bool operator==(const RecPoint&) const = default;
+
  private:
   o2::dataformats::RangeReference<int, int> mRef;
   o2::InteractionRecord mIntRecord;

DataFormats/Detectors/FIT/FDD/src/RecPoint.cxx

@@ -0,0 +1,33 @@
+// Copyright 2019-2024 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file   RecPoint.cxx
+/// \brief  Implementation of the FDD RecPoint class
+/// \author Andreas Molander [email protected]
+
+#include "DataFormatsFDD/RecPoint.h"
+#include "Framework/Logger.h"
+
+using namespace o2::fdd;
+
+void ChannelDataFloat::print() const
+{
+  LOG(info) << "ChannelDataFloat data:";
+  LOG(info) << "Channel ID: " << mPMNumber << ", Time (ps): " << mTime << ", Charge (ADC): " << mChargeADC << ", QTC chain: " << adcId;
+}
+
+void RecPoint::print() const
+{
+  LOG(info) << "RecPoint data:";
+  LOG(info) << "Collision times: A: " << getCollisionTimeA() << ", C: " << getCollisionTimeC();
+  LOG(info) << "Ref first: " << mRef.getFirstEntry() << ", Ref entries: " << mRef.getEntries();
+  LOG(info) << "Triggers: " << mTriggers.print();
+}

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h

@@ -47,6 +47,7 @@ struct ChannelDataFloat {
   }
 
   void print() const;
+  bool operator==(const ChannelDataFloat&) const = default;
 
   ClassDefNV(ChannelDataFloat, 1);
 };
@@ -74,8 +75,6 @@ class RecPoints
   }
   ~RecPoints() = default;
 
-  void print() const;
-
   short getCollisionTime(int side) const { return mCollisionTime[side]; }
   short getCollisionTimeMean() const { return getCollisionTime(TimeMean); }
   short getCollisionTimeA() const { return getCollisionTime(TimeA); }
@@ -96,6 +95,9 @@ class RecPoints
   gsl::span<const ChannelDataFloat> getBunchChannelData(const gsl::span<const ChannelDataFloat> tfdata) const;
   short static constexpr sDummyCollissionTime = 32767;
 
+  void print() const;
+  bool operator==(const RecPoints&) const = default;
+
  private:
   std::array<short, 4> mCollisionTime = {sDummyCollissionTime,
                                          sDummyCollissionTime,

DataFormats/Detectors/FIT/FT0/src/RecPoints.cxx

@@ -21,14 +21,22 @@
 
 using namespace o2::ft0;
 
+void ChannelDataFloat::print() const
+{
+  printf("  ChID% d | CFDtime=%f | QTCampl=%f QTC chain %d\n", ChId, CFDTime, QTCAmpl, ChainQTC);
+}
+
 gsl::span<const ChannelDataFloat> RecPoints::getBunchChannelData(const gsl::span<const ChannelDataFloat> tfdata) const
 {
   // extract the span of channel data for this bunch from the whole TF data
   return ref.getEntries() ? gsl::span<const ChannelDataFloat>(tfdata).subspan(ref.getFirstEntry(), ref.getEntries()) : gsl::span<const ChannelDataFloat>();
 }
 
-void ChannelDataFloat::print() const
+void RecPoints::print() const
 {
-
-  printf("  ChID% d | CFDtime=%f | QTCampl=%f QTC chain %d\n", ChId, CFDTime, QTCAmpl, ChainQTC);
+  LOG(info) << "RecPoint data:";
+  LOG(info) << "Collision times: mean: " << getCollisionTimeMean() << ", A: " << getCollisionTimeA() << ", C: " << getCollisionTimeC();
+  LOG(info) << "Vertex: " << getVertex();
+  LOG(info) << "Ref first: " << ref.getFirstEntry() << ", Ref entries: " << ref.getEntries();
+  LOG(info) << "Triggers: " << mTriggers.print();
 }